Skip to content

Commit 4f7809b

Browse files
lucasssvazlucasssvaz
committed
Rename properties
1 parent 941a6c9 commit 4f7809b

File tree

5 files changed

+42
-45
lines changed

5 files changed

+42
-45
lines changed

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

+17-4
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,25 @@ class BLE2904;
4242
*/
4343
class BLECharacteristic : public BLELocalValueAttribute {
4444
public:
45+
static const uint32_t PROPERTY_READ = BLE_GATT_CHR_F_READ;
46+
static const uint32_t PROPERTY_READ_ENC = BLE_GATT_CHR_F_READ_ENC;
47+
static const uint32_t PROPERTY_READ_AUTHEN = BLE_GATT_CHR_F_READ_AUTHEN;
48+
static const uint32_t PROPERTY_READ_AUTHOR = BLE_GATT_CHR_F_READ_AUTHOR;
49+
static const uint32_t PROPERTY_WRITE = BLE_GATT_CHR_F_WRITE;
50+
static const uint32_t PROPERTY_WRITE_NR = BLE_GATT_CHR_F_WRITE_NO_RSP;
51+
static const uint32_t PROPERTY_WRITE_ENC = BLE_GATT_CHR_F_WRITE_ENC;
52+
static const uint32_t PROPERTY_WRITE_AUTHEN = BLE_GATT_CHR_F_WRITE_AUTHEN;
53+
static const uint32_t PROPERTY_WRITE_AUTHOR = BLE_GATT_CHR_F_WRITE_AUTHOR;
54+
static const uint32_t PROPERTY_BROADCAST = BLE_GATT_CHR_F_BROADCAST;
55+
static const uint32_t PROPERTY_NOTIFY = BLE_GATT_CHR_F_NOTIFY;
56+
static const uint32_t PROPERTY_INDICATE = BLE_GATT_CHR_F_INDICATE;
57+
4558
BLECharacteristic(
46-
const char *uuid, uint16_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN,
59+
const char *uuid, uint16_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN,
4760
BLEService *pService = nullptr
4861
);
4962
BLECharacteristic(
50-
const BLEUUID &uuid, uint16_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN,
63+
const BLEUUID &uuid, uint16_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN,
5164
BLEService *pService = nullptr
5265
);
5366

@@ -64,9 +77,9 @@ class BLECharacteristic : public BLELocalValueAttribute {
6477
bool notify(const uint8_t *value, size_t length, uint16_t connHandle = BLE_HS_CONN_HANDLE_NONE) const;
6578

6679
BLEDescriptor *
67-
createDescriptor(const char *uuid, uint32_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN);
80+
createDescriptor(const char *uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN);
6881
BLEDescriptor *
69-
createDescriptor(const BLEUUID &uuid, uint32_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN);
82+
createDescriptor(const BLEUUID &uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t maxLen = BLE_ATT_ATTR_MAX_LEN);
7083
BLE2904 *create2904();
7184
BLEDescriptor *getDescriptorByUUID(const char *uuid) const;
7285
BLEDescriptor *getDescriptorByUUID(const BLEUUID &uuid) const;

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

-16
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,13 @@
2121
#include "btconfig.h"
2222
#if defined(CONFIG_NIMBLE_ENABLED) && defined(CONFIG_BT_NIMBLE_ROLE_PERIPHERAL)
2323

24-
#include "nimconfig_rename.h"
2524
#include "host/ble_hs.h"
2625

2726
/**** FIX COMPILATION ****/
2827
#undef min
2928
#undef max
3029
/**************************/
3130

32-
typedef enum {
33-
READ = BLE_GATT_CHR_F_READ,
34-
READ_ENC = BLE_GATT_CHR_F_READ_ENC,
35-
READ_AUTHEN = BLE_GATT_CHR_F_READ_AUTHEN,
36-
READ_AUTHOR = BLE_GATT_CHR_F_READ_AUTHOR,
37-
WRITE = BLE_GATT_CHR_F_WRITE,
38-
WRITE_NR = BLE_GATT_CHR_F_WRITE_NO_RSP,
39-
WRITE_ENC = BLE_GATT_CHR_F_WRITE_ENC,
40-
WRITE_AUTHEN = BLE_GATT_CHR_F_WRITE_AUTHEN,
41-
WRITE_AUTHOR = BLE_GATT_CHR_F_WRITE_AUTHOR,
42-
BROADCAST = BLE_GATT_CHR_F_BROADCAST,
43-
NOTIFY = BLE_GATT_CHR_F_NOTIFY,
44-
INDICATE = BLE_GATT_CHR_F_INDICATE
45-
} NIMBLE_PROPERTY;
46-
4731
#include "BLELocalAttribute.h"
4832
#include "BLEAttValue.h"
4933
#include <vector>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ class BLEService : public BLELocalAttribute {
4545
bool isStarted() const;
4646
bool start();
4747
BLECharacteristic *
48-
createCharacteristic(const char *uuid, uint32_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
48+
createCharacteristic(const char *uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
4949

5050
BLECharacteristic *
51-
createCharacteristic(const BLEUUID &uuid, uint32_t properties = NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
51+
createCharacteristic(const BLEUUID &uuid, uint32_t properties = BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE, uint16_t max_len = BLE_ATT_ATTR_MAX_LEN);
5252
void addCharacteristic(BLECharacteristic *pCharacteristic);
5353
void removeCharacteristic(BLECharacteristic *pCharacteristic, bool deleteChr = false);
5454
BLECharacteristic *getCharacteristic(const char *uuid, uint16_t instanceId = 0) const;

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -53,28 +53,28 @@ BLEDescriptor::BLEDescriptor(const BLEUUID &uuid, uint16_t properties, uint16_t
5353

5454
// convert uint16_t properties to uint8_t for descriptor properties
5555
uint8_t descProperties = 0;
56-
if (properties & NIMBLE_PROPERTY::READ) {
56+
if (properties & BLECharacteristic::PROPERTY_READ) {
5757
descProperties |= BLE_ATT_F_READ;
5858
}
59-
if (properties & (NIMBLE_PROPERTY::WRITE_NR | NIMBLE_PROPERTY::WRITE)) {
59+
if (properties & (BLECharacteristic::PROPERTY_WRITE_NR | BLECharacteristic::PROPERTY_WRITE)) {
6060
descProperties |= BLE_ATT_F_WRITE;
6161
}
62-
if (properties & NIMBLE_PROPERTY::READ_ENC) {
62+
if (properties & BLECharacteristic::PROPERTY_READ_ENC) {
6363
descProperties |= BLE_ATT_F_READ_ENC;
6464
}
65-
if (properties & NIMBLE_PROPERTY::READ_AUTHEN) {
65+
if (properties & BLECharacteristic::PROPERTY_READ_AUTHEN) {
6666
descProperties |= BLE_ATT_F_READ_AUTHEN;
6767
}
68-
if (properties & NIMBLE_PROPERTY::READ_AUTHOR) {
68+
if (properties & BLECharacteristic::PROPERTY_READ_AUTHOR) {
6969
descProperties |= BLE_ATT_F_READ_AUTHOR;
7070
}
71-
if (properties & NIMBLE_PROPERTY::WRITE_ENC) {
71+
if (properties & BLECharacteristic::PROPERTY_WRITE_ENC) {
7272
descProperties |= BLE_ATT_F_WRITE_ENC;
7373
}
74-
if (properties & NIMBLE_PROPERTY::WRITE_AUTHEN) {
74+
if (properties & BLECharacteristic::PROPERTY_WRITE_AUTHEN) {
7575
descProperties |= BLE_ATT_F_WRITE_AUTHEN;
7676
}
77-
if (properties & NIMBLE_PROPERTY::WRITE_AUTHOR) {
77+
if (properties & BLECharacteristic::PROPERTY_WRITE_AUTHOR) {
7878
descProperties |= BLE_ATT_F_WRITE_AUTHOR;
7979
}
8080

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ BLEHIDDevice::BLEHIDDevice(BLEServer *server) {
5151
m_batterySvc = server->createService(batterySvcUuid);
5252

5353
// Mandatory characteristic for device info service
54-
m_pnpChr = m_deviceInfoSvc->createCharacteristic(pnpCharUuid, NIMBLE_PROPERTY::READ);
54+
m_pnpChr = m_deviceInfoSvc->createCharacteristic(pnpCharUuid, BLECharacteristic::PROPERTY_READ);
5555

5656
// Mandatory characteristics for HID service
57-
m_hidInfoChr = m_hidSvc->createCharacteristic(hidInfoCharUuid, NIMBLE_PROPERTY::READ);
58-
m_reportMapChr = m_hidSvc->createCharacteristic(reportMapCharUuid, NIMBLE_PROPERTY::READ);
59-
m_hidControlChr = m_hidSvc->createCharacteristic(hidControlCharUuid, NIMBLE_PROPERTY::WRITE_NR);
60-
m_protocolModeChr = m_hidSvc->createCharacteristic(protocolModeCharUuid, NIMBLE_PROPERTY::WRITE_NR | NIMBLE_PROPERTY::READ);
57+
m_hidInfoChr = m_hidSvc->createCharacteristic(hidInfoCharUuid, BLECharacteristic::PROPERTY_READ);
58+
m_reportMapChr = m_hidSvc->createCharacteristic(reportMapCharUuid, BLECharacteristic::PROPERTY_READ);
59+
m_hidControlChr = m_hidSvc->createCharacteristic(hidControlCharUuid, BLECharacteristic::PROPERTY_WRITE_NR);
60+
m_protocolModeChr = m_hidSvc->createCharacteristic(protocolModeCharUuid, BLECharacteristic::PROPERTY_WRITE_NR | BLECharacteristic::PROPERTY_READ);
6161

6262
// Mandatory battery level characteristic with notification and presence descriptor
63-
m_batteryLevelChr = m_batterySvc->createCharacteristic(batteryLevelCharUuid, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
63+
m_batteryLevelChr = m_batterySvc->createCharacteristic(batteryLevelCharUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_NOTIFY);
6464
BLE2904 *batteryLevelDescriptor = m_batteryLevelChr->create2904();
6565
batteryLevelDescriptor->setFormat(BLE2904::FORMAT_UINT8);
6666
batteryLevelDescriptor->setUnit(0x27ad); // percentage
@@ -95,7 +95,7 @@ void BLEHIDDevice::startServices() {
9595
*/
9696
bool BLEHIDDevice::setManufacturer(const std::string &name) {
9797
if (m_manufacturerChr == nullptr) {
98-
m_manufacturerChr = m_deviceInfoSvc->createCharacteristic(m_manufacturerChrUuid, NIMBLE_PROPERTY::READ);
98+
m_manufacturerChr = m_deviceInfoSvc->createCharacteristic(m_manufacturerChrUuid, BLECharacteristic::PROPERTY_READ);
9999
}
100100

101101
if (m_manufacturerChr) {
@@ -181,8 +181,8 @@ 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, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY | NIMBLE_PROPERTY::READ_ENC);
185-
BLEDescriptor *inputReportDsc = inputReportChr->createDescriptor(featureReportDscUuid, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC);
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);
186186

187187
uint8_t desc1_val[] = {reportId, 0x01};
188188
inputReportDsc->setValue(desc1_val, 2);
@@ -202,10 +202,10 @@ BLECharacteristic *BLEHIDDevice::getOutputReport(uint8_t reportId) {
202202
BLECharacteristic *outputReportChr = locateReportCharacteristicByIdAndType(reportId, 0x02);
203203
if (outputReportChr == nullptr) {
204204
outputReportChr = m_hidSvc->createCharacteristic(
205-
inputReportChrUuid, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC
205+
inputReportChrUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_WRITE_NR | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
206206
);
207207
BLEDescriptor *outputReportDsc = outputReportChr->createDescriptor(
208-
featureReportDscUuid, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC
208+
featureReportDscUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
209209
);
210210
uint8_t desc1_val[] = {reportId, 0x02};
211211
outputReportDsc->setValue(desc1_val, 2);
@@ -225,10 +225,10 @@ BLECharacteristic *BLEHIDDevice::getFeatureReport(uint8_t reportId) {
225225
BLECharacteristic *featureReportChr = locateReportCharacteristicByIdAndType(reportId, 0x03);
226226
if (featureReportChr == nullptr) {
227227
featureReportChr = m_hidSvc->createCharacteristic(
228-
inputReportChrUuid, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC
228+
inputReportChrUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
229229
);
230230
BLEDescriptor *featureReportDsc = featureReportChr->createDescriptor(
231-
featureReportDscUuid, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC
231+
featureReportDscUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_READ_ENC | BLECharacteristic::PROPERTY_WRITE_ENC
232232
);
233233

234234
uint8_t desc1_val[] = {reportId, 0x03};
@@ -249,7 +249,7 @@ BLECharacteristic *BLEHIDDevice::getBootInput() {
249249
return bootInputChr;
250250
}
251251

252-
return m_hidSvc->createCharacteristic(bootInputChrUuid, NIMBLE_PROPERTY::NOTIFY);
252+
return m_hidSvc->createCharacteristic(bootInputChrUuid, BLECharacteristic::PROPERTY_NOTIFY);
253253
} // getBootInput
254254

255255
/**
@@ -263,7 +263,7 @@ BLECharacteristic *BLEHIDDevice::getBootOutput() {
263263
return bootOutputChr;
264264
}
265265

266-
return m_hidSvc->createCharacteristic(bootOutputChrUuid, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR);
266+
return m_hidSvc->createCharacteristic(bootOutputChrUuid, BLECharacteristic::PROPERTY_READ | BLECharacteristic::PROPERTY_WRITE | BLECharacteristic::PROPERTY_WRITE_NR);
267267
} // getBootOutput
268268

269269
/**

0 commit comments

Comments
 (0)