Skip to content

Commit 098a989

Browse files
h2zeroh2zero
committed
Change NimBLEHIDDevice formatting for consistency.
1 parent 58c921b commit 098a989

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

‎src/NimBLEHIDDevice.cpp

Lines changed: 33 additions & 33 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() {
@@ -117,12 +117,12 @@ void NimBLEHIDDevice::manufacturer(std::string name) {
117117
void NimBLEHIDDevice::pnp(uint8_t sig, uint16_t vid, uint16_t pid, uint16_t version) {
118118
uint8_t pnp[] = {
119119
sig,
120-
((uint8_t *)&vid)[0],
121-
((uint8_t *)&vid)[1],
122-
((uint8_t *)&pid)[0],
123-
((uint8_t *)&pid)[1],
124-
((uint8_t *)&version)[0],
125-
((uint8_t *)&version)[1]
120+
((uint8_t*)&vid)[0],
121+
((uint8_t*)&vid)[1],
122+
((uint8_t*)&pid)[0],
123+
((uint8_t*)&pid)[1],
124+
((uint8_t*)&version)[0],
125+
((uint8_t*)&version)[1]
126126
};
127127
m_pnpCharacteristic->setValue(pnp, sizeof(pnp));
128128
}
@@ -133,7 +133,7 @@ void NimBLEHIDDevice::pnp(uint8_t sig, uint16_t vid, uint16_t pid, uint16_t vers
133133
* @param [in] flags The HID Class Specification release number to use.
134134
*/
135135
void NimBLEHIDDevice::hidInfo(uint8_t country, uint8_t flags) {
136-
uint8_t info[] = { 0x11, 0x1, country, flags };
136+
uint8_t info[] = {0x11, 0x1, country, flags};
137137
m_hidInfoCharacteristic->setValue(info, sizeof(info));
138138
}
139139

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

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

152152
return inputReportCharacteristic;
153153
}
@@ -158,11 +158,11 @@ NimBLECharacteristic* NimBLEHIDDevice::inputReport(uint8_t reportID) {
158158
* @return Pointer to new output report characteristic
159159
*/
160160
NimBLECharacteristic* NimBLEHIDDevice::outputReport(uint8_t reportID) {
161-
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);
162-
NimBLEDescriptor* outputReportDescriptor = outputReportCharacteristic->createDescriptor((uint16_t) 0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
161+
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);
162+
NimBLEDescriptor *outputReportDescriptor = outputReportCharacteristic->createDescriptor((uint16_t)0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
163163

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

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

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

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

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

199199
/**

0 commit comments

Comments
 (0)