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

Implement getKeyswitchStateAtPosition, and transition RxCy to KEY_INDEX

Browse Source 
Implement `getKeyswitchStateAtPosition`, a hardware-agnostic way to peek into
the keyswitch state. Also transition the `RxCy` macros to `KEY_INDEX`, to make
it easier for hardware with more keys than 64 to implement them, and to make
their values unique across a keyboard, not just across a keyboard half.

Signed-off-by: Gergely Nagy <algernon@keyboard.io>
pull/365/head
Gergely Nagy 6 years ago
parent 37da56fb6b
commit 0b696af8f6
2 changed files with 89 additions and 68 deletions
Show Stats Download Patch File Download Diff File

13
src/Kaleidoscope-Hardware-Model01.cpp
Unescape View File

@ -259,4 +259,17 @@ void Model01::attachToHost() {
UDCON &= ~(1 << DETACH); UDCON &= ~(1 << DETACH);
} }
uint8_t Model01::getKeyswitchStateAtPosition(byte row, byte col) {
if (col <= 7) {
return bitRead(leftHandState.rows[row], 7 - col);
} else {
return bitRead(rightHandState.rows[row], 7 - (col - 8));
}
}
uint8_t Model01::getKeyswitchStateAtPosition(uint8_t keyIndex) {
keyIndex--;
return getKeyswitchStateAtPosition(keyIndex / COLS, keyIndex % COLS);
}
HARDWARE_IMPLEMENTATION KeyboardHardware; HARDWARE_IMPLEMENTATION KeyboardHardware;

144
src/Kaleidoscope-Hardware-Model01.h
Unescape View File

@ -62,6 +62,18 @@ class Model01 {
bool isKeyMasked(byte row, byte col); bool isKeyMasked(byte row, byte col);
void maskHeldKeys(void); void maskHeldKeys(void);
/** Key switch state
*
* These two methods return the state of the keyswitch at any given position,
* regardless of which half they are on. This is a hardware-agnostic access to
* the key switch states.
*
* The first variant requires a row and a column, the second an index, as
* returned by `KEY_INDEX`.
*/
uint8_t getKeyswitchStateAtPosition(byte row, byte col);
uint8_t getKeyswitchStateAtPosition(uint8_t keyIndex);
keydata_t leftHandState; keydata_t leftHandState;
keydata_t rightHandState; keydata_t rightHandState;
keydata_t previousLeftHandState; keydata_t previousLeftHandState;
@ -78,77 +90,73 @@ class Model01 {
static keydata_t rightHandMask; static keydata_t rightHandMask;
}; };
#define SCANBIT(row,col) ((uint32_t)1 << ((row) * 8 + (7 - (col))))
#ifndef DOXYGEN_SHOULD_SKIP_THIS #ifndef DOXYGEN_SHOULD_SKIP_THIS
#define R0C0 KEY_INDEX(0, 0)
#define R0C1 KEY_INDEX(0, 1)
#define R0C2 KEY_INDEX(0, 2)
#define R0C3 KEY_INDEX(0, 3)
#define R0C4 KEY_INDEX(0, 4)
#define R0C5 KEY_INDEX(0, 5)
#define R0C6 KEY_INDEX(0, 6)
#define R0C7 KEY_INDEX(0, 7)
#define R1C0 KEY_INDEX(1, 0)
#define R1C1 KEY_INDEX(1, 1)
#define R1C2 KEY_INDEX(1, 2)
#define R1C3 KEY_INDEX(1, 3)
#define R1C4 KEY_INDEX(1, 4)
#define R1C5 KEY_INDEX(1, 5)
#define R1C6 KEY_INDEX(1, 6)
#define R1C7 KEY_INDEX(1, 7)
#define R2C0 KEY_INDEX(2, 0)
#define R2C1 KEY_INDEX(2, 1)
#define R2C2 KEY_INDEX(2, 2)
#define R2C3 KEY_INDEX(2, 3)
#define R2C4 KEY_INDEX(2, 4)
#define R2C5 KEY_INDEX(2, 5)
#define R2C6 KEY_INDEX(2, 6)
#define R2C7 KEY_INDEX(2, 7)
#define R3C0 KEY_INDEX(3, 0)
#define R3C1 KEY_INDEX(3, 1)
#define R3C2 KEY_INDEX(3, 2)
#define R3C3 KEY_INDEX(3, 3)
#define R3C4 KEY_INDEX(3, 4)
#define R3C5 KEY_INDEX(3, 5)
#define R3C6 KEY_INDEX(3, 6)
#define R3C7 KEY_INDEX(3, 7)
#define R0C0 SCANBIT(0, 0) #define R0C8 KEY_INDEX(0, 8)
#define R0C1 SCANBIT(0, 1) #define R0C9 KEY_INDEX(0, 9)
#define R0C2 SCANBIT(0, 2) #define R0C10 KEY_INDEX(0, 10)
#define R0C3 SCANBIT(0, 3) #define R0C11 KEY_INDEX(0, 11)
#define R0C4 SCANBIT(0, 4) #define R0C12 KEY_INDEX(0, 12)
#define R0C5 SCANBIT(0, 5) #define R0C13 KEY_INDEX(0, 13)
#define R0C6 SCANBIT(0, 6) #define R0C14 KEY_INDEX(0, 15)
#define R0C7 SCANBIT(0, 7) #define R0C15 KEY_INDEX(0, 16)
#define R1C0 SCANBIT(1, 0) #define R1C8 KEY_INDEX(1, 8)
#define R1C1 SCANBIT(1, 1) #define R1C9 KEY_INDEX(1, 9)
#define R1C2 SCANBIT(1, 2) #define R1C10 KEY_INDEX(1, 10)
#define R1C3 SCANBIT(1, 3) #define R1C11 KEY_INDEX(1, 11)
#define R1C4 SCANBIT(1, 4) #define R1C12 KEY_INDEX(1, 12)
#define R1C5 SCANBIT(1, 5) #define R1C13 KEY_INDEX(1, 13)
#define R1C6 SCANBIT(1, 6) #define R1C14 KEY_INDEX(1, 14)
#define R1C7 SCANBIT(1, 7) #define R1C15 KEY_INDEX(1, 15)
#define R2C0 SCANBIT(2, 0) #define R2C8 KEY_INDEX(2, 8)
#define R2C1 SCANBIT(2, 1) #define R2C9 KEY_INDEX(2, 9)
#define R2C2 SCANBIT(2, 2) #define R2C10 KEY_INDEX(2, 10)
#define R2C3 SCANBIT(2, 3) #define R2C11 KEY_INDEX(2, 11)
#define R2C4 SCANBIT(2, 4) #define R2C12 KEY_INDEX(2, 12)
#define R2C5 SCANBIT(2, 5) #define R2C13 KEY_INDEX(2, 13)
#define R2C6 SCANBIT(2, 6) #define R2C14 KEY_INDEX(2, 14)
#define R2C7 SCANBIT(2, 7) #define R2C15 KEY_INDEX(2, 15)
#define R3C0 SCANBIT(3, 0) #define R3C8 KEY_INDEX(3, 8)
#define R3C1 SCANBIT(3, 1) #define R3C9 KEY_INDEX(3, 9)
#define R3C2 SCANBIT(3, 2) #define R3C10 KEY_INDEX(3, 10)
#define R3C3 SCANBIT(3, 3) #define R3C11 KEY_INDEX(3, 11)
#define R3C4 SCANBIT(3, 4) #define R3C12 KEY_INDEX(3, 12)
#define R3C5 SCANBIT(3, 5) #define R3C13 KEY_INDEX(3, 13)
#define R3C6 SCANBIT(3, 6) #define R3C14 KEY_INDEX(3, 14)
#define R3C7 SCANBIT(3, 7) #define R3C15 KEY_INDEX(3, 15)
#define R0C8 SCANBIT(0, 0)
#define R0C9 SCANBIT(0, 1)
#define R0C10 SCANBIT(0, 2)
#define R0C11 SCANBIT(0, 3)
#define R0C12 SCANBIT(0, 4)
#define R0C13 SCANBIT(0, 5)
#define R0C14 SCANBIT(0, 6)
#define R0C15 SCANBIT(0, 7)
#define R1C8 SCANBIT(1, 0)
#define R1C9 SCANBIT(1, 1)
#define R1C10 SCANBIT(1, 2)
#define R1C11 SCANBIT(1, 3)
#define R1C12 SCANBIT(1, 4)
#define R1C13 SCANBIT(1, 5)
#define R1C14 SCANBIT(1, 6)
#define R1C15 SCANBIT(1, 7)
#define R2C8 SCANBIT(2, 0)
#define R2C9 SCANBIT(2, 1)
#define R2C10 SCANBIT(2, 2)
#define R2C11 SCANBIT(2, 3)
#define R2C12 SCANBIT(2, 4)
#define R2C13 SCANBIT(2, 5)
#define R2C14 SCANBIT(2, 6)
#define R2C15 SCANBIT(2, 7)
#define R3C8 SCANBIT(3, 0)
#define R3C9 SCANBIT(3, 1)
#define R3C10 SCANBIT(3, 2)
#define R3C11 SCANBIT(3, 3)
#define R3C12 SCANBIT(3, 4)
#define R3C13 SCANBIT(3, 5)
#define R3C14 SCANBIT(3, 6)
#define R3C15 SCANBIT(3, 7)
#define LED_COUNT 64 #define LED_COUNT 64

Write Preview
Loading…
Cancel
Save