Skip to content

Commit 518221d

Browse files
lucasssvazlucasssvaz
committed
Fix formatting
1 parent 4f7809b commit 518221d

File tree

7 files changed

+34
-24
lines changed

7 files changed

+34
-24
lines changed

Diff for: ‎libraries/BLE/src/BLE2901.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
#include "BLEUUID.h"
2626

2727
#ifdef CONFIG_NIMBLE_ENABLED
28-
#include "host/ble_att.h" // for Nimble
28+
#include "host/ble_att.h" // for Nimble
2929
#else
30-
#include "esp_gatt_defs.h" // for Bluedroid
31-
#define BLE_ATT_ATTR_MAX_LEN ESP_GATT_MAX_ATTR_LEN // for Bluedroid
30+
#include "esp_gatt_defs.h" // for Bluedroid
31+
#define BLE_ATT_ATTR_MAX_LEN ESP_GATT_MAX_ATTR_LEN // for Bluedroid
3232
#endif
3333

3434
BLE2901::BLE2901() : BLEDescriptor(BLEUUID((uint16_t)0x2901)) {} // BLE2901

Diff for: ‎libraries/BLE/src/BLECharacteristic.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,12 @@ class BLECharacteristic : public BLELocalValueAttribute {
7676
bool notify(uint16_t connHandle = BLE_HS_CONN_HANDLE_NONE) const;
7777
bool notify(const uint8_t *value, size_t length, uint16_t connHandle = BLE_HS_CONN_HANDLE_NONE) const;
7878

79-
BLEDescriptor *
80-
createDescriptor(const char *uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN);
81-
BLEDescriptor *
82-
createDescriptor(const BLEUUID &uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN);
79+
BLEDescriptor *createDescriptor(
80+
const char *uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN
81+
);
82+
BLEDescriptor *createDescriptor(
83+
const BLEUUID &uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN
84+
);
8385
BLE2904 *create2904();
8486
BLEDescriptor *getDescriptorByUUID(const char *uuid) const;
8587
BLEDescriptor *getDescriptorByUUID(const BLEUUID &uuid) const;

Diff for: ‎libraries/BLE/src/BLEDevice.h

-1
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,6 @@ class BLEDevice {
296296
* Author: kolban
297297
*/
298298

299-
300299
#include <esp_gap_ble_api.h> // ESP32 BLE
301300
#include <esp_gattc_api.h> // ESP32 BLE
302301
#include <map> // Part of C++ STL

Diff for: ‎libraries/BLE/src/BLEService.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ class BLEService : public BLELocalAttribute {
4444
void dump() const;
4545
bool isStarted() const;
4646
bool start();
47-
BLECharacteristic *
48-
createCharacteristic(const char *uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
47+
BLECharacteristic *createCharacteristic(
48+
const char *uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN
49+
);
4950

50-
BLECharacteristic *
51-
createCharacteristic(const BLEUUID &uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
51+
BLECharacteristic *createCharacteristic(
52+
const BLEUUID &uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN
53+
);
5254
void addCharacteristic(BLECharacteristic *pCharacteristic);
5355
void removeCharacteristic(BLECharacteristic *pCharacteristic, bool deleteChr = false);
5456
BLECharacteristic *getCharacteristic(const char *uuid, uint16_t instanceId = 0) const;

Diff for: ‎libraries/BLE/src/NimBLEHIDDevice.cpp

+16-7
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,11 @@ BLECharacteristic *BLEHIDDevice::locateReportCharacteristicByIdAndType(uint8_t r
181181
BLECharacteristic *BLEHIDDevice::getInputReport(uint8_t reportId) {
182182
BLECharacteristic *inputReportChr = locateReportCharacteristicByIdAndType(reportId, 0x01);
183183
if (inputReportChr == nullptr) {
184-
inputReportChr = m_hidSvc->createCharacteristic(inputReportChrUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY | BLECharacteristic::PROPERTY_READ_ENC);
185-
BLEDescriptor *inputReportDsc = inputReportChr->createDescriptor(featureReportDscUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_READ_ENC);
184+
inputReportChr = m_hidSvc->createCharacteristic(
185+
inputReportChrUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY | BLECharacteristic::PROPERTY_READ_ENC
186+
);
187+
BLEDescriptor *inputReportDsc =
188+
inputReportChr->createDescriptor(featureReportDscUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_READ_ENC);
186189

187190
uint8_t desc1_val[] = {reportId, 0x01};
188191
inputReportDsc->setValue(desc1_val, 2);
@@ -202,10 +205,12 @@ BLECharacteristic *BLEHIDDevice::getOutputReport(uint8_t reportId) {
202205
BLECharacteristic *outputReportChr = locateReportCharacteristicByIdAndType(reportId, 0x02);
203206
if (outputReportChr == nullptr) {
204207
outputReportChr = m_hidSvc->createCharacteristic(
205-
inputReportChrUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_WRITE_NR | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
208+
inputReportChrUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_WRITE_NR
209+
| BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
206210
);
207211
BLEDescriptor *outputReportDsc = outputReportChr->createDescriptor(
208-
featureReportDscUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
212+
featureReportDscUuid,
213+
BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
209214
);
210215
uint8_t desc1_val[] = {reportId, 0x02};
211216
outputReportDsc->setValue(desc1_val, 2);
@@ -225,10 +230,12 @@ BLECharacteristic *BLEHIDDevice::getFeatureReport(uint8_t reportId) {
225230
BLECharacteristic *featureReportChr = locateReportCharacteristicByIdAndType(reportId, 0x03);
226231
if (featureReportChr == nullptr) {
227232
featureReportChr = m_hidSvc->createCharacteristic(
228-
inputReportChrUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
233+
inputReportChrUuid,
234+
BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
229235
);
230236
BLEDescriptor *featureReportDsc = featureReportChr->createDescriptor(
231-
featureReportDscUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
237+
featureReportDscUuid,
238+
BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
232239
);
233240

234241
uint8_t desc1_val[] = {reportId, 0x03};
@@ -263,7 +270,9 @@ BLECharacteristic *BLEHIDDevice::getBootOutput() {
263270
return bootOutputChr;
264271
}
265272

266-
return m_hidSvc->createCharacteristic(bootOutputChrUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_WRITE_NR);
273+
return m_hidSvc->createCharacteristic(
274+
bootOutputChrUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_WRITE_NR
275+
);
267276
} // getBootOutput
268277

269278
/**

Diff for: ‎libraries/BLE/src/NimBLEServer.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,7 @@ void BLEServer::start() {
191191
if (svc->getRemoved() == 0) {
192192
rc = ble_gatts_find_svc(svc->getUUID().getBase(), &svc->m_handle);
193193
if (rc != 0) {
194-
log_w(
195-
LOG_TAG, "GATT Server started without service: %s, Service %s", svc->getUUID().toString().c_str(), svc->isStarted() ? "missing" : "not started"
196-
);
194+
log_w(LOG_TAG, "GATT Server started without service: %s, Service %s", svc->getUUID().toString().c_str(), svc->isStarted() ? "missing" : "not started");
197195
continue; // Skip this service as it was not started
198196
}
199197
}

Diff for: ‎libraries/BLE/src/btconfig.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
#define CONFIG_BTDM_SCAN_DUPL_TYPE_DEVICE CONFIG_SCAN_DUPLICATE_BY_DEVICE_ADDR
5353
#endif
5454

55-
#if defined(CONFIG_SCAN_DUPLICATE_BY_ADV_DATA ) && !defined(CONFIG_BTDM_SCAN_DUPL_TYPE_DATA)
55+
#if defined(CONFIG_SCAN_DUPLICATE_BY_ADV_DATA) && !defined(CONFIG_BTDM_SCAN_DUPL_TYPE_DATA)
5656
#define CONFIG_BTDM_SCAN_DUPL_TYPE_DATA CONFIG_SCAN_DUPLICATE_BY_ADV_DATA
5757
#endif
5858

@@ -76,7 +76,7 @@
7676
#define CONFIG_BTDM_SCAN_DUPL_CACHE_SIZE CONFIG_BT_CTRL_SCAN_DUPL_CACHE_SIZE
7777
#endif
7878

79-
#if defined(CONFIG_NIMBLE_MAX_CONNECTIONS ) && !defined(CONFIG_BT_NIMBLE_MAX_CONNECTIONS)
79+
#if defined(CONFIG_NIMBLE_MAX_CONNECTIONS) && !defined(CONFIG_BT_NIMBLE_MAX_CONNECTIONS)
8080
#define CONFIG_BT_NIMBLE_MAX_CONNECTIONS CONFIG_NIMBLE_MAX_CONNECTIONS
8181
#endif
8282

0 commit comments

Comments
 (0)