Skip to content

Commit 7767d3d

Browse files
sandeepmistrysandeepmistry
committed
Rename Ble prefixes to BLE
1 parent ee0ae44 commit 7767d3d

28 files changed

+451
-452
lines changed

‎libraries/CurieBle/examples/AutomationIO/AutomationIO.ino‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,33 +43,33 @@
4343
struct DigitalPinConfig {
4444
unsigned pin;
4545
const char *name;
46-
BleUnsignedCharCharacteristic characteristic;
47-
BleDescriptor userDescription;
48-
BleDescriptor presentationFormat;
49-
BleDescriptor numDigitalsDesc;
46+
BLEUnsignedCharCharacteristic characteristic;
47+
BLEDescriptor userDescription;
48+
BLEDescriptor presentationFormat;
49+
BLEDescriptor numDigitalsDesc;
5050
uint8_t val;
5151
};
5252

5353
struct AnalogPinConfig {
5454
unsigned pin;
5555
const char *name;
56-
BleUnsignedShortCharacteristic characteristic;
57-
BleDescriptor userDescription;
58-
BleDescriptor presentationFormat;
56+
BLEUnsignedShortCharacteristic characteristic;
57+
BLEDescriptor userDescription;
58+
BLEDescriptor presentationFormat;
5959
uint16_t val;
6060
};
6161

6262
/* Macros to simplify the definition of a new PinConfig struct for a given pin number
6363
* Note that input pins are only readable by the remote device, while output pins are
6464
* only writable. Different characteristic UUIDs are used for digital and analog pins */
6565
#define DIGITAL_INPUT_PINCONFIG(pin) \
66-
{ (pin), #pin, {CHAR_UUID_DIGITAL, BleRead | BleNotify}, {"2901", #pin}, {"2904", (uint8_t[]){0x02, 0x00, 0x00, 0x027, 0x1, pin + 1, 00}, 7}, {DESC_UUID_NUMDIGITALS, (uint8_t[]){1}, sizeof(uint8_t)} }
66+
{ (pin), #pin, {CHAR_UUID_DIGITAL, BLERead | BLENotify}, {"2901", #pin}, {"2904", (uint8_t[]){0x02, 0x00, 0x00, 0x027, 0x1, pin + 1, 00}, 7}, {DESC_UUID_NUMDIGITALS, (uint8_t[]){1}, sizeof(uint8_t)} }
6767
#define DIGITAL_OUTPUT_PINCONFIG(pin) \
68-
{ (pin), #pin, {CHAR_UUID_DIGITAL, BleWriteWithoutResponse | BleWrite}, {"2901", #pin}, {"2904", (uint8_t[]){0x02, 0x00, 0x00, 0x027, 0x1, pin + 1, 00}, 7}, {DESC_UUID_NUMDIGITALS, (uint8_t[]){1}, sizeof(uint8_t)} }
68+
{ (pin), #pin, {CHAR_UUID_DIGITAL, BLEWriteWithoutResponse | BLEWrite}, {"2901", #pin}, {"2904", (uint8_t[]){0x02, 0x00, 0x00, 0x027, 0x1, pin + 1, 00}, 7}, {DESC_UUID_NUMDIGITALS, (uint8_t[]){1}, sizeof(uint8_t)} }
6969
#define ANALOG_INPUT_PINCONFIG(pin) \
70-
{ (pin), #pin, {CHAR_UUID_ANALOG, BleRead | BleNotify}, {"2901", #pin}, {"2904", (uint8_t[]){0x6, 0x00, 0x00, 0x027, 0x1, pin + 1, 00}, 7} }
70+
{ (pin), #pin, {CHAR_UUID_ANALOG, BLERead | BLENotify}, {"2901", #pin}, {"2904", (uint8_t[]){0x6, 0x00, 0x00, 0x027, 0x1, pin + 1, 00}, 7} }
7171
#define ANALOG_OUTPUT_PINCONFIG(pin) \
72-
{ (pin), #pin, {CHAR_UUID_ANALOG, BleWriteWithoutResponse | BleWrite}, {"2901", #pin}, {"2904", (uint8_t[]){0x6, 0x00, 0x00, 0x027, 0x1, pin + 1, 00}, 7} }
72+
{ (pin), #pin, {CHAR_UUID_ANALOG, BLEWriteWithoutResponse | BLEWrite}, {"2901", #pin}, {"2904", (uint8_t[]){0x6, 0x00, 0x00, 0x027, 0x1, pin + 1, 00}, 7} }
7373

7474
/* The following lists of pins are configured and presented to
7575
* the remote BLE device as digital/analog input/output pins
@@ -111,10 +111,10 @@ struct AnalogPinConfig analogOutputPins[] = {
111111
};
112112

113113
/* BLE Peripheral Device (this Intel Curie device) */
114-
BlePeripheral blePeripheral;
114+
BLEPeripheral blePeripheral;
115115

116116
/* BLE Automation I/O Service */
117-
BleService ioService(SERVICE_UUID_AUTOMATIONIO);
117+
BLEService ioService(SERVICE_UUID_AUTOMATIONIO);
118118

119119
/* The standard allows for multiple digital pins to be included per characteristic,
120120
* where the pin states are encapsulated as an array of 2-bit values
@@ -145,18 +145,18 @@ BleService ioService(SERVICE_UUID_AUTOMATIONIO);
145145

146146
/* This function will be called when a BLE GAP event is detected by the
147147
* Intel Curie BLE device */
148-
void blePeripheralConnectedEventCb(BleCentral &bleCentral)
148+
void blePeripheralConnectedEventCb(BLECentral &bleCentral)
149149
{
150150
LOG_SERIAL.println("Got CONNECTED event");
151151
}
152152

153-
void blePeripheralDisconnectedEventCb(BleCentral &bleCentral)
153+
void blePeripheralDisconnectedEventCb(BLECentral &bleCentral)
154154
{
155155
LOG_SERIAL.println("Got DISCONNECTED event");
156156
}
157157

158158
/* This function will be called when a connected remote peer sets a new value for a digital output characteristic */
159-
void digitalOutputCharWrittenEventCb(BleCentral &central, BleCharacteristic &characteristic)
159+
void digitalOutputCharWrittenEventCb(BLECentral &central, BLECharacteristic &characteristic)
160160
{
161161
for(unsigned int i = 0; i < ARRAY_SIZE(digitalOutputPins); i++) {
162162
if (&digitalOutputPins[i].characteristic == &characteristic) {
@@ -172,7 +172,7 @@ void digitalOutputCharWrittenEventCb(BleCentral &central, BleCharacteristic &cha
172172
}
173173

174174
/* This function will be called when a connected remote peer sets a new value for an analog output characteristic */
175-
void analogOutputCharWrittenEventCb(BleCentral &central, BleCharacteristic &characteristic)
175+
void analogOutputCharWrittenEventCb(BLECentral &central, BLECharacteristic &characteristic)
176176
{
177177
for(unsigned int i = 0; i < ARRAY_SIZE(analogOutputPins); i++) {
178178
if (&analogOutputPins[i].characteristic == &characteristic) {
@@ -193,8 +193,8 @@ void setup() {
193193
CHECK_STATUS(blePeripheral.setLocalName(LOCAL_NAME));
194194

195195
/* Set a function to be called whenever a BLE GAP event occurs */
196-
blePeripheral.setEventHandler(BleConnected, blePeripheralConnectedEventCb);
197-
blePeripheral.setEventHandler(BleDisconnected, blePeripheralDisconnectedEventCb);
196+
blePeripheral.setEventHandler(BLEConnected, blePeripheralConnectedEventCb);
197+
blePeripheral.setEventHandler(BLEDisconnected, blePeripheralDisconnectedEventCb);
198198

199199
CHECK_STATUS(blePeripheral.setAdvertisedServiceUuid(ioService.uuid()));
200200

@@ -229,7 +229,7 @@ void setup() {
229229
/* Add the characteristic for this pin */
230230
CHECK_STATUS(blePeripheral.addAttribute(pin->characteristic));
231231
/* Add a callback to be triggered if the remote device updates the value for this pin */
232-
pin->characteristic.setEventHandler(BleWritten, digitalOutputCharWrittenEventCb);
232+
pin->characteristic.setEventHandler(BLEWritten, digitalOutputCharWrittenEventCb);
233233
/* Add a number_of_digitals descriptor for this characteristic */
234234
CHECK_STATUS(blePeripheral.addAttribute(pin->userDescription));
235235
CHECK_STATUS(blePeripheral.addAttribute(pin->presentationFormat));
@@ -258,7 +258,7 @@ void setup() {
258258
CHECK_STATUS(blePeripheral.addAttribute(pin->userDescription));
259259
CHECK_STATUS(blePeripheral.addAttribute(pin->presentationFormat));
260260
/* Add a callback to be triggered if the remote device updates the value for this pin */
261-
pin->characteristic.setEventHandler(BleWritten, analogOutputCharWrittenEventCb);
261+
pin->characteristic.setEventHandler(BLEWritten, analogOutputCharWrittenEventCb);
262262
}
263263

264264
/* Now activate the BLE device. It will start continuously transmitting BLE

‎libraries/CurieBle/examples/BatteryMonitor/BatteryMonitor.ino‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424

2525
/* BLE Peripheral Device (this Intel Curie device) */
26-
BlePeripheral blePeripheral;
26+
BLEPeripheral blePeripheral;
2727

2828
/* UUID for Battery service */
2929
#define SERVICE_UUID_BATTERY "180F"
@@ -48,26 +48,26 @@ BlePeripheral blePeripheral;
4848
} while(0)
4949

5050
/* BLE Battery Service */
51-
BleService battSvc(SERVICE_UUID_BATTERY);
51+
BLEService battSvc(SERVICE_UUID_BATTERY);
5252

5353
/* BLE Battery Level Characteristic */
54-
BleUnsignedCharCharacteristic battLvlChar(CHAR_UUID_BATTERY_LEVEL, /* standard 16-bit characteristic UUID */
55-
BleRead | BleNotify /* remote clients will be able to get notifications if this characteristic changes */
54+
BLEUnsignedCharCharacteristic battLvlChar(CHAR_UUID_BATTERY_LEVEL, /* standard 16-bit characteristic UUID */
55+
BLERead | BLENotify /* remote clients will be able to get notifications if this characteristic changes */
5656
);
5757

5858
/* Variable to keep track of last battery level reading from analog input */
5959
unsigned char oldBattLvl = 0;
6060

6161
/* This function will be called when a BLE GAP event is detected by the
6262
* Intel Curie BLE device */
63-
void blePeripheralConnectedEventCb(BleCentral &bleCentral)
63+
void blePeripheralConnectedEventCb(BLECentral &bleCentral)
6464
{
6565
/* We've got a new connection. Lets print the MAC address of the remote device */
6666
LOG_SERIAL.println("Got CONNECTED event");
6767
LOG_SERIAL.println(bleCentral.address());
6868
}
6969

70-
void blePeripheralDisconnectedEventCb(BleCentral &bleCentral)
70+
void blePeripheralDisconnectedEventCb(BLECentral &bleCentral)
7171
{
7272
LOG_SERIAL.println("Got DISCONNECTED event");
7373
}
@@ -83,8 +83,8 @@ void setup() {
8383
CHECK_STATUS(blePeripheral.setLocalName("AE_BATTMON"));
8484

8585
/* Set a function to be called whenever a BLE GAP event occurs */
86-
blePeripheral.setEventHandler(BleConnected, blePeripheralConnectedEventCb);
87-
blePeripheral.setEventHandler(BleDisconnected, blePeripheralDisconnectedEventCb);
86+
blePeripheral.setEventHandler(BLEConnected, blePeripheralConnectedEventCb);
87+
blePeripheral.setEventHandler(BLEDisconnected, blePeripheralDisconnectedEventCb);
8888

8989
CHECK_STATUS(blePeripheral.setAdvertisedServiceUuid(battSvc.uuid()));
9090

‎libraries/CurieBle/examples/BatteryMonitorNewAPI/BatteryMonitorNewAPI.ino‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
*/
2424

2525
/* BLE Peripheral Device (this Intel Curie device) */
26-
BlePeripheral blePeripheral;
26+
BLEPeripheral blePeripheral;
2727

2828
/* BLE Battery Service */
29-
BleService battSvc("180F");
29+
BLEService battSvc("180F");
3030

3131
/* BLE Battery Level Characteristic */
32-
BleUnsignedCharCharacteristic battLvlChar("2A19", /* standard 16-bit characteristic UUID */
33-
BleRead | BleNotify /* remote clients will be able to get notifications if this characteristic changes */
32+
BLEUnsignedCharCharacteristic battLvlChar("2A19", /* standard 16-bit characteristic UUID */
33+
BLERead | BLENotify /* remote clients will be able to get notifications if this characteristic changes */
3434
);
3535

3636
/* Variable to keep track of last battery level reading from analog input */
@@ -67,7 +67,7 @@ void setup() {
6767
}
6868

6969
void loop() {
70-
BleCentral central = blePeripheral.central();
70+
BLECentral central = blePeripheral.central();
7171

7272
if (central) {
7373
// central connected to peripheral

‎libraries/CurieBle/examples/ButtonLED/ButtonLED.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@
2323
const int ledPin = 13; // set ledPin to on-board LED
2424
const int buttonPin = 4; // set buttonPin to digital pin 4
2525

26-
BlePeripheral blePeripheral; // create peripheral instance
27-
BleService ledService("19B10010-E8F2-537E-4F6C-D104768A1214"); // create service
26+
BLEPeripheral blePeripheral; // create peripheral instance
27+
BLEService ledService("19B10010-E8F2-537E-4F6C-D104768A1214"); // create service
2828

2929

3030
// create switch characteristic and allow remote device to read and write
31-
BleCharCharacteristic ledCharacteristic("19B10011-E8F2-537E-4F6C-D104768A1214", BleRead | BleWrite);
31+
BLECharCharacteristic ledCharacteristic("19B10011-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
3232
// create button characteristic and allow remote device to get notifications
33-
BleCharCharacteristic buttonCharacteristic("19B10012-E8F2-537E-4F6C-D104768A1214", BleRead | BleNotify); // allows remote device to get notifications
33+
BLECharCharacteristic buttonCharacteristic("19B10012-E8F2-537E-4F6C-D104768A1214", BLERead | BLENotify); // allows remote device to get notifications
3434

3535
void setup() {
3636
Serial.begin(9600);

‎libraries/CurieBle/examples/CallbackLED/CallbackLED.ino‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
#include <CurieBle.h>
2222

2323
const int ledPin = 13; // set ledPin to use on-board LED
24-
BlePeripheral blePeripheral; // create peripheral instance
24+
BLEPeripheral blePeripheral; // create peripheral instance
2525

26-
BleService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // create service
26+
BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214"); // create service
2727

2828
// create switch characteristic and allow remote device to read and write
29-
BleCharCharacteristic switchChar("19B10001-E8F2-537E-4F6C-D104768A1214", BleRead | BleWrite);
29+
BLECharCharacteristic switchChar("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
3030

3131
void setup() {
3232
Serial.begin(9600);
@@ -43,11 +43,11 @@ void setup() {
4343
blePeripheral.addAttribute(switchChar);
4444

4545
// assign event handlers for connected, disconnected to peripheral
46-
blePeripheral.setEventHandler(BleConnected, blePeripheralConnectHandler);
47-
blePeripheral.setEventHandler(BleDisconnected, blePeripheralDisconnectHandler);
46+
blePeripheral.setEventHandler(BLEConnected, blePeripheralConnectHandler);
47+
blePeripheral.setEventHandler(BLEDisconnected, blePeripheralDisconnectHandler);
4848

4949
// assign event handlers for characteristic
50-
switchChar.setEventHandler(BleWritten, switchCharacteristicWritten);
50+
switchChar.setEventHandler(BLEWritten, switchCharacteristicWritten);
5151

5252

5353
// advertise the service
@@ -56,26 +56,24 @@ void setup() {
5656
Serial.println(("Bluetooth device active, waiting for connections..."));
5757
}
5858

59-
60-
6159
void loop() {
6260
// poll peripheral
6361
blePeripheral.poll();
6462
}
6563

66-
void blePeripheralConnectHandler(BleCentral& central) {
64+
void blePeripheralConnectHandler(BLECentral& central) {
6765
// central connected event handler
6866
Serial.print("Connected event, central: ");
6967
Serial.println(central.address());
7068
}
7169

72-
void blePeripheralDisconnectHandler(BleCentral& central) {
70+
void blePeripheralDisconnectHandler(BLECentral& central) {
7371
// central disconnected event handler
7472
Serial.print("Disconnected event, central: ");
7573
Serial.println(central.address());
7674
}
7775

78-
void switchCharacteristicWritten(BleCentral& central, BleCharacteristic& characteristic) {
76+
void switchCharacteristicWritten(BLECentral& central, BLECharacteristic& characteristic) {
7977
// central wrote new value to characteristic, update LED
8078
Serial.print("Characteristic event, writen: ");
8179

‎libraries/CurieBle/examples/LED/LED.ino‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
#include <CurieBle.h>
1919

2020
/* BLE Peripheral (this Intel Curie device) */
21-
BlePeripheral blePeripheral;
21+
BLEPeripheral blePeripheral;
2222

2323
/* BLE LED Service */
24-
BleService ledService("19B10000-E8F2-537E-4F6C-D104768A1214");
24+
BLEService ledService("19B10000-E8F2-537E-4F6C-D104768A1214");
2525

2626
/* BLE Switch Characteristic - custom 128-bit UUID, read and writable by central */
27-
BleUnsignedCharCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BleRead | BleWrite);
27+
BLEUnsignedCharCharacteristic switchCharacteristic("19B10001-E8F2-537E-4F6C-D104768A1214", BLERead | BLEWrite);
2828

2929
const int ledPin = 13; // pin to use for the LED
3030

@@ -49,7 +49,7 @@ void setup() {
4949
}
5050

5151
void loop() {
52-
BleCentral central = blePeripheral.central();
52+
BLECentral central = blePeripheral.central();
5353

5454
if (central) {
5555
// central connected to peripheral

‎libraries/CurieBle/keywords.txt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66
# Datatypes (KEYWORD1)
77
#######################################
88

9-
BleAttribute KEYWORD1
10-
BleCentral KEYWORD1
11-
BleCharacteristic KEYWORD1
12-
BleDescriptor KEYWORD1
13-
BlePeripheral KEYWORD1
14-
BleService KEYWORD1
15-
BleTypedCharacteristic KEYWORD1
16-
BleUuid KEYWORD1
17-
18-
BleCharCharacteristic KEYWORD1
19-
BleUnsignedCharCharacteristic KEYWORD1
20-
BleShortCharacteristic KEYWORD1
21-
BleUnsignedShortCharacteristic KEYWORD1
22-
BleIntCharacteristic KEYWORD1
23-
BleUnsignedIntCharacteristic KEYWORD1
24-
BleLongCharacteristic KEYWORD1
25-
BleUnsignedLongCharacteristic KEYWORD1
26-
BleFloatCharacteristic KEYWORD1
27-
BleDoubleCharacteristic KEYWORD1
9+
BLEAttribute KEYWORD1
10+
BLECentral KEYWORD1
11+
BLECharacteristic KEYWORD1
12+
BLEDescriptor KEYWORD1
13+
BLEPeripheral KEYWORD1
14+
BLEService KEYWORD1
15+
BLETypedCharacteristic KEYWORD1
16+
BLEUuid KEYWORD1
17+
18+
BLECharCharacteristic KEYWORD1
19+
BLEUnsignedCharCharacteristic KEYWORD1
20+
BLEShortCharacteristic KEYWORD1
21+
BLEUnsignedShortCharacteristic KEYWORD1
22+
BLEIntCharacteristic KEYWORD1
23+
BLEUnsignedIntCharacteristic KEYWORD1
24+
BLELongCharacteristic KEYWORD1
25+
BLEUnsignedLongCharacteristic KEYWORD1
26+
BLEFloatCharacteristic KEYWORD1
27+
BLEDoubleCharacteristic KEYWORD1
2828

2929
#######################################
3030
# Methods and Functions (KEYWORD2)
@@ -69,20 +69,20 @@ length KEYWORD2
6969
# Constants (LITERAL1)
7070
#######################################
7171

72-
BleTypeService LITERAL1
73-
BleTypeCharacteristic LITERAL1
74-
BleTypeDescriptor LITERAL1
72+
BLETypeService LITERAL1
73+
BLETypeCharacteristic LITERAL1
74+
BLETypeDescriptor LITERAL1
7575

76-
BleBroadcast LITERAL1
77-
BleRead LITERAL1
78-
BleWriteWithoutResponse LITERAL1
79-
BleWrite LITERAL1
80-
BleNotify LITERAL1
81-
BleIndicate LITERAL1
76+
BLEBroadcast LITERAL1
77+
BLERead LITERAL1
78+
BLEWriteWithoutResponse LITERAL1
79+
BLEWrite LITERAL1
80+
BLENotify LITERAL1
81+
BLEIndicate LITERAL1
8282

83-
BleConnected LITERAL1
84-
BleDisconnected LITERAL1
83+
BLEConnected LITERAL1
84+
BLEDisconnected LITERAL1
8585

86-
BleWritten LITERAL1
87-
BleSubscribed LITERAL1
88-
BleUnsubscribed LITERAL1
86+
BLEWritten LITERAL1
87+
BLESubscribed LITERAL1
88+
BLEUnsubscribed LITERAL1

0 commit comments

Comments
 (0)