From b1e0d2fd723a5e0a27ac64fb03bc72e549ad1dbe Mon Sep 17 00:00:00 2001 From: dumam Date: Sat, 26 Jun 2021 16:53:59 +0200 Subject: [PATCH 1/3] GCC 11 Fixes --- lib/sdk11/components/ble/ble_services/ble_dfu/ble_dfu.c | 2 +- src/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sdk11/components/ble/ble_services/ble_dfu/ble_dfu.c b/lib/sdk11/components/ble/ble_services/ble_dfu/ble_dfu.c index fd36ad9..ea716cb 100644 --- a/lib/sdk11/components/ble/ble_services/ble_dfu/ble_dfu.c +++ b/lib/sdk11/components/ble/ble_services/ble_dfu/ble_dfu.c @@ -463,7 +463,7 @@ uint32_t ble_dfu_init(ble_dfu_t * p_dfu, ble_dfu_init_t * p_dfu_init) p_dfu->conn_handle = BLE_CONN_HANDLE_INVALID; - ble_uuid_t service_uuid; + ble_uuid_t service_uuid = {0}; uint32_t err_code; const ble_uuid128_t base_uuid128 = diff --git a/src/main.c b/src/main.c index eed9ba6..36616ca 100644 --- a/src/main.c +++ b/src/main.c @@ -411,7 +411,7 @@ void assert_nrf_callback (uint16_t line_num, uint8_t const * p_file_name) // Process BLE event from SD uint32_t proc_ble(void) { - __ALIGN(4) uint8_t ev_buf[ BLE_EVT_LEN_MAX(BLEGATT_ATT_MTU_MAX) ]; + __ALIGN(4) uint8_t ev_buf[ BLE_EVT_LEN_MAX(BLEGATT_ATT_MTU_MAX) ] = {0}; uint16_t ev_len = BLE_EVT_LEN_MAX(BLEGATT_ATT_MTU_MAX); // Get BLE Event @@ -448,7 +448,7 @@ uint32_t proc_ble(void) // process SOC event from SD uint32_t proc_soc(void) { - uint32_t soc_evt; + uint32_t soc_evt = 0; uint32_t err = sd_evt_get(&soc_evt); if (NRF_SUCCESS == err) From 6e33825e9f593fd34c3118b57cc6b13b370307fc Mon Sep 17 00:00:00 2001 From: dumam Date: Sun, 27 Jun 2021 14:29:12 +0200 Subject: [PATCH 2/3] Init header without init whole buffer --- src/main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main.c b/src/main.c index 36616ca..052e3e7 100644 --- a/src/main.c +++ b/src/main.c @@ -411,17 +411,19 @@ void assert_nrf_callback (uint16_t line_num, uint8_t const * p_file_name) // Process BLE event from SD uint32_t proc_ble(void) { - __ALIGN(4) uint8_t ev_buf[ BLE_EVT_LEN_MAX(BLEGATT_ATT_MTU_MAX) ] = {0}; + __ALIGN(4) uint8_t ev_buf[ BLE_EVT_LEN_MAX(BLEGATT_ATT_MTU_MAX) ]; uint16_t ev_len = BLE_EVT_LEN_MAX(BLEGATT_ATT_MTU_MAX); + // Init header + ble_evt_t* evt = (ble_evt_t*) ev_buf; + evt->header.evt_id = 0; + // Get BLE Event uint32_t err = sd_ble_evt_get(ev_buf, &ev_len); // Handle valid event, ignore error if( NRF_SUCCESS == err) { - ble_evt_t* evt = (ble_evt_t*) ev_buf; - switch (evt->header.evt_id) { case BLE_GAP_EVT_CONNECTED: From a7fe7c98a3b52a22631d6a16d601ad87072bbd6f Mon Sep 17 00:00:00 2001 From: dumam Date: Sun, 4 Jul 2021 21:12:15 +0200 Subject: [PATCH 3/3] Init header id with invalid value --- src/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index 052e3e7..331ea21 100644 --- a/src/main.c +++ b/src/main.c @@ -416,7 +416,7 @@ uint32_t proc_ble(void) // Init header ble_evt_t* evt = (ble_evt_t*) ev_buf; - evt->header.evt_id = 0; + evt->header.evt_id = BLE_EVT_INVALID; // Get BLE Event uint32_t err = sd_ble_evt_get(ev_buf, &ev_len);