alpha
/
Kaleidoscope
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add debouncing and reformat

Browse Source 
also use a more efficient packing format for keymap
pull/18/head
Jesse Vincent 11 years ago
parent d0196b32b1
commit 527a1c28f5
1 changed files with 204 additions and 115 deletions
Show Stats Download Patch File Download Diff File

157
ArduinoKeyboard.ino
Unescape View File

@ -15,8 +15,10 @@ static const int ROWS = 5;
static int colPins[COLS] = { 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }; static int colPins[COLS] = { 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 };
static int rowPins[ROWS] = { A2, A3, A4, A5, 15 }; static int rowPins[ROWS] = { A2, A3, A4, A5, 15 };
boolean previousMatrix[ROWS][COLS]; byte matrixState[ROWS][COLS];
boolean currentMatrix[ROWS][COLS];
long counter = 0;
static const int LAYERS = 2; static const int LAYERS = 2;
int current_keymap = 0; int current_keymap = 0;
@ -24,39 +26,46 @@ int current_keymap = 0;
static const Key keymaps[LAYERS][ROWS][COLS] = { static const Key keymaps[LAYERS][ROWS][COLS] = {
{ {
{ {
NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, NoKey, NoKey, Key_6, Key_7, Key_8, Key_9, Key_0, NoKey }, NoKey, Key_1, Key_2, Key_3, Key_4, Key_5, NoKey, NoKey, Key_6, Key_7, Key_8, Key_9, Key_0, NoKey }
,
{ {
Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, NoKey, NoKey, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals }, Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, NoKey, NoKey, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals }
,
{ {
Key_PageUp, Key_A, Key_S, Key_D, Key_F, Key_G, Key_Tab, Key_Return, Key_H, Key_J, Key_K, Key_L, Key_Semicolon, Key_Quote }, Key_PageUp, Key_A, Key_S, Key_D, Key_F, Key_G, Key_Tab, Key_Return, Key_H, Key_J, Key_K, Key_L, Key_Semicolon, Key_Quote }
,
{ {
Key_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Esc, Key_Return, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus }, Key_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Esc, Key_Return, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus }
,
{ {
Key_LeftGUI, Key_Backspace, Key_LeftShift, Key_LeftCtrl, Key_NextKeymapMomentary, NoKey, NoKey, NoKey, NoKey, Key_NextKeymapMomentary, Key_RightCtrl, Key_RightShift, Key_Space, Key_RightAlt } Key_LeftGUI, Key_Backspace, Key_LeftShift, Key_LeftCtrl, Key_NextKeymapMomentary, NoKey, NoKey, NoKey, NoKey, Key_NextKeymapMomentary, Key_RightCtrl, Key_RightShift, Key_Space, Key_RightAlt }
}, }
,
{ {
{ NoKey, Key_4, Key_2, Key_3, Key_4, Key_5, NoKey, NoKey, Key_6, Key_7, Key_8, Key_9, Key_0, NoKey } {
NoKey, Key_4, Key_2, Key_3, Key_4, Key_5, NoKey, NoKey, Key_6, Key_7, Key_8, Key_9, Key_0, NoKey }
, ,
{ Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, NoKey, NoKey, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals } {
Key_Backtick, Key_Q, Key_W, Key_E, Key_R, Key_T, NoKey, NoKey, Key_Y, Key_U, Key_I, Key_O, Key_P, Key_Equals }
, ,
{ Key_PageUp, Key_A, Key_S, Key_D, Key_F, Key_G, Key_Tab, Key_Return, Key_LeftArrow,Key_DownArrow,Key_UpArrow,Key_RightArrow, Key_Semicolon, Key_Quote } {
Key_PageUp, Key_A, Key_S, Key_D, Key_F, Key_G, Key_Tab, Key_Return, Key_LeftArrow,Key_DownArrow,Key_UpArrow,Key_RightArrow, Key_Semicolon, Key_Quote }
, ,
{ Key_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Esc, Key_Return, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus } {
Key_PageDown, Key_Z, Key_X, Key_C, Key_V, Key_B, Key_Esc, Key_Return, Key_N, Key_M, Key_Comma, Key_Period, Key_Slash, Key_Minus }
, ,
{ Key_LeftGUI, Key_Backspace, Key_LeftShift, Key_LeftCtrl, Key_NextKeymapMomentary, NoKey, NoKey, NoKey, NoKey, Key_NextKeymapMomentary, Key_RightCtrl, Key_RightShift, Key_Space, Key_RightAlt } {
Key_LeftGUI, Key_Backspace, Key_LeftShift, Key_LeftCtrl, Key_NextKeymapMomentary, NoKey, NoKey, NoKey, NoKey, Key_NextKeymapMomentary, Key_RightCtrl, Key_RightShift, Key_Space, Key_RightAlt }
} }
}; };
void reset_matrix() { void reset_matrix() {
//TODO:be smarter and just move pointers around
for (int col = 0; col < COLS; col++) { for (int col = 0; col < COLS; col++) {
for (int row = 0; row < ROWS; row++) { for (int row = 0; row < ROWS; row++) {
previousMatrix[row][col] = currentMatrix[row][col]; matrixState[row][col] <<= 1;
currentMatrix[row][col] = 0;
} }
} }
} }
@ -69,16 +78,74 @@ void send_key_event() {
for (int row = 0; row < ROWS; row++) { for (int row = 0; row < ROWS; row++) {
for (int col = 0; col < COLS; col++) { for (int col = 0; col < COLS; col++) {
if (previousMatrix[row][col] != currentMatrix[row][col]) { if (key_toggled_on (matrixState[row][col])) {
if (currentMatrix[row][col]) {
Keyboard.press(keymaps[current_keymap][row][col].rawKey); Keyboard.press(keymaps[current_keymap][row][col].rawKey);
} else { }
else if (key_toggled_off (matrixState[row][col])) {
Keyboard.release(keymaps[current_keymap][row][col].rawKey); Keyboard.release(keymaps[current_keymap][row][col].rawKey);
} }
// report(row,col, currentMatrix[row][col]);
} }
} }
} }
boolean key_was_pressed (byte keyState) {
if ( byte((keyState >> 4)) ^ B00001111 ){
return false;
}
else {
return true;
}
}
boolean key_was_not_pressed (byte keyState) {
if ( byte((keyState >> 4)) ^ B00000000 ){
return false;
}
else {
return true;
}
}
boolean key_toggled_on(byte keyState) {
if (key_is_pressed(keyState) && ( key_was_not_pressed(keyState))) {
return true;
}
else {
return false;
}
}
boolean key_toggled_off(byte keyState) {
if (key_was_pressed(keyState) && key_is_not_pressed(keyState)) {
return true;
}
else {
return false;
}
}
boolean key_is_pressed (byte keyState) {
if ( byte((keyState << 4)) ^ B11110000 ){
return false;
}
else {
return true;
}
}
boolean key_is_not_pressed (byte keyState) {
if ( byte((keyState << 4)) ^ B00000000 ){
return false;
}
else {
return true;
}
} }
void setup_matrix() { void setup_matrix() {
@ -94,49 +161,69 @@ void setup_matrix() {
//drive em high by default s it seems to be more reliable than driving em low //drive em high by default s it seems to be more reliable than driving em low
} }
//blank out the matrix.blank out the previous version of the matrix //blank out the matrix.
for (int col = 0; col < COLS; col++) { for (int col = 0; col < COLS; col++) {
for (int row = 0; row < ROWS; row++) { for (int row = 0; row < ROWS; row++) {
previousMatrix[row][col] = 0; matrixState[row][col] = 0;
currentMatrix[row][col] = 0;
} }
} }
} }
void scan_matrix() { void scan_matrix() {
//scan the keyboard matrix looking for connections //scan the keyboard matrix looking for connections
for (int row = 0; row < ROWS; row++) { for (int row = 0; row < ROWS; row++) {
digitalWrite(rowPins[row], LOW); digitalWrite(rowPins[row], LOW);
for (int col = 0; col < COLS; col++) { for (int col = 0; col < COLS; col++) {
//If we see an electrical connection on I->J, //If we see an electrical connection on I->J,
currentMatrix[row][col] = !digitalRead(colPins[col]);
if (digitalRead(colPins[col])) {
matrixState[row][col] |= 0; // noop. just here for clarity
}
else {
matrixState[row][col] |= 1; // noop. just here for clarity
}
// while we're inspecting the electrical matrix, we look // while we're inspecting the electrical matrix, we look
// to see if the key being held is a firmware level // to see if the key being held is a firmware level
// metakey, so we can act on it, lest we only discover // metakey, so we can act on it, lest we only discover
// that we should be looking at a seconary keymap halfway through the matrix scan // that we should be looking at a seconary keymap halfway through the matrix scan
if (previousMatrix[row][col] != currentMatrix[row][col]) {
Key currentKey = keymaps[current_keymap][row][col];
if (currentKey.flags & MOMENTARY ){ if ( keymaps[current_keymap][row][col].flags & MOMENTARY ) {
if (currentMatrix[row][col]) {
if (key_toggled_on(matrixState[row][col]) ){
current_keymap++; current_keymap++;
} else { }
else if (key_toggled_off(matrixState[row][col]) ){
current_keymap--; current_keymap--;
} }
}
// guard against layer overflow
if (current_keymap >= LAYERS) { if (current_keymap >= LAYERS) {
current_keymap = 0; current_keymap = 0;
} else if (current_keymap < 0) { }
else if (current_keymap < 0) {
current_keymap = LAYERS - 1; current_keymap = LAYERS - 1;
} }
} }
digitalWrite(rowPins[row], HIGH);
} }
} }
digitalWrite(rowPins[row], HIGH);
void report_matrix() {
if (counter++ %100 == 0 ) {
for (int row = 0; row < ROWS; row++) {
for (int col = 0; col < COLS; col++) {
Serial.print(matrixState[row][col],HEX);
Serial.print(", ");
}
Serial.println("");
}
Serial.println("");
} }
} }
@ -154,12 +241,14 @@ void report(int row, int col, boolean value) {
void setup() { void setup() {
Keyboard.begin(); Keyboard.begin();
// Serial.begin(115200); Serial.begin(115200);
setup_matrix(); setup_matrix();
} }
void loop() { void loop() {
scan_matrix(); scan_matrix();
// report_matrix();
send_key_event(); send_key_event();
reset_matrix(); reset_matrix();
} }

Write Preview
Loading…
Cancel
Save