Skip to content

Commit 3a778c7

Browse files
lucasssvazlucasssvaz
committed
Use standard logging
1 parent d7d996d commit 3a778c7

21 files changed

+280
-447
lines changed

‎libraries/NimBLE/src/BLEAddress.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#if defined(CONFIG_BT_ENABLED)
2020

2121
#include "BLEAddress.h"
22-
#include "BLELog.h"
2322

2423
#include <algorithm>
2524

@@ -78,7 +77,7 @@ BLEAddress::BLEAddress(const std::string &addr, uint8_t type) {
7877
}
7978

8079
*this = BLEAddress{};
81-
NIMBLE_LOGE(LOG_TAG, "Invalid address '%s'", addr.c_str());
80+
log_e(LOG_TAG, "Invalid address '%s'", addr.c_str());
8281
} // BLEAddress
8382

8483
/**

‎libraries/NimBLE/src/BLEAdvertisedDevice.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "BLEDevice.h"
2222
#include "BLEAdvertisedDevice.h"
2323
#include "BLEUtils.h"
24-
#include "BLELog.h"
2524

2625
#include <climits>
2726

@@ -321,7 +320,7 @@ std::string BLEAdvertisedDevice::getServiceData(const BLEUUID &uuid) const {
321320
data_loc = findServiceData(index, &bytes);
322321
}
323322

324-
NIMBLE_LOGI(LOG_TAG, "No service data found");
323+
log_i(LOG_TAG, "No service data found");
325324
return "";
326325
} // getServiceData
327326

‎libraries/NimBLE/src/BLEAdvertisementData.cpp

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "BLEDevice.h"
2323
#include "BLEUtils.h"
2424
#include "BLEUUID.h"
25-
#include "BLELog.h"
2625

2726
#include "host/ble_hs_adv.h"
2827

@@ -35,7 +34,7 @@ static const char *LOG_TAG = "BLEAdvertisementData";
3534
*/
3635
bool BLEAdvertisementData::addData(const uint8_t *data, size_t length) {
3736
if (m_payload.size() + length > BLE_HS_ADV_MAX_SZ) {
38-
NIMBLE_LOGE(LOG_TAG, "Data length exceeded");
37+
log_e(LOG_TAG, "Data length exceeded");
3938
return false;
4039
}
4140

@@ -147,7 +146,7 @@ bool BLEAdvertisementData::addServiceUUID(const BLEUUID &serviceUUID) {
147146
case 2: type = BLE_HS_ADV_TYPE_COMP_UUIDS16; break;
148147
case 4: type = BLE_HS_ADV_TYPE_COMP_UUIDS32; break;
149148
case 16: type = BLE_HS_ADV_TYPE_COMP_UUIDS128; break;
150-
default: NIMBLE_LOGE(LOG_TAG, "Cannot add UUID, invalid size!"); return false;
149+
default: log_e(LOG_TAG, "Cannot add UUID, invalid size!"); return false;
151150
}
152151

153152
int dataLoc = getDataLocation(type);
@@ -157,7 +156,7 @@ bool BLEAdvertisementData::addServiceUUID(const BLEUUID &serviceUUID) {
157156
}
158157

159158
if (length + getPayload().size() > BLE_HS_ADV_MAX_SZ) {
160-
NIMBLE_LOGE(LOG_TAG, "Cannot add UUID, data length exceeded!");
159+
log_e(LOG_TAG, "Cannot add UUID, data length exceeded!");
161160
return false;
162161
}
163162

@@ -196,7 +195,7 @@ bool BLEAdvertisementData::removeServiceUUID(const BLEUUID &serviceUUID) {
196195
case 2: type = BLE_HS_ADV_TYPE_COMP_UUIDS16; break;
197196
case 4: type = BLE_HS_ADV_TYPE_COMP_UUIDS32; break;
198197
case 16: type = BLE_HS_ADV_TYPE_COMP_UUIDS128; break;
199-
default: NIMBLE_LOGE(LOG_TAG, "Cannot remove UUID, invalid size!"); return false;
198+
default: log_e(LOG_TAG, "Cannot remove UUID, invalid size!"); return false;
200199
}
201200

202201
int dataLoc = getDataLocation(type);
@@ -249,7 +248,7 @@ bool BLEAdvertisementData::removeServices() {
249248
*/
250249
bool BLEAdvertisementData::setManufacturerData(const uint8_t *data, size_t length) {
251250
if (length > BLE_HS_ADV_MAX_FIELD_SZ) {
252-
NIMBLE_LOGE(LOG_TAG, "MFG data too long");
251+
log_e(LOG_TAG, "MFG data too long");
253252
return false;
254253
}
255254

@@ -285,7 +284,7 @@ bool BLEAdvertisementData::setManufacturerData(const std::vector<uint8_t> &data)
285284
*/
286285
bool BLEAdvertisementData::setURI(const std::string &uri) {
287286
if (uri.length() > BLE_HS_ADV_MAX_FIELD_SZ) {
288-
NIMBLE_LOGE(LOG_TAG, "URI too long");
287+
log_e(LOG_TAG, "URI too long");
289288
return false;
290289
}
291290

@@ -307,7 +306,7 @@ bool BLEAdvertisementData::setURI(const std::string &uri) {
307306
*/
308307
bool BLEAdvertisementData::setName(const std::string &name, bool isComplete) {
309308
if (name.length() > BLE_HS_ADV_MAX_FIELD_SZ) {
310-
NIMBLE_LOGE(LOG_TAG, "Name too long - truncating");
309+
log_e(LOG_TAG, "Name too long - truncating");
311310
isComplete = false;
312311
}
313312

@@ -397,11 +396,11 @@ bool BLEAdvertisementData::setServices(bool complete, uint8_t size, const std::v
397396

398397
for (const auto &uuid : uuids) {
399398
if (uuid.bitSize() != size) {
400-
NIMBLE_LOGE(LOG_TAG, "Service UUID(%d) invalid", size);
399+
log_e(LOG_TAG, "Service UUID(%d) invalid", size);
401400
continue;
402401
} else {
403402
if (length + bytes >= BLE_HS_ADV_MAX_SZ) {
404-
NIMBLE_LOGW(LOG_TAG, "Too many services - truncating");
403+
log_w(LOG_TAG, "Too many services - truncating");
405404
complete = false;
406405
break;
407406
}
@@ -416,7 +415,7 @@ bool BLEAdvertisementData::setServices(bool complete, uint8_t size, const std::v
416415
case 16: data[1] = (complete ? BLE_HS_ADV_TYPE_COMP_UUIDS16 : BLE_HS_ADV_TYPE_INCOMP_UUIDS16); break;
417416
case 32: data[1] = (complete ? BLE_HS_ADV_TYPE_COMP_UUIDS32 : BLE_HS_ADV_TYPE_INCOMP_UUIDS32); break;
418417
case 128: data[1] = (complete ? BLE_HS_ADV_TYPE_COMP_UUIDS128 : BLE_HS_ADV_TYPE_INCOMP_UUIDS128); break;
419-
default: NIMBLE_LOGE(LOG_TAG, "Cannot set services, invalid size!"); return false;
418+
default: log_e(LOG_TAG, "Cannot set services, invalid size!"); return false;
420419
}
421420

422421
return addData(data, length);
@@ -434,7 +433,7 @@ bool BLEAdvertisementData::setServiceData(const BLEUUID &uuid, const uint8_t *da
434433
uint8_t uuidBytes = uuid.bitSize() / 8;
435434
uint8_t sDataLen = 2 + uuidBytes + length;
436435
if (sDataLen > BLE_HS_ADV_MAX_SZ) {
437-
NIMBLE_LOGE(LOG_TAG, "Service Data too long");
436+
log_e(LOG_TAG, "Service Data too long");
438437
return false;
439438
}
440439

@@ -443,7 +442,7 @@ bool BLEAdvertisementData::setServiceData(const BLEUUID &uuid, const uint8_t *da
443442
case 2: type = BLE_HS_ADV_TYPE_SVC_DATA_UUID16; break;
444443
case 4: type = BLE_HS_ADV_TYPE_SVC_DATA_UUID32; break;
445444
case 16: type = BLE_HS_ADV_TYPE_SVC_DATA_UUID128; break;
446-
default: NIMBLE_LOGE(LOG_TAG, "Cannot set service data, invalid size!"); return false;
445+
default: log_e(LOG_TAG, "Cannot set service data, invalid size!"); return false;
447446
}
448447

449448
if (length == 0) {

‎libraries/NimBLE/src/BLEAdvertising.cpp

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "BLEDevice.h"
2525
#include "BLEServer.h"
2626
#include "BLEUtils.h"
27-
#include "BLELog.h"
2827

2928
static const char *LOG_TAG = "BLEAdvertising";
3029

@@ -65,7 +64,7 @@ bool BLEAdvertising::reset() {
6564
*/
6665
bool BLEAdvertising::setConnectableMode(uint8_t mode) {
6766
if (mode > BLE_GAP_CONN_MODE_UND) {
68-
NIMBLE_LOGE(LOG_TAG, "Invalid connectable mode: %u", mode);
67+
log_e(LOG_TAG, "Invalid connectable mode: %u", mode);
6968
return false;
7069
}
7170

@@ -90,7 +89,7 @@ bool BLEAdvertising::setDiscoverableMode(uint8_t mode) {
9089
case BLE_GAP_DISC_MODE_NON: m_advData.setFlags(BLE_HS_ADV_F_BREDR_UNSUP); break;
9190
case BLE_GAP_DISC_MODE_LTD: m_advData.setFlags(BLE_HS_ADV_F_DISC_LTD); break;
9291
case BLE_GAP_DISC_MODE_GEN: m_advData.setFlags(BLE_HS_ADV_F_DISC_GEN); break;
93-
default: NIMBLE_LOGE(LOG_TAG, "Invalid discoverable mode: %u", mode); return false;
92+
default: log_e(LOG_TAG, "Invalid discoverable mode: %u", mode); return false;
9493
}
9594

9695
m_advParams.disc_mode = mode;
@@ -163,15 +162,15 @@ void BLEAdvertising::setScanFilter(bool scanRequestWhitelistOnly, bool connectWh
163162
* @return True if advertising started successfully.
164163
*/
165164
bool BLEAdvertising::start(uint32_t duration, const BLEAddress *dirAddr) {
166-
NIMBLE_LOGD(LOG_TAG, ">> Advertising start: duration=%" PRIu32 ", dirAddr=%s", duration, dirAddr ? dirAddr->toString().c_str() : "NULL");
165+
log_d(LOG_TAG, ">> Advertising start: duration=%" PRIu32 ", dirAddr=%s", duration, dirAddr ? dirAddr->toString().c_str() : "NULL");
167166

168167
if (!BLEDevice::m_synced) {
169-
NIMBLE_LOGE(LOG_TAG, "Host not synced!");
168+
log_e(LOG_TAG, "Host not synced!");
170169
return false;
171170
}
172171

173172
if (ble_gap_adv_active()) {
174-
NIMBLE_LOGW(LOG_TAG, "Advertising already active");
173+
log_w(LOG_TAG, "Advertising already active");
175174
return true;
176175
}
177176

@@ -209,11 +208,11 @@ bool BLEAdvertising::start(uint32_t duration, const BLEAddress *dirAddr) {
209208
int rc = ble_gap_adv_start(BLEDevice::m_ownAddrType, NULL, duration, &m_advParams, BLEAdvertising::handleGapEvent, this);
210209
#endif
211210
if (rc != 0 && rc != BLE_HS_EALREADY) {
212-
NIMBLE_LOGE(LOG_TAG, "Error enabling advertising; rc=%d, %s", rc, BLEUtils::returnCodeToString(rc));
211+
log_e(LOG_TAG, "Error enabling advertising; rc=%d, %s", rc, BLEUtils::returnCodeToString(rc));
213212
return false;
214213
}
215214

216-
NIMBLE_LOGD(LOG_TAG, "<< Advertising start");
215+
log_d(LOG_TAG, "<< Advertising start");
217216
return true;
218217
} // start
219218

@@ -224,7 +223,7 @@ bool BLEAdvertising::start(uint32_t duration, const BLEAddress *dirAddr) {
224223
bool BLEAdvertising::stop() {
225224
int rc = ble_gap_adv_stop();
226225
if (rc != 0 && rc != BLE_HS_EALREADY) {
227-
NIMBLE_LOGE(LOG_TAG, "ble_gap_adv_stop rc=%d %s", rc, BLEUtils::returnCodeToString(rc));
226+
log_e(LOG_TAG, "ble_gap_adv_stop rc=%d %s", rc, BLEUtils::returnCodeToString(rc));
228227
return false;
229228
}
230229

@@ -280,7 +279,7 @@ int BLEAdvertising::handleGapEvent(struct ble_gap_event *event, void *arg) {
280279
case BLE_HS_EOS:
281280
case BLE_HS_ECONTROLLER:
282281
case BLE_HS_ENOTSYNCED:
283-
NIMBLE_LOGE(LOG_TAG, "host reset, rc=%d", event->adv_complete.reason);
282+
log_e(LOG_TAG, "host reset, rc=%d", event->adv_complete.reason);
284283
BLEDevice::onReset(event->adv_complete.reason);
285284
return 0;
286285
default: break;
@@ -305,11 +304,11 @@ int BLEAdvertising::handleGapEvent(struct ble_gap_event *event, void *arg) {
305304
bool BLEAdvertising::setAdvertisementData(const BLEAdvertisementData &data) {
306305
int rc = ble_gap_adv_set_data(&data.getPayload()[0], data.getPayload().size());
307306
if (rc != 0) {
308-
NIMBLE_LOGE(LOG_TAG, "ble_gap_adv_set_data: %d %s", rc, BLEUtils::returnCodeToString(rc));
307+
log_e(LOG_TAG, "ble_gap_adv_set_data: %d %s", rc, BLEUtils::returnCodeToString(rc));
309308
return false;
310309
}
311310

312-
NIMBLE_LOGD(LOG_TAG, "setAdvertisementData: %s", data.toString().c_str());
311+
log_d(LOG_TAG, "setAdvertisementData: %s", data.toString().c_str());
313312
m_advData = data; // make a copy in the member object in case this is custom.
314313
m_advDataSet = true; // Set the flag that indicates the data was set already so we don't set it again.
315314
return true;
@@ -333,11 +332,11 @@ const BLEAdvertisementData &BLEAdvertising::getAdvertisementData() {
333332
bool BLEAdvertising::setScanResponseData(const BLEAdvertisementData &data) {
334333
int rc = ble_gap_adv_rsp_set_data(&data.getPayload()[0], data.getPayload().size());
335334
if (rc != 0) {
336-
NIMBLE_LOGE(LOG_TAG, "ble_gap_adv_rsp_set_data: %d %s", rc, BLEUtils::returnCodeToString(rc));
335+
log_e(LOG_TAG, "ble_gap_adv_rsp_set_data: %d %s", rc, BLEUtils::returnCodeToString(rc));
337336
return false;
338337
}
339338

340-
NIMBLE_LOGD(LOG_TAG, "setScanResponseData: %s", data.toString().c_str());
339+
log_d(LOG_TAG, "setScanResponseData: %s", data.toString().c_str());
341340
m_scanData = data; // copy the data into the member object in case this is custom.
342341
return true;
343342
} // setScanResponseData

‎libraries/NimBLE/src/BLEAttValue.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "nimble/nimble_npl.h"
2222

2323
#include "BLEAttValue.h"
24-
#include "BLELog.h"
2524

2625
static const char *LOG_TAG = "BLEAttValue";
2726

@@ -36,7 +35,7 @@ BLEAttValue::BLEAttValue(uint16_t init_len, uint16_t max_len)
3635
{
3736
NIMBLE_CPP_DEBUG_ASSERT(m_attr_value);
3837
if (m_attr_value == nullptr) {
39-
NIMBLE_LOGE(LOG_TAG, "Failed to calloc ctx");
38+
log_e(LOG_TAG, "Failed to calloc ctx");
4039
}
4140
}
4241

@@ -83,7 +82,7 @@ void BLEAttValue::deepCopy(const BLEAttValue &source) {
8382
uint8_t *res = static_cast<uint8_t *>(realloc(m_attr_value, source.m_capacity + 1));
8483
NIMBLE_CPP_DEBUG_ASSERT(res);
8584
if (res == nullptr) {
86-
NIMBLE_LOGE(LOG_TAG, "Failed to realloc deepCopy");
85+
log_e(LOG_TAG, "Failed to realloc deepCopy");
8786
return;
8887
}
8988

@@ -111,7 +110,7 @@ BLEAttValue &BLEAttValue::append(const uint8_t *value, uint16_t len) {
111110
}
112111

113112
if ((m_attr_len + len) > m_attr_max_len) {
114-
NIMBLE_LOGE(LOG_TAG, "val > max, len=%u, max=%u", len, m_attr_max_len);
113+
log_e(LOG_TAG, "val > max, len=%u, max=%u", len, m_attr_max_len);
115114
return *this;
116115
}
117116

@@ -123,7 +122,7 @@ BLEAttValue &BLEAttValue::append(const uint8_t *value, uint16_t len) {
123122
}
124123
NIMBLE_CPP_DEBUG_ASSERT(res);
125124
if (res == nullptr) {
126-
NIMBLE_LOGE(LOG_TAG, "Failed to realloc append");
125+
log_e(LOG_TAG, "Failed to realloc append");
127126
return *this;
128127
}
129128

@@ -147,7 +146,7 @@ BLEAttValue &BLEAttValue::append(const uint8_t *value, uint16_t len) {
147146
uint8_t BLEAttValue::operator[](int pos) const {
148147
NIMBLE_CPP_DEBUG_ASSERT(pos < m_attr_len);
149148
if (pos >= m_attr_len) {
150-
NIMBLE_LOGE(LOG_TAG, "pos >= len, pos=%u, len=%u", pos, m_attr_len);
149+
log_e(LOG_TAG, "pos >= len, pos=%u, len=%u", pos, m_attr_len);
151150
return 0;
152151
}
153152
return m_attr_value[pos];

‎libraries/NimBLE/src/BLEBeacon.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#include "BLEBeacon.h"
2222
#include "BLEUUID.h"
23-
#include "BLELog.h"
2423

2524
#define ENDIAN_CHANGE_U16(x) ((((x) & 0xFF00) >> 8) + (((x) & 0xFF) << 8))
2625

@@ -81,7 +80,7 @@ int8_t BLEBeacon::getSignalPower() {
8180
*/
8281
void BLEBeacon::setData(const uint8_t *data, uint8_t length) {
8382
if (length != sizeof(BeaconData)) {
84-
NIMBLE_LOGE(LOG_TAG, "Data length must be %d bytes, sent: %d", sizeof(BeaconData), length);
83+
log_e(LOG_TAG, "Data length must be %d bytes, sent: %d", sizeof(BeaconData), length);
8584
return;
8685
}
8786
memcpy(&m_beaconData, data, length);

‎libraries/NimBLE/src/BLECharacteristic.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "BLECharacteristic.h"
2222
#include "BLE2904.h"
2323
#include "BLEDevice.h"
24-
#include "BLELog.h"
2524

2625
static BLECharacteristicCallbacks defaultCallback;
2726
static const char *LOG_TAG = "BLECharacteristic";
@@ -78,7 +77,7 @@ BLEDescriptor *BLECharacteristic::createDescriptor(const char *uuid, uint32_t pr
7877
BLEDescriptor *BLECharacteristic::createDescriptor(const BLEUUID &uuid, uint32_t properties, uint16_t maxLen) {
7978
BLEDescriptor *pDescriptor = nullptr;
8079
if (uuid == BLEUUID(static_cast<uint16_t>(0x2904))) {
81-
NIMBLE_LOGW(LOG_TAG, "0x2904 descriptor should be created with create2904()");
80+
log_w(LOG_TAG, "0x2904 descriptor should be created with create2904()");
8281
pDescriptor = create2904();
8382
} else {
8483
pDescriptor = new BLEDescriptor(uuid, properties, maxLen, this);
@@ -277,7 +276,7 @@ bool BLECharacteristic::sendValue(const uint8_t *value, size_t length, bool isNo
277276
// Must re-create the data buffer on each iteration because it is freed by the calls bellow.
278277
os_mbuf *om = ble_hs_mbuf_from_flat(value, length);
279278
if (!om) {
280-
NIMBLE_LOGE(LOG_TAG, "<< sendValue: failed to allocate mbuf");
279+
log_e(LOG_TAG, "<< sendValue: failed to allocate mbuf");
281280
return false;
282281
}
283282

@@ -288,7 +287,7 @@ bool BLECharacteristic::sendValue(const uint8_t *value, size_t length, bool isNo
288287
}
289288

290289
if (rc != 0) {
291-
NIMBLE_LOGE(LOG_TAG, "<< sendValue: failed to send value, rc=%d %s", rc, BLEUtils::returnCodeToString(rc));
290+
log_e(LOG_TAG, "<< sendValue: failed to send value, rc=%d %s", rc, BLEUtils::returnCodeToString(rc));
292291
break;
293292
}
294293
}
@@ -372,7 +371,7 @@ std::string BLECharacteristic::toString() const {
372371
* @param [in] connInfo A reference to a BLEConnInfo instance containing the peer info.
373372
*/
374373
void BLECharacteristicCallbacks::onRead(BLECharacteristic *pCharacteristic, BLEConnInfo &connInfo) {
375-
NIMBLE_LOGD("BLECharacteristicCallbacks", "onRead: default");
374+
log_d("BLECharacteristicCallbacks", "onRead: default");
376375
} // onRead
377376

378377
/**
@@ -381,7 +380,7 @@ void BLECharacteristicCallbacks::onRead(BLECharacteristic *pCharacteristic, BLEC
381380
* @param [in] connInfo A reference to a BLEConnInfo instance containing the peer info.
382381
*/
383382
void BLECharacteristicCallbacks::onWrite(BLECharacteristic *pCharacteristic, BLEConnInfo &connInfo) {
384-
NIMBLE_LOGD("BLECharacteristicCallbacks", "onWrite: default");
383+
log_d("BLECharacteristicCallbacks", "onWrite: default");
385384
} // onWrite
386385

387386
/**
@@ -392,7 +391,7 @@ void BLECharacteristicCallbacks::onWrite(BLECharacteristic *pCharacteristic, BLE
392391
* any other value is an error.
393392
*/
394393
void BLECharacteristicCallbacks::onStatus(BLECharacteristic *pCharacteristic, int code) {
395-
NIMBLE_LOGD("BLECharacteristicCallbacks", "onStatus: default");
394+
log_d("BLECharacteristicCallbacks", "onStatus: default");
396395
} // onStatus
397396

398397
/**
@@ -406,7 +405,7 @@ void BLECharacteristicCallbacks::onStatus(BLECharacteristic *pCharacteristic, in
406405
* * 3 = Notifications and Indications
407406
*/
408407
void BLECharacteristicCallbacks::onSubscribe(BLECharacteristic *pCharacteristic, BLEConnInfo &connInfo, uint16_t subValue) {
409-
NIMBLE_LOGD("BLECharacteristicCallbacks", "onSubscribe: default");
408+
log_d("BLECharacteristicCallbacks", "onSubscribe: default");
410409
}
411410

412411
#endif /* CONFIG_BT_ENABLED && CONFIG_BT_NIMBLE_ROLE_PERIPHERAL */

0 commit comments

Comments
 (0)