Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit b6b798b

Browse filesBrowse files
committed
fix: methods which could error out return bool
Changed from returning esp_error_t, in order to be more arduino compatible.
1 parent c46f425 commit b6b798b
Copy full SHA for b6b798b

File tree

2 files changed

+18
-19
lines changed
Filter options

2 files changed

+18
-19
lines changed

‎libraries/BLE/src/BLEAdvertising.cpp

Copy file name to clipboardExpand all lines: libraries/BLE/src/BLEAdvertising.cpp
+13-14Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,38 +183,38 @@ void BLEAdvertising::setScanFilter(bool scanRequestWhitelistOnly, bool connectWh
183183
* @brief Set the advertisement data that is to be published in a regular advertisement.
184184
* @param [in] advertisementData The data to be advertised.
185185
*/
186-
esp_err_t BLEAdvertising::setAdvertisementData(BLEAdvertisementData &advertisementData) {
186+
bool BLEAdvertising::setAdvertisementData(BLEAdvertisementData &advertisementData) {
187187
log_v(">> setAdvertisementData");
188188
esp_err_t errRc = ::esp_ble_gap_config_adv_data_raw((uint8_t *)advertisementData.getPayload().c_str(), advertisementData.getPayload().length());
189189
if (errRc != ESP_OK) {
190190
log_e("esp_ble_gap_config_adv_data_raw: %d %s", errRc, GeneralUtils::errorToString(errRc));
191191
}
192192
m_customAdvData = true; // Set the flag that indicates we are using custom advertising data.
193193
log_v("<< setAdvertisementData");
194-
return errRc;
194+
return ESP_OK == errRc;
195195
} // setAdvertisementData
196196

197197
/**
198198
* @brief Set the advertisement data that is to be published in a scan response.
199199
* @param [in] advertisementData The data to be advertised.
200200
*/
201-
esp_err_t BLEAdvertising::setScanResponseData(BLEAdvertisementData &advertisementData) {
201+
bool BLEAdvertising::setScanResponseData(BLEAdvertisementData &advertisementData) {
202202
log_v(">> setScanResponseData");
203203
esp_err_t errRc = ::esp_ble_gap_config_scan_rsp_data_raw((uint8_t *)advertisementData.getPayload().c_str(), advertisementData.getPayload().length());
204204
if (errRc != ESP_OK) {
205205
log_e("esp_ble_gap_config_scan_rsp_data_raw: %d %s", errRc, GeneralUtils::errorToString(errRc));
206206
}
207207
m_customScanResponseData = true; // Set the flag that indicates we are using custom scan response data.
208208
log_v("<< setScanResponseData");
209-
return errRc;
209+
return ESP_OK == errRc;
210210
} // setScanResponseData
211211

212212
/**
213213
* @brief Start advertising.
214214
* Start advertising.
215215
* @return N/A.
216216
*/
217-
esp_err_t BLEAdvertising::start() {
217+
bool BLEAdvertising::start() {
218218
log_v(">> start: customAdvData: %d, customScanResponseData: %d", m_customAdvData, m_customScanResponseData);
219219

220220
// We have a vector of service UUIDs that we wish to advertise. In order to use the
@@ -227,7 +227,7 @@ esp_err_t BLEAdvertising::start() {
227227
m_advData.p_service_uuid = (uint8_t *)malloc(m_advData.service_uuid_len);
228228
if (!m_advData.p_service_uuid) {
229229
log_e(">> start failed: out of memory");
230-
return ESP_ERR_NO_MEM;
230+
return false;
231231
}
232232

233233
uint8_t *p = m_advData.p_service_uuid;
@@ -252,7 +252,7 @@ esp_err_t BLEAdvertising::start() {
252252
errRc = ::esp_ble_gap_config_adv_data(&m_advData);
253253
if (errRc != ESP_OK) {
254254
log_e("<< esp_ble_gap_config_adv_data: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
255-
return errRc;
255+
return false;
256256
}
257257
}
258258

@@ -268,7 +268,7 @@ esp_err_t BLEAdvertising::start() {
268268
errRc = ::esp_ble_gap_config_adv_data(&m_scanRespData);
269269
if (errRc != ESP_OK) {
270270
log_e("<< esp_ble_gap_config_adv_data (Scan response): rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
271-
return errRc;
271+
return false;
272272
}
273273
}
274274

@@ -284,23 +284,23 @@ esp_err_t BLEAdvertising::start() {
284284
} else {
285285
log_v("<< start");
286286
}
287-
return errRc;
287+
return ESP_OK == errRc;
288288
} // start
289289

290290
/**
291291
* @brief Stop advertising.
292292
* Stop advertising.
293293
* @return N/A.
294294
*/
295-
esp_err_t BLEAdvertising::stop() {
295+
bool BLEAdvertising::stop() {
296296
log_v(">> stop");
297297
esp_err_t errRc = ::esp_ble_gap_stop_advertising();
298298
if (errRc != ESP_OK) {
299299
log_e("esp_ble_gap_stop_advertising: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
300300
} else {
301301
log_v("<< stop");
302302
}
303-
return errRc;
303+
return ESP_OK == errRc;
304304
} // stop
305305

306306
/**
@@ -309,8 +309,7 @@ esp_err_t BLEAdvertising::stop() {
309309
* @param [in] Bluetooth address type.
310310
* Set BLE address.
311311
*/
312-
313-
esp_err_t BLEAdvertising::setDeviceAddress(esp_bd_addr_t addr, esp_ble_addr_type_t type) {
312+
bool BLEAdvertising::setDeviceAddress(esp_bd_addr_t addr, esp_ble_addr_type_t type) {
314313
log_v(">> setPrivateAddress");
315314

316315
m_advParams.own_addr_type = type;
@@ -320,7 +319,7 @@ esp_err_t BLEAdvertising::setDeviceAddress(esp_bd_addr_t addr, esp_ble_addr_type
320319
} else {
321320
log_v("<< setPrivateAddress");
322321
}
323-
return errRc;
322+
return ESP_OK == errRc;
324323
} // setPrivateAddress
325324

326325
/**

‎libraries/BLE/src/BLEAdvertising.h

Copy file name to clipboardExpand all lines: libraries/BLE/src/BLEAdvertising.h
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ class BLEAdvertising {
5454
bool removeServiceUUID(int index);
5555
bool removeServiceUUID(BLEUUID serviceUUID);
5656
bool removeServiceUUID(const char *serviceUUID);
57-
esp_err_t start();
58-
esp_err_t stop();
57+
bool start();
58+
bool stop();
5959
void setAppearance(uint16_t appearance);
6060
void setAdvertisementType(esp_ble_adv_type_t adv_type);
6161
void setAdvertisementChannelMap(esp_ble_adv_channel_t channel_map);
6262
void setMaxInterval(uint16_t maxinterval);
6363
void setMinInterval(uint16_t mininterval);
64-
esp_err_t setAdvertisementData(BLEAdvertisementData &advertisementData);
64+
bool setAdvertisementData(BLEAdvertisementData &advertisementData);
6565
void setScanFilter(bool scanRequestWhitelistOnly, bool connectWhitelistOnly);
66-
esp_err_t setScanResponseData(BLEAdvertisementData &advertisementData);
66+
bool setScanResponseData(BLEAdvertisementData &advertisementData);
6767
void setPrivateAddress(esp_ble_addr_type_t type = BLE_ADDR_TYPE_RANDOM);
68-
esp_err_t setDeviceAddress(esp_bd_addr_t addr, esp_ble_addr_type_t type = BLE_ADDR_TYPE_RANDOM);
68+
bool setDeviceAddress(esp_bd_addr_t addr, esp_ble_addr_type_t type = BLE_ADDR_TYPE_RANDOM);
6969

7070
void handleGAPEvent(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param);
7171
void setMinPreferred(uint16_t);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.