Skip to content

Commit d066e5b

Browse files
h2zeroh2zero
committed
Change NimBLEHIDDevice formatting for consistency.
1 parent d10241e commit d066e5b

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

‎src/NimBLEHIDDevice.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ NimBLEHIDDevice::NimBLEHIDDevice(NimBLEServer* server) {
2626
/*
2727
* Here we create mandatory services described in bluetooth specification
2828
*/
29-
m_deviceInfoService = server->createService(NimBLEUUID((uint16_t) 0x180a));
30-
m_hidService = server->createService(NimBLEUUID((uint16_t) 0x1812));
31-
m_batteryService = server->createService(NimBLEUUID((uint16_t) 0x180f));
29+
m_deviceInfoService = server->createService(NimBLEUUID((uint16_t)0x180a));
30+
m_hidService = server->createService(NimBLEUUID((uint16_t)0x1812));
31+
m_batteryService = server->createService(NimBLEUUID((uint16_t)0x180f));
3232

3333
/*
3434
* Mandatory characteristic for device info service
3535
*/
36-
m_pnpCharacteristic = m_deviceInfoService->createCharacteristic((uint16_t) 0x2a50, NIMBLE_PROPERTY::READ);
36+
m_pnpCharacteristic = m_deviceInfoService->createCharacteristic((uint16_t)0x2a50, NIMBLE_PROPERTY::READ);
3737

3838
/*
3939
* Non-mandatory characteristics for device info service
@@ -44,16 +44,16 @@ NimBLEHIDDevice::NimBLEHIDDevice(NimBLEServer* server) {
4444
/*
4545
* Mandatory characteristics for HID service
4646
*/
47-
m_hidInfoCharacteristic = m_hidService->createCharacteristic((uint16_t) 0x2a4a, NIMBLE_PROPERTY::READ);
48-
m_reportMapCharacteristic = m_hidService->createCharacteristic((uint16_t) 0x2a4b, NIMBLE_PROPERTY::READ);
49-
m_hidControlCharacteristic = m_hidService->createCharacteristic((uint16_t) 0x2a4c, NIMBLE_PROPERTY::WRITE_NR);
50-
m_protocolModeCharacteristic = m_hidService->createCharacteristic((uint16_t) 0x2a4e, NIMBLE_PROPERTY::WRITE_NR | NIMBLE_PROPERTY::READ);
47+
m_hidInfoCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4a, NIMBLE_PROPERTY::READ);
48+
m_reportMapCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4b, NIMBLE_PROPERTY::READ);
49+
m_hidControlCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4c, NIMBLE_PROPERTY::WRITE_NR);
50+
m_protocolModeCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4e, NIMBLE_PROPERTY::WRITE_NR | NIMBLE_PROPERTY::READ);
5151

5252
/*
5353
* Mandatory battery level characteristic with notification and presence descriptor
5454
*/
55-
m_batteryLevelCharacteristic = m_batteryService->createCharacteristic((uint16_t) 0x2a19, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
56-
NimBLE2904* batteryLevelDescriptor = (NimBLE2904*)m_batteryLevelCharacteristic->createDescriptor((uint16_t) 0x2904);
55+
m_batteryLevelCharacteristic = m_batteryService->createCharacteristic((uint16_t)0x2a19, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
56+
NimBLE2904 *batteryLevelDescriptor = (NimBLE2904 *)m_batteryLevelCharacteristic->createDescriptor((uint16_t)0x2904);
5757
batteryLevelDescriptor->setFormat(NimBLE2904::FORMAT_UINT8);
5858
batteryLevelDescriptor->setNamespace(1);
5959
batteryLevelDescriptor->setUnit(0x27ad);
@@ -62,8 +62,8 @@ NimBLEHIDDevice::NimBLEHIDDevice(NimBLEServer* server) {
6262
* This value is setup here because its default value in most usage cases, its very rare to use boot mode
6363
* and we want to simplify library using as much as possible
6464
*/
65-
const uint8_t pMode[] = { 0x01 };
66-
protocolMode()->setValue((uint8_t*) pMode, 1);
65+
const uint8_t pMode[] = {0x01};
66+
protocolMode()->setValue((uint8_t *)pMode, 1);
6767
}
6868

6969
NimBLEHIDDevice::~NimBLEHIDDevice() {
@@ -132,7 +132,7 @@ void NimBLEHIDDevice::pnp(uint8_t sig, uint16_t vid, uint16_t pid, uint16_t vers
132132
* @param [in] flags The HID Class Specification release number to use.
133133
*/
134134
void NimBLEHIDDevice::hidInfo(uint8_t country, uint8_t flags) {
135-
uint8_t info[] = { 0x11, 0x1, country, flags };
135+
uint8_t info[] = {0x11, 0x1, country, flags};
136136
m_hidInfoCharacteristic->setValue(info, sizeof(info));
137137
}
138138

@@ -142,11 +142,11 @@ void NimBLEHIDDevice::hidInfo(uint8_t country, uint8_t flags) {
142142
* @return pointer to new input report characteristic
143143
*/
144144
NimBLECharacteristic* NimBLEHIDDevice::inputReport(uint8_t reportID) {
145-
NimBLECharacteristic* inputReportCharacteristic = m_hidService->createCharacteristic((uint16_t) 0x2a4d, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY | NIMBLE_PROPERTY::READ_ENC);
146-
NimBLEDescriptor* inputReportDescriptor = inputReportCharacteristic->createDescriptor((uint16_t) 0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC);
145+
NimBLECharacteristic *inputReportCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4d, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY | NIMBLE_PROPERTY::READ_ENC);
146+
NimBLEDescriptor *inputReportDescriptor = inputReportCharacteristic->createDescriptor((uint16_t)0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC);
147147

148-
uint8_t desc1_val[] = { reportID, 0x01 };
149-
inputReportDescriptor->setValue((uint8_t*) desc1_val, 2);
148+
uint8_t desc1_val[] = {reportID, 0x01};
149+
inputReportDescriptor->setValue((uint8_t *)desc1_val, 2);
150150

151151
return inputReportCharacteristic;
152152
}
@@ -157,11 +157,11 @@ NimBLECharacteristic* NimBLEHIDDevice::inputReport(uint8_t reportID) {
157157
* @return Pointer to new output report characteristic
158158
*/
159159
NimBLECharacteristic* NimBLEHIDDevice::outputReport(uint8_t reportID) {
160-
NimBLECharacteristic* outputReportCharacteristic = m_hidService->createCharacteristic((uint16_t) 0x2a4d, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
161-
NimBLEDescriptor* outputReportDescriptor = outputReportCharacteristic->createDescriptor((uint16_t) 0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
160+
NimBLECharacteristic *outputReportCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4d, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
161+
NimBLEDescriptor *outputReportDescriptor = outputReportCharacteristic->createDescriptor((uint16_t)0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
162162

163-
uint8_t desc1_val[] = { reportID, 0x02 };
164-
outputReportDescriptor->setValue((uint8_t*) desc1_val, 2);
163+
uint8_t desc1_val[] = {reportID, 0x02};
164+
outputReportDescriptor->setValue((uint8_t *)desc1_val, 2);
165165

166166
return outputReportCharacteristic;
167167
}
@@ -172,11 +172,11 @@ NimBLECharacteristic* NimBLEHIDDevice::outputReport(uint8_t reportID) {
172172
* @return Pointer to new feature report characteristic
173173
*/
174174
NimBLECharacteristic* NimBLEHIDDevice::featureReport(uint8_t reportID) {
175-
NimBLECharacteristic* featureReportCharacteristic = m_hidService->createCharacteristic((uint16_t) 0x2a4d, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
176-
NimBLEDescriptor* featureReportDescriptor = featureReportCharacteristic->createDescriptor((uint16_t) 0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
175+
NimBLECharacteristic *featureReportCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4d, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
176+
NimBLEDescriptor *featureReportDescriptor = featureReportCharacteristic->createDescriptor((uint16_t)0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
177177

178-
uint8_t desc1_val[] = { reportID, 0x03 };
179-
featureReportDescriptor->setValue((uint8_t*) desc1_val, 2);
178+
uint8_t desc1_val[] = {reportID, 0x03};
179+
featureReportDescriptor->setValue((uint8_t *)desc1_val, 2);
180180

181181
return featureReportCharacteristic;
182182
}
@@ -185,14 +185,14 @@ NimBLECharacteristic* NimBLEHIDDevice::featureReport(uint8_t reportID) {
185185
* @brief Creates a keyboard boot input report characteristic
186186
*/
187187
NimBLECharacteristic* NimBLEHIDDevice::bootInput() {
188-
return m_hidService->createCharacteristic((uint16_t) 0x2a22, NIMBLE_PROPERTY::NOTIFY);
188+
return m_hidService->createCharacteristic((uint16_t)0x2a22, NIMBLE_PROPERTY::NOTIFY);
189189
}
190190

191191
/**
192192
* @brief Create a keyboard boot output report characteristic
193193
*/
194194
NimBLECharacteristic* NimBLEHIDDevice::bootOutput() {
195-
return m_hidService->createCharacteristic((uint16_t) 0x2a32, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR);
195+
return m_hidService->createCharacteristic((uint16_t)0x2a32, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR);
196196
}
197197

198198
/**

0 commit comments

Comments
 (0)