Skip to content

Commit d10241e

Browse files
h2zeroh2zero
committed
Undo Formatting changes
1 parent 19d8cb5 commit d10241e

File tree

2 files changed

+47
-79
lines changed

2 files changed

+47
-79
lines changed

‎.gitignore

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1 @@
1-
# Doxygen output
2-
31
docs/doxydocs
4-
5-
# Arduino's Library development
6-
7-
.development
8-
9-
# Arduino on VSCode
10-
11-
*.svd
12-
debug.cfg
13-
debug_custom.json

‎src/NimBLEHIDDevice.cpp

Lines changed: 47 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,18 @@
2222
* @brief Construct a default NimBLEHIDDevice object.
2323
* @param [in] server A pointer to the server instance this HID Device will use.
2424
*/
25-
NimBLEHIDDevice::NimBLEHIDDevice(NimBLEServer *server)
26-
{
25+
NimBLEHIDDevice::NimBLEHIDDevice(NimBLEServer* server) {
2726
/*
2827
* Here we create mandatory services described in bluetooth specification
2928
*/
30-
m_deviceInfoService = server->createService(NimBLEUUID((uint16_t)0x180a));
31-
m_hidService = server->createService(NimBLEUUID((uint16_t)0x1812));
32-
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));
3332

3433
/*
3534
* Mandatory characteristic for device info service
3635
*/
37-
m_pnpCharacteristic = m_deviceInfoService->createCharacteristic((uint16_t)0x2a50, NIMBLE_PROPERTY::READ);
36+
m_pnpCharacteristic = m_deviceInfoService->createCharacteristic((uint16_t) 0x2a50, NIMBLE_PROPERTY::READ);
3837

3938
/*
4039
* Non-mandatory characteristics for device info service
@@ -45,16 +44,16 @@ NimBLEHIDDevice::NimBLEHIDDevice(NimBLEServer *server)
4544
/*
4645
* Mandatory characteristics for HID service
4746
*/
48-
m_hidInfoCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4a, NIMBLE_PROPERTY::READ);
49-
m_reportMapCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4b, NIMBLE_PROPERTY::READ);
50-
m_hidControlCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4c, NIMBLE_PROPERTY::WRITE_NR);
51-
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);
5251

5352
/*
5453
* Mandatory battery level characteristic with notification and presence descriptor
5554
*/
56-
m_batteryLevelCharacteristic = m_batteryService->createCharacteristic((uint16_t)0x2a19, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY);
57-
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);
5857
batteryLevelDescriptor->setFormat(NimBLE2904::FORMAT_UINT8);
5958
batteryLevelDescriptor->setNamespace(1);
6059
batteryLevelDescriptor->setUnit(0x27ad);
@@ -63,30 +62,27 @@ NimBLEHIDDevice::NimBLEHIDDevice(NimBLEServer *server)
6362
* This value is setup here because its default value in most usage cases, its very rare to use boot mode
6463
* and we want to simplify library using as much as possible
6564
*/
66-
const uint8_t pMode[] = {0x01};
67-
protocolMode()->setValue((uint8_t *)pMode, 1);
65+
const uint8_t pMode[] = { 0x01 };
66+
protocolMode()->setValue((uint8_t*) pMode, 1);
6867
}
6968

70-
NimBLEHIDDevice::~NimBLEHIDDevice()
71-
{
69+
NimBLEHIDDevice::~NimBLEHIDDevice() {
7270
}
7371

7472
/**
7573
* @brief Set the report map data formatting information.
7674
* @param [in] map A pointer to an array with the values to set.
7775
* @param [in] size The number of values in the array.
7876
*/
79-
void NimBLEHIDDevice::reportMap(uint8_t *map, uint16_t size)
80-
{
77+
void NimBLEHIDDevice::reportMap(uint8_t* map, uint16_t size) {
8178
m_reportMapCharacteristic->setValue(map, size);
8279
}
8380

8481
/**
8582
* @brief Start the HID device services.\n
8683
* This function called when all the services have been created.
8784
*/
88-
void NimBLEHIDDevice::startServices()
89-
{
85+
void NimBLEHIDDevice::startServices() {
9086
m_deviceInfoService->start();
9187
m_hidService->start();
9288
m_batteryService->start();
@@ -95,8 +91,7 @@ void NimBLEHIDDevice::startServices()
9591
/**
9692
* @brief Create a manufacturer characteristic (this characteristic is optional).
9793
*/
98-
NimBLECharacteristic *NimBLEHIDDevice::manufacturer()
99-
{
94+
NimBLECharacteristic* NimBLEHIDDevice::manufacturer() {
10095
if (m_manufacturerCharacteristic == nullptr)
10196
m_manufacturerCharacteristic = m_deviceInfoService->createCharacteristic((uint16_t)0x2a29, NIMBLE_PROPERTY::READ);
10297
return m_manufacturerCharacteristic;
@@ -106,8 +101,7 @@ NimBLECharacteristic *NimBLEHIDDevice::manufacturer()
106101
* @brief Set manufacturer name
107102
* @param [in] name The manufacturer name of this HID device.
108103
*/
109-
void NimBLEHIDDevice::manufacturer(std::string name)
110-
{
104+
void NimBLEHIDDevice::manufacturer(std::string name) {
111105
manufacturer()->setValue(name);
112106
}
113107

@@ -118,8 +112,7 @@ void NimBLEHIDDevice::manufacturer(std::string name)
118112
* @param [in] pid The product ID number.
119113
* @param [in] version The produce version number.
120114
*/
121-
void NimBLEHIDDevice::pnp(uint8_t sig, uint16_t vid, uint16_t pid, uint16_t version)
122-
{
115+
void NimBLEHIDDevice::pnp(uint8_t sig, uint16_t vid, uint16_t pid, uint16_t version) {
123116
//uint8_t pnp[] = {sig, (uint8_t)(vid >> 8), (uint8_t)vid, (uint8_t)(pid >> 8), (uint8_t)pid, (uint8_t)(version >> 8), (uint8_t)version};
124117
uint8_t pnp[] = {
125118
sig,
@@ -138,9 +131,8 @@ void NimBLEHIDDevice::pnp(uint8_t sig, uint16_t vid, uint16_t pid, uint16_t vers
138131
* @param [in] country The country code for the device.
139132
* @param [in] flags The HID Class Specification release number to use.
140133
*/
141-
void NimBLEHIDDevice::hidInfo(uint8_t country, uint8_t flags)
142-
{
143-
uint8_t info[] = {0x11, 0x1, country, flags};
134+
void NimBLEHIDDevice::hidInfo(uint8_t country, uint8_t flags) {
135+
uint8_t info[] = { 0x11, 0x1, country, flags };
144136
m_hidInfoCharacteristic->setValue(info, sizeof(info));
145137
}
146138

@@ -149,13 +141,12 @@ void NimBLEHIDDevice::hidInfo(uint8_t country, uint8_t flags)
149141
* @param [in] reportID input report ID, the same as in report map for input object related to the characteristic
150142
* @return pointer to new input report characteristic
151143
*/
152-
NimBLECharacteristic *NimBLEHIDDevice::inputReport(uint8_t reportID)
153-
{
154-
NimBLECharacteristic *inputReportCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4d, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY | NIMBLE_PROPERTY::READ_ENC);
155-
NimBLEDescriptor *inputReportDescriptor = inputReportCharacteristic->createDescriptor((uint16_t)0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::READ_ENC);
144+
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);
156147

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

160151
return inputReportCharacteristic;
161152
}
@@ -165,13 +156,12 @@ NimBLECharacteristic *NimBLEHIDDevice::inputReport(uint8_t reportID)
165156
* @param [in] reportID Output report ID, the same as in report map for output object related to the characteristic
166157
* @return Pointer to new output report characteristic
167158
*/
168-
NimBLECharacteristic *NimBLEHIDDevice::outputReport(uint8_t reportID)
169-
{
170-
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);
171-
NimBLEDescriptor *outputReportDescriptor = outputReportCharacteristic->createDescriptor((uint16_t)0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
159+
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);
172162

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

176166
return outputReportCharacteristic;
177167
}
@@ -181,63 +171,56 @@ NimBLECharacteristic *NimBLEHIDDevice::outputReport(uint8_t reportID)
181171
* @param [in] reportID Feature report ID, the same as in report map for feature object related to the characteristic
182172
* @return Pointer to new feature report characteristic
183173
*/
184-
NimBLECharacteristic *NimBLEHIDDevice::featureReport(uint8_t reportID)
185-
{
186-
NimBLECharacteristic *featureReportCharacteristic = m_hidService->createCharacteristic((uint16_t)0x2a4d, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
187-
NimBLEDescriptor *featureReportDescriptor = featureReportCharacteristic->createDescriptor((uint16_t)0x2908, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::READ_ENC | NIMBLE_PROPERTY::WRITE_ENC);
174+
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);
188177

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

192181
return featureReportCharacteristic;
193182
}
194183

195184
/**
196185
* @brief Creates a keyboard boot input report characteristic
197186
*/
198-
NimBLECharacteristic *NimBLEHIDDevice::bootInput()
199-
{
200-
return m_hidService->createCharacteristic((uint16_t)0x2a22, NIMBLE_PROPERTY::NOTIFY);
187+
NimBLECharacteristic* NimBLEHIDDevice::bootInput() {
188+
return m_hidService->createCharacteristic((uint16_t) 0x2a22, NIMBLE_PROPERTY::NOTIFY);
201189
}
202190

203191
/**
204192
* @brief Create a keyboard boot output report characteristic
205193
*/
206-
NimBLECharacteristic *NimBLEHIDDevice::bootOutput()
207-
{
208-
return m_hidService->createCharacteristic((uint16_t)0x2a32, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR);
194+
NimBLECharacteristic* NimBLEHIDDevice::bootOutput() {
195+
return m_hidService->createCharacteristic((uint16_t) 0x2a32, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::WRITE | NIMBLE_PROPERTY::WRITE_NR);
209196
}
210197

211198
/**
212199
* @brief Returns a pointer to the HID control point characteristic.
213200
*/
214-
NimBLECharacteristic *NimBLEHIDDevice::hidControl()
215-
{
201+
NimBLECharacteristic* NimBLEHIDDevice::hidControl() {
216202
return m_hidControlCharacteristic;
217203
}
218204

219205
/**
220206
* @brief Returns a pointer to the protocol mode characteristic.
221207
*/
222-
NimBLECharacteristic *NimBLEHIDDevice::protocolMode()
223-
{
208+
NimBLECharacteristic* NimBLEHIDDevice::protocolMode() {
224209
return m_protocolModeCharacteristic;
225210
}
226211

227212
/**
228213
* @brief Set the battery level characteristic value.
229214
* @param [in] level The battery level value.
230215
*/
231-
void NimBLEHIDDevice::setBatteryLevel(uint8_t level)
232-
{
216+
void NimBLEHIDDevice::setBatteryLevel(uint8_t level) {
233217
m_batteryLevelCharacteristic->setValue(&level, 1);
234218
}
235219
/*
236220
* @brief Returns battery level characteristic
237221
* @ return battery level characteristic
238222
*/
239-
NimBLECharacteristic *NimBLEHIDDevice::batteryLevel()
240-
{
223+
NimBLECharacteristic* NimBLEHIDDevice::batteryLevel() {
241224
return m_batteryLevelCharacteristic;
242225
}
243226

@@ -260,24 +243,21 @@ BLECharacteristic* BLEHIDDevice::hidInfo() {
260243
/**
261244
* @brief Returns a pointer to the device information service.
262245
*/
263-
NimBLEService *NimBLEHIDDevice::deviceInfo()
264-
{
246+
NimBLEService* NimBLEHIDDevice::deviceInfo() {
265247
return m_deviceInfoService;
266248
}
267249

268250
/**
269251
* @brief Returns a pointer to the HID service.
270252
*/
271-
NimBLEService *NimBLEHIDDevice::hidService()
272-
{
253+
NimBLEService* NimBLEHIDDevice::hidService() {
273254
return m_hidService;
274255
}
275256

276257
/**
277258
* @brief @brief Returns a pointer to the battery service.
278259
*/
279-
NimBLEService *NimBLEHIDDevice::batteryService()
280-
{
260+
NimBLEService* NimBLEHIDDevice::batteryService() {
281261
return m_batteryService;
282262
}
283263

0 commit comments

Comments
 (0)