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

fix(nimble): Address compilation issues in nimble examples

Browse Source
This commit is contained in:
Rahul Tank
2025-10-30 11:37:18 +05:30
parent 998586a8ec
commit 3591e526f0
34 changed files with 173 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/main/main.c
+8 -1
View File
@@ -33,6 +33,7 @@ void ble_store_config_init(void);
static void ble_prox_cent_scan(void);
static int ble_prox_cent_gap_event(struct ble_gap_event *event, void *arg);
#if MYNEWT_VAL(BLE_GATTC)
static int
ble_prox_cent_on_read(uint16_t conn_handle,
const struct ble_gatt_error *error,
@@ -172,6 +173,7 @@ ble_prox_cent_on_disc_complete(const struct peer *peer, int status, void *arg)
*/
ble_prox_cent_read_write_subscribe(peer);
}
#endif
/**
* Initiates the GAP general discovery procedure.
@@ -480,6 +482,7 @@ ble_prox_cent_gap_event(struct ble_gap_event *event, void *arg)
return 0;
}
#else
#if MYNEWT_VAL(BLE_GATTC)
/* Perform service discovery */
rc = peer_disc_all(event->connect.conn_handle,
ble_prox_cent_on_disc_complete, NULL);
@@ -487,6 +490,7 @@ ble_prox_cent_gap_event(struct ble_gap_event *event, void *arg)
MODLOG_DFLT(ERROR, "Failed to discover services; rc=%d\n", rc);
return 0;
}
#endif
#endif // BLE_GATT_CACHING_ASSOC_ENABLE
#endif
} else {
@@ -547,6 +551,7 @@ ble_prox_cent_gap_event(struct ble_gap_event *event, void *arg)
return 0;
}
#else
#if MYNEWT_VAL(BLE_GATTC)
/*** Go for service discovery after encryption has been successfully enabled ***/
rc = peer_disc_all(event->connect.conn_handle,
ble_prox_cent_on_disc_complete, NULL);
@@ -554,6 +559,7 @@ ble_prox_cent_gap_event(struct ble_gap_event *event, void *arg)
MODLOG_DFLT(ERROR, "Failed to discover services; rc=%d\n", rc);
return 0;
}
#endif
#endif // BLE_GATT_CACHING_ASSOC_ENABLE
#endif
return 0;
@@ -656,6 +662,7 @@ ble_prox_cent_path_loss_task(void *pvParameters)
path_loss = 0;
}
#if MYNEWT_VAL(BLE_GATTC)
rc = ble_gattc_write_no_rsp_flat(i, conn_peer[i].val_handle,
&path_loss, sizeof(path_loss));
if (rc != 0) {
@@ -664,6 +671,7 @@ ble_prox_cent_path_loss_task(void *pvParameters)
} else {
MODLOG_DFLT(INFO, "Write to alert level characteristis done");
}
#endif
}
}
}
@@ -743,7 +751,6 @@ app_main(void)
/* Initialize a task to keep checking path loss of the link */
ble_prox_cent_init();
for (int i = 0; i <= MYNEWT_VAL(BLE_MAX_CONNECTIONS); i++) {
disconn_peer[i].addr = NULL;
disconn_peer[i].link_lost = true;
examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_prph/main/main.c
+3 -3
View File
@@ -270,8 +270,6 @@ void ble_prox_prph_host_task(void *param)
void app_main(void)
{
int rc;
/* Initialize NVS — it is used to store PHY calibration data */
esp_err_t ret = nvs_flash_init();
if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
@@ -286,9 +284,10 @@ void app_main(void)
return;
}
#if CONFIG_BT_NIMBLE_PROX_SERVICE
/* Initialize a task to keep checking path loss of the link */
ble_svc_prox_init();
#endif
/* Initialize the NimBLE host configuration */
ble_hs_cfg.sync_cb = ble_prox_prph_on_sync;
ble_hs_cfg.reset_cb = ble_prox_prph_on_reset;
@@ -301,6 +300,7 @@ void app_main(void)
ble_hs_cfg.sm_sc = 1;
ble_hs_cfg.sm_mitm = 1;
int rc;
/* Set the default device name */
rc = ble_svc_gap_device_name_set(device_name);
assert(rc == 0);