Skip to content

Commit baf9752

Browse files
aentingeraentinger
authored
Merge pull request #27 from tormodvolden/whitespace
Whitespace cleanup
2 parents e7f397c + 77fc4b2 commit baf9752

File tree

2 files changed

+119
-119
lines changed

2 files changed

+119
-119
lines changed

‎src/Keyboard.cpp

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -25,42 +25,42 @@
2525

2626
//================================================================================
2727
//================================================================================
28-
// Keyboard
28+
// Keyboard
2929

3030
static const uint8_t _hidReportDescriptor[] PROGMEM = {
3131

32-
// Keyboard
32+
// Keyboard
3333
0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 47
3434
0x09, 0x06, // USAGE (Keyboard)
3535
0xa1, 0x01, // COLLECTION (Application)
3636
0x85, 0x02, // REPORT_ID (2)
3737
0x05, 0x07, // USAGE_PAGE (Keyboard)
38-
39-
0x19, 0xe0, // USAGE_MINIMUM (Keyboard LeftControl)
38+
39+
0x19, 0xe0, // USAGE_MINIMUM (Keyboard LeftControl)
4040
0x29, 0xe7, // USAGE_MAXIMUM (Keyboard Right GUI)
4141
0x15, 0x00, // LOGICAL_MINIMUM (0)
4242
0x25, 0x01, // LOGICAL_MAXIMUM (1)
4343
0x75, 0x01, // REPORT_SIZE (1)
44-
45-
0x95, 0x08, // REPORT_COUNT (8)
44+
45+
0x95, 0x08, // REPORT_COUNT (8)
4646
0x81, 0x02, // INPUT (Data,Var,Abs)
4747
0x95, 0x01, // REPORT_COUNT (1)
4848
0x75, 0x08, // REPORT_SIZE (8)
4949
0x81, 0x03, // INPUT (Cnst,Var,Abs)
50-
51-
0x95, 0x06, // REPORT_COUNT (6)
50+
51+
0x95, 0x06, // REPORT_COUNT (6)
5252
0x75, 0x08, // REPORT_SIZE (8)
5353
0x15, 0x00, // LOGICAL_MINIMUM (0)
5454
0x25, 0x73, // LOGICAL_MAXIMUM (115)
5555
0x05, 0x07, // USAGE_PAGE (Keyboard)
56-
57-
0x19, 0x00, // USAGE_MINIMUM (Reserved (no event indicated))
56+
57+
0x19, 0x00, // USAGE_MINIMUM (Reserved (no event indicated))
5858
0x29, 0x73, // USAGE_MAXIMUM (Keyboard Application)
5959
0x81, 0x00, // INPUT (Data,Ary,Abs)
6060
0xc0, // END_COLLECTION
6161
};
6262

63-
Keyboard_::Keyboard_(void)
63+
Keyboard_::Keyboard_(void)
6464
{
6565
static HIDSubDescriptor node(_hidReportDescriptor, sizeof(_hidReportDescriptor));
6666
HID().AppendDescriptor(&node);
@@ -91,16 +91,16 @@ const uint8_t _asciimap[128] =
9191
0x00, // ETX
9292
0x00, // EOT
9393
0x00, // ENQ
94-
0x00, // ACK
94+
0x00, // ACK
9595
0x00, // BEL
96-
0x2a, // BS Backspace
97-
0x2b, // TAB Tab
98-
0x28, // LF Enter
99-
0x00, // VT
100-
0x00, // FF
101-
0x00, // CR
102-
0x00, // SO
103-
0x00, // SI
96+
0x2a, // BS Backspace
97+
0x2b, // TAB Tab
98+
0x28, // LF Enter
99+
0x00, // VT
100+
0x00, // FF
101+
0x00, // CR
102+
0x00, // SO
103+
0x00, // SI
104104
0x00, // DEL
105105
0x00, // DC1
106106
0x00, // DC2
@@ -110,17 +110,17 @@ const uint8_t _asciimap[128] =
110110
0x00, // SYN
111111
0x00, // ETB
112112
0x00, // CAN
113-
0x00, // EM
113+
0x00, // EM
114114
0x00, // SUB
115115
0x00, // ESC
116-
0x00, // FS
117-
0x00, // GS
118-
0x00, // RS
119-
0x00, // US
120-
121-
0x2c, // ' '
122-
0x1e|SHIFT, // !
123-
0x34|SHIFT, // "
116+
0x00, // FS
117+
0x00, // GS
118+
0x00, // RS
119+
0x00, // US
120+
121+
0x2c, // ' '
122+
0x1e|SHIFT, // !
123+
0x34|SHIFT, // "
124124
0x20|SHIFT, // #
125125
0x21|SHIFT, // $
126126
0x22|SHIFT, // %
@@ -144,39 +144,39 @@ const uint8_t _asciimap[128] =
144144
0x24, // 7
145145
0x25, // 8
146146
0x26, // 9
147-
0x33|SHIFT, // :
147+
0x33|SHIFT, // :
148148
0x33, // ;
149-
0x36|SHIFT, // <
149+
0x36|SHIFT, // <
150150
0x2e, // =
151-
0x37|SHIFT, // >
152-
0x38|SHIFT, // ?
153-
0x1f|SHIFT, // @
154-
0x04|SHIFT, // A
155-
0x05|SHIFT, // B
156-
0x06|SHIFT, // C
157-
0x07|SHIFT, // D
158-
0x08|SHIFT, // E
159-
0x09|SHIFT, // F
160-
0x0a|SHIFT, // G
161-
0x0b|SHIFT, // H
162-
0x0c|SHIFT, // I
163-
0x0d|SHIFT, // J
164-
0x0e|SHIFT, // K
165-
0x0f|SHIFT, // L
166-
0x10|SHIFT, // M
167-
0x11|SHIFT, // N
168-
0x12|SHIFT, // O
169-
0x13|SHIFT, // P
170-
0x14|SHIFT, // Q
171-
0x15|SHIFT, // R
172-
0x16|SHIFT, // S
173-
0x17|SHIFT, // T
174-
0x18|SHIFT, // U
175-
0x19|SHIFT, // V
176-
0x1a|SHIFT, // W
177-
0x1b|SHIFT, // X
178-
0x1c|SHIFT, // Y
179-
0x1d|SHIFT, // Z
151+
0x37|SHIFT, // >
152+
0x38|SHIFT, // ?
153+
0x1f|SHIFT, // @
154+
0x04|SHIFT, // A
155+
0x05|SHIFT, // B
156+
0x06|SHIFT, // C
157+
0x07|SHIFT, // D
158+
0x08|SHIFT, // E
159+
0x09|SHIFT, // F
160+
0x0a|SHIFT, // G
161+
0x0b|SHIFT, // H
162+
0x0c|SHIFT, // I
163+
0x0d|SHIFT, // J
164+
0x0e|SHIFT, // K
165+
0x0f|SHIFT, // L
166+
0x10|SHIFT, // M
167+
0x11|SHIFT, // N
168+
0x12|SHIFT, // O
169+
0x13|SHIFT, // P
170+
0x14|SHIFT, // Q
171+
0x15|SHIFT, // R
172+
0x16|SHIFT, // S
173+
0x17|SHIFT, // T
174+
0x18|SHIFT, // U
175+
0x19|SHIFT, // V
176+
0x1a|SHIFT, // W
177+
0x1b|SHIFT, // X
178+
0x1c|SHIFT, // Y
179+
0x1d|SHIFT, // Z
180180
0x2f, // [
181181
0x31, // bslash
182182
0x30, // ]
@@ -213,17 +213,17 @@ const uint8_t _asciimap[128] =
213213
0x31|SHIFT, // |
214214
0x30|SHIFT, // }
215215
0x35|SHIFT, // ~
216-
0 // DEL
216+
0x00 // DEL
217217
};
218218

219219

220220
uint8_t USBPutChar(uint8_t c);
221221

222222
// press() adds the specified key (printing, non-printing, or modifier)
223-
// to the persistent key report and sends the report. Because of the way
224-
// USB HID works, the host acts like the key remains pressed until we
223+
// to the persistent key report and sends the report. Because of the way
224+
// USB HID works, the host acts like the key remains pressed until we
225225
// call release(), releaseAll(), or otherwise clear the report and resend.
226-
size_t Keyboard_::press(uint8_t k)
226+
size_t Keyboard_::press(uint8_t k)
227227
{
228228
uint8_t i;
229229
if (k >= 136) { // it's a non-printing key (not a modifier)
@@ -242,13 +242,13 @@ size_t Keyboard_::press(uint8_t k)
242242
k &= 0x7F;
243243
}
244244
}
245-
245+
246246
// Add k to the key report only if it's not already present
247247
// and if there is an empty slot.
248-
if (_keyReport.keys[0] != k && _keyReport.keys[1] != k &&
248+
if (_keyReport.keys[0] != k && _keyReport.keys[1] != k &&
249249
_keyReport.keys[2] != k && _keyReport.keys[3] != k &&
250250
_keyReport.keys[4] != k && _keyReport.keys[5] != k) {
251-
251+
252252
for (i=0; i<6; i++) {
253253
if (_keyReport.keys[i] == 0x00) {
254254
_keyReport.keys[i] = k;
@@ -258,7 +258,7 @@ size_t Keyboard_::press(uint8_t k)
258258
if (i == 6) {
259259
setWriteError();
260260
return 0;
261-
}
261+
}
262262
}
263263
sendReport(&_keyReport);
264264
return 1;
@@ -267,7 +267,7 @@ size_t Keyboard_::press(uint8_t k)
267267
// release() takes the specified key out of the persistent key report and
268268
// sends the report. This tells the OS the key is no longer pressed and that
269269
// it shouldn't be repeated any more.
270-
size_t Keyboard_::release(uint8_t k)
270+
size_t Keyboard_::release(uint8_t k)
271271
{
272272
uint8_t i;
273273
if (k >= 136) { // it's a non-printing key (not a modifier)
@@ -285,7 +285,7 @@ size_t Keyboard_::release(uint8_t k)
285285
k &= 0x7F;
286286
}
287287
}
288-
288+
289289
// Test the key report to see if k is present. Clear it if it exists.
290290
// Check all positions in case the key is present more than once (which it shouldn't be)
291291
for (i=0; i<6; i++) {
@@ -301,30 +301,30 @@ size_t Keyboard_::release(uint8_t k)
301301
void Keyboard_::releaseAll(void)
302302
{
303303
_keyReport.keys[0] = 0;
304-
_keyReport.keys[1] = 0;
304+
_keyReport.keys[1] = 0;
305305
_keyReport.keys[2] = 0;
306-
_keyReport.keys[3] = 0;
306+
_keyReport.keys[3] = 0;
307307
_keyReport.keys[4] = 0;
308-
_keyReport.keys[5] = 0;
308+
_keyReport.keys[5] = 0;
309309
_keyReport.modifiers = 0;
310310
sendReport(&_keyReport);
311311
}
312312

313313
size_t Keyboard_::write(uint8_t c)
314314
{
315-
uint8_t p = press(c); // Keydown
316-
release(c); // Keyup
317-
return p; // just return the result of press() since release() almost always returns 1
315+
uint8_t p = press(c); // Keydown
316+
release(c); // Keyup
317+
return p; // just return the result of press() since release() almost always returns 1
318318
}
319319

320320
size_t Keyboard_::write(const uint8_t *buffer, size_t size) {
321321
size_t n = 0;
322322
while (size--) {
323323
if (*buffer != '\r') {
324324
if (write(*buffer)) {
325-
n++;
325+
n++;
326326
} else {
327-
break;
327+
break;
328328
}
329329
}
330330
buffer++;

‎src/Keyboard.h

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -34,54 +34,54 @@
3434
//================================================================================
3535
// Keyboard
3636

37-
#define KEY_LEFT_CTRL 0x80
37+
#define KEY_LEFT_CTRL 0x80
3838
#define KEY_LEFT_SHIFT 0x81
39-
#define KEY_LEFT_ALT 0x82
40-
#define KEY_LEFT_GUI 0x83
39+
#define KEY_LEFT_ALT 0x82
40+
#define KEY_LEFT_GUI 0x83
4141
#define KEY_RIGHT_CTRL 0x84
4242
#define KEY_RIGHT_SHIFT 0x85
43-
#define KEY_RIGHT_ALT 0x86
44-
#define KEY_RIGHT_GUI 0x87
43+
#define KEY_RIGHT_ALT 0x86
44+
#define KEY_RIGHT_GUI 0x87
4545

46-
#define KEY_UP_ARROW 0xDA
46+
#define KEY_UP_ARROW 0xDA
4747
#define KEY_DOWN_ARROW 0xD9
4848
#define KEY_LEFT_ARROW 0xD8
4949
#define KEY_RIGHT_ARROW 0xD7
50-
#define KEY_BACKSPACE 0xB2
51-
#define KEY_TAB 0xB3
52-
#define KEY_RETURN 0xB0
53-
#define KEY_ESC 0xB1
54-
#define KEY_INSERT 0xD1
55-
#define KEY_DELETE 0xD4
56-
#define KEY_PAGE_UP 0xD3
57-
#define KEY_PAGE_DOWN 0xD6
58-
#define KEY_HOME 0xD2
59-
#define KEY_END 0xD5
60-
#define KEY_CAPS_LOCK 0xC1
61-
#define KEY_F1 0xC2
62-
#define KEY_F2 0xC3
63-
#define KEY_F3 0xC4
64-
#define KEY_F4 0xC5
65-
#define KEY_F5 0xC6
66-
#define KEY_F6 0xC7
67-
#define KEY_F7 0xC8
68-
#define KEY_F8 0xC9
69-
#define KEY_F9 0xCA
70-
#define KEY_F10 0xCB
71-
#define KEY_F11 0xCC
72-
#define KEY_F12 0xCD
73-
#define KEY_F13 0xF0
74-
#define KEY_F14 0xF1
75-
#define KEY_F15 0xF2
76-
#define KEY_F16 0xF3
77-
#define KEY_F17 0xF4
78-
#define KEY_F18 0xF5
79-
#define KEY_F19 0xF6
80-
#define KEY_F20 0xF7
81-
#define KEY_F21 0xF8
82-
#define KEY_F22 0xF9
83-
#define KEY_F23 0xFA
84-
#define KEY_F24 0xFB
50+
#define KEY_BACKSPACE 0xB2
51+
#define KEY_TAB 0xB3
52+
#define KEY_RETURN 0xB0
53+
#define KEY_ESC 0xB1
54+
#define KEY_INSERT 0xD1
55+
#define KEY_DELETE 0xD4
56+
#define KEY_PAGE_UP 0xD3
57+
#define KEY_PAGE_DOWN 0xD6
58+
#define KEY_HOME 0xD2
59+
#define KEY_END 0xD5
60+
#define KEY_CAPS_LOCK 0xC1
61+
#define KEY_F1 0xC2
62+
#define KEY_F2 0xC3
63+
#define KEY_F3 0xC4
64+
#define KEY_F4 0xC5
65+
#define KEY_F5 0xC6
66+
#define KEY_F6 0xC7
67+
#define KEY_F7 0xC8
68+
#define KEY_F8 0xC9
69+
#define KEY_F9 0xCA
70+
#define KEY_F10 0xCB
71+
#define KEY_F11 0xCC
72+
#define KEY_F12 0xCD
73+
#define KEY_F13 0xF0
74+
#define KEY_F14 0xF1
75+
#define KEY_F15 0xF2
76+
#define KEY_F16 0xF3
77+
#define KEY_F17 0xF4
78+
#define KEY_F18 0xF5
79+
#define KEY_F19 0xF6
80+
#define KEY_F20 0xF7
81+
#define KEY_F21 0xF8
82+
#define KEY_F22 0xF9
83+
#define KEY_F23 0xFA
84+
#define KEY_F24 0xFB
8585

8686

8787
// Low level key report: up to 6 keys and shift, ctrl etc at once

0 commit comments

Comments
 (0)