pull/389/head
Ben Gemperline 7 years ago
parent 1a73d22da7
commit 5d4d7820ae

@ -68,18 +68,19 @@ Key SpaceCadet::eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key
// If a key has been just toggled on... // If a key has been just toggled on...
if (keyToggledOn(key_state)) { if (keyToggledOn(key_state)) {
//This will only set one key, and if it isn't in our map it clears everything //This will only set one key, and if it isn't in our map it clears everything
//for the non-pressed key //for the non-pressed key
for (uint8_t i = 0 ;; ++i) { //Exit condition is if we reach the sentinal
//Check for ending sentinal and exit for (
if( uint8_t i = 0 ;
!(
map[i].input.raw == Key_NoKey.raw map[i].input.raw == Key_NoKey.raw
&& map[i].output.raw == Key_NoKey.raw && map[i].output.raw == Key_NoKey.raw
&& map[i].timeout == 0 && map[i].timeout == 0
) { ) ;
break; ++i
} ) {
if (mapped_key.raw == map[i].input.raw) { if (mapped_key.raw == map[i].input.raw) {
//The keypress was valid and a match. //The keypress was valid and a match.
@ -102,17 +103,17 @@ Key SpaceCadet::eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key
bool pressed_key_was_valid = false; bool pressed_key_was_valid = false;
uint8_t index = 0; uint8_t index = 0;
//Look to see if any keys in our map are flagged //Look to see if any keys in our map are flagged.
for (uint8_t i = 0 ;; ++i) { //Exit condition is if we reach the sentinal
for (
//Check for ending sentinal and exit uint8_t i = 0 ;
if( !(
map[i].input.raw == Key_NoKey.raw map[i].input.raw == Key_NoKey.raw
&& map[i].output.raw == Key_NoKey.raw && map[i].output.raw == Key_NoKey.raw
&& map[i].timeout == 0 && map[i].timeout == 0
) { ) ;
break; ++i
} ) {
if (map[i].flagged) { if (map[i].flagged) {
valid_key = true; valid_key = true;

@ -29,7 +29,7 @@ namespace kaleidoscope {
class SpaceCadet : public KaleidoscopePlugin { class SpaceCadet : public KaleidoscopePlugin {
public: public:
//Internal Class //Internal Class
//Declarations for the modifier key mapping //Declarations for the modifier key mapping
class KeyBinding { class KeyBinding {
public: public:
//Empty constructor; set the vars separately //Empty constructor; set the vars separately
@ -58,7 +58,7 @@ class SpaceCadet : public KaleidoscopePlugin {
//Publically accessible variables //Publically accessible variables
static uint16_t time_out; // The global timeout in milliseconds static uint16_t time_out; // The global timeout in milliseconds
static SpaceCadet::KeyBinding * map; // The map of key bindings static SpaceCadet::KeyBinding * map; // The map of key bindings
private: private:
static Key eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_state); static Key eventHandlerHook(Key mapped_key, byte row, byte col, uint8_t key_state);

Loading…
Cancel
Save