-
Notifications
You must be signed in to change notification settings - Fork 12
/
arduino-1.0.5-finalkey.patch
441 lines (417 loc) · 12.6 KB
/
arduino-1.0.5-finalkey.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
diff -rupN arduino-1.0.5/hardware/arduino/boards.txt arduino-dst/hardware/arduino/boards.txt
--- arduino-1.0.5/hardware/arduino/boards.txt 2013-05-17 20:22:16.000000000 +0200
+++ arduino-dst/hardware/arduino/boards.txt 2014-06-27 09:38:40.495813242 +0200
@@ -167,6 +167,27 @@ leonardo.build.variant=leonardo
##############################################################
+finalkey.name=FinalKey
+finalkey.upload.protocol=avr109
+finalkey.upload.maximum_size=28672
+finalkey.upload.speed=57600
+finalkey.upload.disable_flushing=true
+finalkey.bootloader.low_fuses=0xff
+finalkey.bootloader.high_fuses=0xd8
+finalkey.bootloader.extended_fuses=0xcb
+finalkey.bootloader.path=caterina
+finalkey.bootloader.file=Caterina-Leonardo.hex
+finalkey.bootloader.unlock_bits=0x3F
+finalkey.bootloader.lock_bits=0x2F
+finalkey.build.mcu=atmega32u4
+finalkey.build.f_cpu=16000000L
+finalkey.build.vid=0x1d50
+finalkey.build.pid=0x60a6
+finalkey.build.core=arduino
+finalkey.build.variant=leonardo
+
+##############################################################
+
esplora.name=Arduino Esplora
esplora.upload.protocol=avr109
esplora.upload.maximum_size=28672
diff -rupN arduino-1.0.5/hardware/arduino/cores/arduino/HID.cpp arduino-dst/hardware/arduino/cores/arduino/HID.cpp
--- arduino-1.0.5/hardware/arduino/cores/arduino/HID.cpp 2013-05-17 20:22:16.000000000 +0200
+++ arduino-dst/hardware/arduino/cores/arduino/HID.cpp 2014-06-27 02:26:51.015245743 +0200
@@ -47,7 +47,7 @@ extern const u8 _hidReportDescriptor[] P
const u8 _hidReportDescriptor[] = {
// Mouse
- 0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 54
+ /* 0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 54
0x09, 0x02, // USAGE (Mouse)
0xa1, 0x01, // COLLECTION (Application)
0x09, 0x01, // USAGE (Pointer)
@@ -74,7 +74,7 @@ const u8 _hidReportDescriptor[] = {
0x95, 0x03, // REPORT_COUNT (3)
0x81, 0x06, // INPUT (Data,Var,Rel)
0xc0, // END_COLLECTION
- 0xc0, // END_COLLECTION
+ 0xc0, // END_COLLECTION*/
// Keyboard
0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 47
@@ -105,27 +105,6 @@ const u8 _hidReportDescriptor[] = {
0x29, 0x65, // USAGE_MAXIMUM (Keyboard Application)
0x81, 0x00, // INPUT (Data,Ary,Abs)
0xc0, // END_COLLECTION
-
-#if RAWHID_ENABLED
- // RAW HID
- 0x06, LSB(RAWHID_USAGE_PAGE), MSB(RAWHID_USAGE_PAGE), // 30
- 0x0A, LSB(RAWHID_USAGE), MSB(RAWHID_USAGE),
-
- 0xA1, 0x01, // Collection 0x01
- 0x85, 0x03, // REPORT_ID (3)
- 0x75, 0x08, // report size = 8 bits
- 0x15, 0x00, // logical minimum = 0
- 0x26, 0xFF, 0x00, // logical maximum = 255
-
- 0x95, 64, // report count TX
- 0x09, 0x01, // usage
- 0x81, 0x02, // Input (array)
-
- 0x95, 64, // report count RX
- 0x09, 0x02, // usage
- 0x91, 0x02, // Output (array)
- 0xC0 // end collection
-#endif
};
extern const HIDDescriptor _hidInterface PROGMEM;
@@ -261,12 +240,18 @@ bool Mouse_::isPressed(uint8_t b)
//================================================================================
// Keyboard
+
+uint8_t* _asciimap;
+
+
+
Keyboard_::Keyboard_(void)
{
}
-void Keyboard_::begin(void)
+void Keyboard_::begin(uint8_t *keymap)
{
+ _asciimap = keymap;
}
void Keyboard_::end(void)
@@ -275,145 +260,9 @@ void Keyboard_::end(void)
void Keyboard_::sendReport(KeyReport* keys)
{
- HID_SendReport(2,keys,sizeof(KeyReport));
+ HID_SendReport(2,keys,sizeof(KeyReport));
}
-extern
-const uint8_t _asciimap[128] PROGMEM;
-
-#define SHIFT 0x80
-const uint8_t _asciimap[128] =
-{
- 0x00, // NUL
- 0x00, // SOH
- 0x00, // STX
- 0x00, // ETX
- 0x00, // EOT
- 0x00, // ENQ
- 0x00, // ACK
- 0x00, // BEL
- 0x2a, // BS Backspace
- 0x2b, // TAB Tab
- 0x28, // LF Enter
- 0x00, // VT
- 0x00, // FF
- 0x00, // CR
- 0x00, // SO
- 0x00, // SI
- 0x00, // DEL
- 0x00, // DC1
- 0x00, // DC2
- 0x00, // DC3
- 0x00, // DC4
- 0x00, // NAK
- 0x00, // SYN
- 0x00, // ETB
- 0x00, // CAN
- 0x00, // EM
- 0x00, // SUB
- 0x00, // ESC
- 0x00, // FS
- 0x00, // GS
- 0x00, // RS
- 0x00, // US
-
- 0x2c, // ' '
- 0x1e|SHIFT, // !
- 0x34|SHIFT, // "
- 0x20|SHIFT, // #
- 0x21|SHIFT, // $
- 0x22|SHIFT, // %
- 0x24|SHIFT, // &
- 0x34, // '
- 0x26|SHIFT, // (
- 0x27|SHIFT, // )
- 0x25|SHIFT, // *
- 0x2e|SHIFT, // +
- 0x36, // ,
- 0x2d, // -
- 0x37, // .
- 0x38, // /
- 0x27, // 0
- 0x1e, // 1
- 0x1f, // 2
- 0x20, // 3
- 0x21, // 4
- 0x22, // 5
- 0x23, // 6
- 0x24, // 7
- 0x25, // 8
- 0x26, // 9
- 0x33|SHIFT, // :
- 0x33, // ;
- 0x36|SHIFT, // <
- 0x2e, // =
- 0x37|SHIFT, // >
- 0x38|SHIFT, // ?
- 0x1f|SHIFT, // @
- 0x04|SHIFT, // A
- 0x05|SHIFT, // B
- 0x06|SHIFT, // C
- 0x07|SHIFT, // D
- 0x08|SHIFT, // E
- 0x09|SHIFT, // F
- 0x0a|SHIFT, // G
- 0x0b|SHIFT, // H
- 0x0c|SHIFT, // I
- 0x0d|SHIFT, // J
- 0x0e|SHIFT, // K
- 0x0f|SHIFT, // L
- 0x10|SHIFT, // M
- 0x11|SHIFT, // N
- 0x12|SHIFT, // O
- 0x13|SHIFT, // P
- 0x14|SHIFT, // Q
- 0x15|SHIFT, // R
- 0x16|SHIFT, // S
- 0x17|SHIFT, // T
- 0x18|SHIFT, // U
- 0x19|SHIFT, // V
- 0x1a|SHIFT, // W
- 0x1b|SHIFT, // X
- 0x1c|SHIFT, // Y
- 0x1d|SHIFT, // Z
- 0x2f, // [
- 0x31, // bslash
- 0x30, // ]
- 0x23|SHIFT, // ^
- 0x2d|SHIFT, // _
- 0x35, // `
- 0x04, // a
- 0x05, // b
- 0x06, // c
- 0x07, // d
- 0x08, // e
- 0x09, // f
- 0x0a, // g
- 0x0b, // h
- 0x0c, // i
- 0x0d, // j
- 0x0e, // k
- 0x0f, // l
- 0x10, // m
- 0x11, // n
- 0x12, // o
- 0x13, // p
- 0x14, // q
- 0x15, // r
- 0x16, // s
- 0x17, // t
- 0x18, // u
- 0x19, // v
- 0x1a, // w
- 0x1b, // x
- 0x1c, // y
- 0x1d, // z
- 0x2f|SHIFT, //
- 0x31|SHIFT, // |
- 0x30|SHIFT, // }
- 0x35|SHIFT, // ~
- 0 // DEL
-};
uint8_t USBPutChar(uint8_t c);
@@ -423,76 +272,43 @@ uint8_t USBPutChar(uint8_t c);
// call release(), releaseAll(), or otherwise clear the report and resend.
size_t Keyboard_::press(uint8_t k)
{
- uint8_t i;
- if (k >= 136) { // it's a non-printing key (not a modifier)
- k = k - 136;
- } else if (k >= 128) { // it's a modifier key
- _keyReport.modifiers |= (1<<(k-128));
- k = 0;
- } else { // it's a printing key
- k = pgm_read_byte(_asciimap + k);
- if (!k) {
- setWriteError();
- return 0;
- }
- if (k & 0x80) { // it's a capital letter or other character reached with shift
- _keyReport.modifiers |= 0x02; // the left shift modifier
- k &= 0x7F;
- }
- }
+ _keyReport.keys[1] = 0;
+ _keyReport.keys[2] = 0;
+ _keyReport.keys[3] = 0;
+ _keyReport.keys[4] = 0;
+ _keyReport.keys[5] = 0;
+ _keyReport.modifiers = 0;
+
- // Add k to the key report only if it's not already present
- // and if there is an empty slot.
- if (_keyReport.keys[0] != k && _keyReport.keys[1] != k &&
- _keyReport.keys[2] != k && _keyReport.keys[3] != k &&
- _keyReport.keys[4] != k && _keyReport.keys[5] != k) {
-
- for (i=0; i<6; i++) {
- if (_keyReport.keys[i] == 0x00) {
- _keyReport.keys[i] = k;
- break;
- }
- }
- if (i == 6) {
- setWriteError();
- return 0;
- }
- }
+ //DST's attempt
+ _keyReport.keys[0] = pgm_read_byte( _asciimap + (k*2) );
+ _keyReport.modifiers = pgm_read_byte( _asciimap + (k*2)+1 );
+
sendReport(&_keyReport);
return 1;
}
+void Keyboard_::raw(uint8_t scanCode, uint8_t modifiers)
+{
+ _keyReport.keys[1] = 0;
+ _keyReport.keys[2] = 0;
+ _keyReport.keys[3] = 0;
+ _keyReport.keys[4] = 0;
+ _keyReport.keys[5] = 0;
+
+ _keyReport.keys[0] = scanCode;
+ _keyReport.modifiers = modifiers;
+ sendReport(&_keyReport);
+ releaseAll();
+
+}
+
// release() takes the specified key out of the persistent key report and
// sends the report. This tells the OS the key is no longer pressed and that
// it shouldn't be repeated any more.
size_t Keyboard_::release(uint8_t k)
{
- uint8_t i;
- if (k >= 136) { // it's a non-printing key (not a modifier)
- k = k - 136;
- } else if (k >= 128) { // it's a modifier key
- _keyReport.modifiers &= ~(1<<(k-128));
- k = 0;
- } else { // it's a printing key
- k = pgm_read_byte(_asciimap + k);
- if (!k) {
- return 0;
- }
- if (k & 0x80) { // it's a capital letter or other character reached with shift
- _keyReport.modifiers &= ~(0x02); // the left shift modifier
- k &= 0x7F;
- }
- }
-
- // Test the key report to see if k is present. Clear it if it exists.
- // Check all positions in case the key is present more than once (which it shouldn't be)
- for (i=0; i<6; i++) {
- if (0 != k && _keyReport.keys[i] == k) {
- _keyReport.keys[i] = 0x00;
- }
- }
-
- sendReport(&_keyReport);
+ releaseAll();
return 1;
}
@@ -517,4 +333,4 @@ size_t Keyboard_::write(uint8_t c)
#endif
-#endif /* if defined(USBCON) */
\ No newline at end of file
+#endif /* if defined(USBCON) */
diff -rupN arduino-1.0.5/hardware/arduino/cores/arduino/USBAPI.h arduino-dst/hardware/arduino/cores/arduino/USBAPI.h
--- arduino-1.0.5/hardware/arduino/cores/arduino/USBAPI.h 2013-05-17 20:22:16.000000000 +0200
+++ arduino-dst/hardware/arduino/cores/arduino/USBAPI.h 2014-06-27 08:29:55.729860081 +0200
@@ -111,6 +111,7 @@ extern Mouse_ Mouse;
#define KEY_F11 0xCC
#define KEY_F12 0xCD
+
// Low level key report: up to 6 keys and shift, ctrl etc at once
typedef struct
{
@@ -126,15 +127,17 @@ private:
void sendReport(KeyReport* keys);
public:
Keyboard_(void);
- void begin(void);
+ void begin(uint8_t* keymap);
void end(void);
virtual size_t write(uint8_t k);
virtual size_t press(uint8_t k);
virtual size_t release(uint8_t k);
virtual void releaseAll(void);
+ virtual void raw(uint8_t scanCode, uint8_t modifiers);
};
extern Keyboard_ Keyboard;
+
//================================================================================
//================================================================================
// Low level API
diff -rupN arduino-1.0.5/hardware/arduino/cores/arduino/USBCore.cpp arduino-dst/hardware/arduino/cores/arduino/USBCore.cpp
--- arduino-1.0.5/hardware/arduino/cores/arduino/USBCore.cpp 2013-05-17 20:22:16.000000000 +0200
+++ arduino-dst/hardware/arduino/cores/arduino/USBCore.cpp 2014-06-27 09:45:53.001821600 +0200
@@ -59,6 +59,8 @@ const u16 STRING_IPRODUCT[17] = {
'A','r','d','u','i','n','o',' ','E','s','p','l','o','r','a',' '
#elif USB_PID == 0x9208
'L','i','l','y','P','a','d','U','S','B',' ',' ',' ',' ',' ',' '
+#elif USB_PID == 0x60a6
+ 'T','h','e',' ','F','i','n','a','l',' ','K','e','y',' ',' ',' '
#else
'U','S','B',' ','I','O',' ','B','o','a','r','d',' ',' ',' ',' '
#endif
@@ -70,6 +72,8 @@ const u16 STRING_IMANUFACTURER[12] = {
'A','r','d','u','i','n','o',' ','L','L','C'
#elif USB_VID == 0x1b4f
'S','p','a','r','k','F','u','n',' ',' ',' '
+#elif USB_VID == 0x1d50
+ 'C','y','b','e','r','s','t','a','l','k','R'
#else
'U','n','k','n','o','w','n',' ',' ',' ',' '
#endif
diff -rupN arduino-1.0.5/libraries/Wire/Wire.h arduino-dst/libraries/Wire/Wire.h
--- arduino-1.0.5/libraries/Wire/Wire.h 2013-05-17 20:22:16.000000000 +0200
+++ arduino-dst/libraries/Wire/Wire.h 2014-03-16 02:19:17.163233000 +0100
@@ -25,7 +25,8 @@
#include <inttypes.h>
#include "Stream.h"
-#define BUFFER_LENGTH 32
+#define BUFFER_LENGTH 34
+
class TwoWire : public Stream
{
diff -rupN arduino-1.0.5/libraries/Wire/utility/twi.h arduino-dst/libraries/Wire/utility/twi.h
--- arduino-1.0.5/libraries/Wire/utility/twi.h 2013-05-17 20:22:16.000000000 +0200
+++ arduino-dst/libraries/Wire/utility/twi.h 2014-03-16 02:18:19.697545000 +0100
@@ -26,11 +26,12 @@
#ifndef TWI_FREQ
#define TWI_FREQ 100000L
+// #define TWI_FREQ 400000L
#endif
- #ifndef TWI_BUFFER_LENGTH
- #define TWI_BUFFER_LENGTH 32
- #endif
+
+ #define TWI_BUFFER_LENGTH 34
+
#define TWI_READY 0
#define TWI_MRX 1