espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-02 10:00:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/uninited_local_var_in_nimble_example' into 'master'

Browse Source 
fix(ble): init return code in nimble example

Closes BLERP-2233

See merge request espressif/esp-idf!41783
This commit is contained in:
Island
2025-09-10 22:00:44 +08:00
parent 6c1b6b6c99 916f87b333
commit 07d9bb90de
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/main/main.c
View File

@@ -80,7 +80,7 @@ static void heart_rate_task(void *param) {
void app_main(void) { void app_main(void) {
/* Local variables */ /* Local variables */
int rc; int rc = 0;
esp_err_t ret; esp_err_t ret;
/* LED initialization */ /* LED initialization */

8
examples/bluetooth/ble_get_started/nimble/NimBLE_GATT_Server/main/src/gatt_svc.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Unlicense OR CC0-1.0 * SPDX-License-Identifier: Unlicense OR CC0-1.0
*/ */
@@ -72,7 +72,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
static int heart_rate_chr_access(uint16_t conn_handle, uint16_t attr_handle, static int heart_rate_chr_access(uint16_t conn_handle, uint16_t attr_handle,
struct ble_gatt_access_ctxt *ctxt, void *arg) { struct ble_gatt_access_ctxt *ctxt, void *arg) {
/* Local variables */ /* Local variables */
int rc; int rc = 0;
/* Handle access events */ /* Handle access events */
/* Note: Heart rate characteristic is read only */ /* Note: Heart rate characteristic is read only */
@@ -115,7 +115,7 @@ error:
static int led_chr_access(uint16_t conn_handle, uint16_t attr_handle, static int led_chr_access(uint16_t conn_handle, uint16_t attr_handle,
struct ble_gatt_access_ctxt *ctxt, void *arg) { struct ble_gatt_access_ctxt *ctxt, void *arg) {
/* Local variables */ /* Local variables */
int rc; int rc = 0;
/* Handle access events */ /* Handle access events */
/* Note: LED characteristic is write only */ /* Note: LED characteristic is write only */
@@ -248,7 +248,7 @@ void gatt_svr_subscribe_cb(struct ble_gap_event *event) {
*/ */
int gatt_svc_init(void) { int gatt_svc_init(void) {
/* Local variables */ /* Local variables */
int rc; int rc = 0;
/* 1. GATT service initialization */ /* 1. GATT service initialization */
ble_svc_gatt_init(); ble_svc_gatt_init();

2
examples/bluetooth/ble_get_started/nimble/NimBLE_Security/main/main.c
View File

@@ -85,7 +85,7 @@ static void heart_rate_task(void *param) {
void app_main(void) { void app_main(void) {
/* Local variables */ /* Local variables */
int rc; int rc = 0;
uint32_t seed = esp_random(); uint32_t seed = esp_random();
esp_err_t ret; esp_err_t ret;

8
examples/bluetooth/ble_get_started/nimble/NimBLE_Security/main/src/gatt_svc.c
View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Unlicense OR CC0-1.0 * SPDX-License-Identifier: Unlicense OR CC0-1.0
*/ */
@@ -75,7 +75,7 @@ static const struct ble_gatt_svc_def gatt_svr_svcs[] = {
static int heart_rate_chr_access(uint16_t conn_handle, uint16_t attr_handle, static int heart_rate_chr_access(uint16_t conn_handle, uint16_t attr_handle,
struct ble_gatt_access_ctxt *ctxt, void *arg) { struct ble_gatt_access_ctxt *ctxt, void *arg) {
/* Local variables */ /* Local variables */
int rc; int rc = 0;
/* Handle access events */ /* Handle access events */
/* Note: Heart rate characteristic is read only */ /* Note: Heart rate characteristic is read only */
@@ -118,7 +118,7 @@ error:
static int led_chr_access(uint16_t conn_handle, uint16_t attr_handle, static int led_chr_access(uint16_t conn_handle, uint16_t attr_handle,
struct ble_gatt_access_ctxt *ctxt, void *arg) { struct ble_gatt_access_ctxt *ctxt, void *arg) {
/* Local variables */ /* Local variables */
int rc; int rc = 0;
/* Handle access events */ /* Handle access events */
/* Note: LED characteristic is write only */ /* Note: LED characteristic is write only */
@@ -256,7 +256,7 @@ int gatt_svr_subscribe_cb(struct ble_gap_event *event) {
*/ */
int gatt_svc_init(void) { int gatt_svc_init(void) {
/* Local variables */ /* Local variables */
int rc; int rc = 0;
/* 1. GATT service initialization */ /* 1. GATT service initialization */
ble_svc_gatt_init(); ble_svc_gatt_init();