Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a variable to allow easy modification of the keypress limit. #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add a variable to allow easy modification of the keypress limit. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dfe39b4
Clean up the keyboard report descriptor.
ZDBioHazard Jun 8, 2016
73817f7
Add KEYS_ROLLOVER to control keyboard rollover.
ZDBioHazard Jun 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 49 additions & 47 deletions src/Keyboard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,36 +28,34 @@
// Keyboard

static const uint8_t _hidReportDescriptor[] PROGMEM = {

// Keyboard
0x05, 0x01, // USAGE_PAGE (Generic Desktop) // 47
0x09, 0x06, // USAGE (Keyboard)
0xa1, 0x01, // COLLECTION (Application)
0x85, 0x02, // REPORT_ID (2)
0x05, 0x07, // USAGE_PAGE (Keyboard)

0x19, 0xe0, // USAGE_MINIMUM (Keyboard LeftControl)
0x29, 0xe7, // USAGE_MAXIMUM (Keyboard Right GUI)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x01, // LOGICAL_MAXIMUM (1)
0x75, 0x01, // REPORT_SIZE (1)

0x95, 0x08, // REPORT_COUNT (8)
0x81, 0x02, // INPUT (Data,Var,Abs)
0x95, 0x01, // REPORT_COUNT (1)
0x75, 0x08, // REPORT_SIZE (8)
0x81, 0x03, // INPUT (Cnst,Var,Abs)

0x95, 0x06, // REPORT_COUNT (6)
0x75, 0x08, // REPORT_SIZE (8)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x65, // LOGICAL_MAXIMUM (101)
0x05, 0x07, // USAGE_PAGE (Keyboard)

0x19, 0x00, // USAGE_MINIMUM (Reserved (no event indicated))
0x29, 0x65, // USAGE_MAXIMUM (Keyboard Application)
0x81, 0x00, // INPUT (Data,Ary,Abs)
0xc0, // END_COLLECTION
// Keyboard
0x05, 0x01, // USAGE_PAGE (Generic Desktop)
0x09, 0x06, // USAGE (Keyboard)
0xa1, 0x01, // COLLECTION (Application)
0x85, 0x02, // REPORT_ID (2)
0x05, 0x07, // USAGE_PAGE (Keyboard)
// Modifier keys
0x19, 0xe0, // USAGE_MINIMUM (Keyboard Left Control)
0x29, 0xe7, // USAGE_MAXIMUM (Keyboard Right GUI)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x01, // LOGICAL_MAXIMUM (1)
0x75, 0x01, // REPORT_SIZE (1)
0x95, 0x08, // REPORT_COUNT (8)
0x81, 0x02, // INPUT (Data,Var,Abs)
// Reserved byte
0x75, 0x08, // REPORT_SIZE (8)
0x95, 0x01, // REPORT_COUNT (1)
0x81, 0x03, // INPUT (Cnst,Var,Abs)
// Pressed keys
0x19, 0x00, // USAGE_MINIMUM (Reserved (no event indicated))
0x29, 0x65, // USAGE_MAXIMUM (Keyboard Application)
0x15, 0x00, // LOGICAL_MINIMUM (0)
0x25, 0x65, // LOGICAL_MAXIMUM (101)
0x75, 0x08, // REPORT_SIZE (8)
0x95, KEYS_ROLLOVER, // REPORT_COUNT (KEYS_ROLLOVER)
0x81, 0x00, // INPUT (Data,Ary,Abs)
// End
0xc0, // END_COLLECTION
};

Keyboard_::Keyboard_(void)
Expand Down Expand Up @@ -243,19 +241,23 @@ size_t Keyboard_::press(uint8_t k)
}
}

// 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++) {
// Search the pressed keys list for this key.
for (i = 0 ; i < KEYS_ROLLOVER ; i++) {
if (_keyReport.keys[i] == k) {
break; // Just stop looking if it's found.
}
}
// If the search got to the end without finding anything.
if (i >= KEYS_ROLLOVER) {
// Find an empty slot and add this key.
for (i = 0 ; i < KEYS_ROLLOVER ; i++) {
if (_keyReport.keys[i] == 0x00) {
_keyReport.keys[i] = k;
break;
}
}
if (i == 6) {
// Error out if every slot already has something in it.
if (i >= KEYS_ROLLOVER) {
setWriteError();
return 0;
}
Expand Down Expand Up @@ -288,9 +290,11 @@ size_t Keyboard_::release(uint8_t k)

// 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;
if (k != 0) {
for (i = 0 ; i < KEYS_ROLLOVER ; i++) {
if (_keyReport.keys[i] == k) {
_keyReport.keys[i] = 0x00;
}
}
}

Expand All @@ -300,12 +304,10 @@ size_t Keyboard_::release(uint8_t k)

void Keyboard_::releaseAll(void)
{
_keyReport.keys[0] = 0;
_keyReport.keys[1] = 0;
_keyReport.keys[2] = 0;
_keyReport.keys[3] = 0;
_keyReport.keys[4] = 0;
_keyReport.keys[5] = 0;
uint8_t i;
for (i = 0 ; i < KEYS_ROLLOVER ; i++) {
_keyReport.keys[i] = 0x00;
}
_keyReport.modifiers = 0;
sendReport(&_keyReport);
}
Expand Down
11 changes: 9 additions & 2 deletions src/Keyboard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,19 @@
#define KEY_F11 0xCC
#define KEY_F12 0xCD

// Low level key report: up to 6 keys and shift, ctrl etc at once
// KEYS_ROLLOVER controls the maximum number of simultaneous key presses.
// If you change this to anything other than 0x06 (six keys), your keyboard
// may not work in your computer's BIOS or firmware interface.
//
// This must be a single byte, as it goes in the HID descriptor.
#define KEYS_ROLLOVER 0x06

// Low level key report: up to KEYS_ROLLOVER keys and shift, ctrl etc at once
typedef struct
{
uint8_t modifiers;
uint8_t reserved;
uint8_t keys[6];
uint8_t keys[KEYS_ROLLOVER];
} KeyReport;

class Keyboard_ : public Print
Expand Down