mirror of
https://github.com/espressif/esp-idf.git
synced 2025-10-02 18:10:57 +02:00
Merge branch 'fix/uninited_local_var_in_nimble_example_v5.3' into 'release/v5.3'
fix(ble): init return code in nimble example (v5.3) See merge request espressif/esp-idf!41810
This commit is contained in:
@@ -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 */
|
||||||
|
@@ -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();
|
||||||
|
@@ -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;
|
||||||
|
|
||||||
|
@@ -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();
|
||||||
|
Reference in New Issue
Block a user