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

Code optimalization

Browse Source 
Lift out the keyCode reading, event handling, and report sending into a small
helper function. Pretty much the same code has been called in a number of
different cases, lifting them out into a common helper improves clarity, and
reduces the size of the code, too.

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
pull/365/head
Gergely Nagy 8 years ago
parent f86700bdc3
commit 7418eb92b6
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File

54
src/Kaleidoscope-Macros.cpp
Unescape View File

@ -7,10 +7,25 @@ const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
byte Macros_::row, Macros_::col; byte Macros_::row, Macros_::col;
static void readAndPlay (const macro_t *macro_p, uint8_t flags, uint8_t keyStates) {
Key key;
key.flags = flags;
key.keyCode = pgm_read_byte(macro_p++);
if (keyStates & IS_PRESSED) {
handle_key_event(key, 255, 255, IS_PRESSED | INJECTED);
Keyboard.sendReport();
}
if (keyStates & WAS_PRESSED) {
handle_key_event(key, 255, 255, WAS_PRESSED | INJECTED);
Keyboard.sendReport();
}
}
void Macros_::play(const macro_t *macro_p) { void Macros_::play(const macro_t *macro_p) {
macro_t macro = END; macro_t macro = END;
uint8_t interval = 0; uint8_t interval = 0;
Key key; uint8_t flags;
if (!macro_p) if (!macro_p)
return; return;
@ -26,45 +41,26 @@ void Macros_::play(const macro_t *macro_p) {
break; break;
} }
case MACRO_ACTION_STEP_KEYDOWN: case MACRO_ACTION_STEP_KEYDOWN:
key.flags = pgm_read_byte(macro_p++); flags = pgm_read_byte(macro_p++);
key.keyCode = pgm_read_byte(macro_p++); readAndPlay (macro_p++, flags, IS_PRESSED);
handle_key_event(key, 255, 255, IS_PRESSED | INJECTED);
Keyboard.sendReport();
break; break;
case MACRO_ACTION_STEP_KEYUP: case MACRO_ACTION_STEP_KEYUP:
key.flags = pgm_read_byte(macro_p++); flags = pgm_read_byte(macro_p++);
key.keyCode = pgm_read_byte(macro_p++); readAndPlay (macro_p++, flags, WAS_PRESSED);
handle_key_event(key, 255, 255, WAS_PRESSED | INJECTED);
Keyboard.sendReport();
break; break;
case MACRO_ACTION_STEP_TAP: case MACRO_ACTION_STEP_TAP:
key.flags = pgm_read_byte(macro_p++); flags = pgm_read_byte(macro_p++);
key.keyCode = pgm_read_byte(macro_p++); readAndPlay (macro_p++, flags, IS_PRESSED | WAS_PRESSED);
handle_key_event(key, 255, 255, IS_PRESSED | INJECTED);
Keyboard.sendReport();
handle_key_event(key, 255, 255, WAS_PRESSED | INJECTED);
Keyboard.sendReport();
break; break;
case MACRO_ACTION_STEP_KEYCODEDOWN: case MACRO_ACTION_STEP_KEYCODEDOWN:
key.flags = 0; readAndPlay (macro_p++, 0, IS_PRESSED);
key.keyCode = pgm_read_byte(macro_p++);
handle_key_event(key, 255, 255, IS_PRESSED | INJECTED);
Keyboard.sendReport();
break; break;
case MACRO_ACTION_STEP_KEYCODEUP: case MACRO_ACTION_STEP_KEYCODEUP:
key.flags = 0; readAndPlay (macro_p++, 0, WAS_PRESSED);
key.keyCode = pgm_read_byte(macro_p++);
handle_key_event(key, 255, 255, WAS_PRESSED | INJECTED);
Keyboard.sendReport();
break; break;
case MACRO_ACTION_STEP_TAPCODE: case MACRO_ACTION_STEP_TAPCODE:
key.flags = 0; readAndPlay (macro_p++, 0, IS_PRESSED | WAS_PRESSED);
key.keyCode = pgm_read_byte(macro_p++);
handle_key_event(key, 255, 255, IS_PRESSED | INJECTED);
Keyboard.sendReport();
handle_key_event(key, 255, 255, WAS_PRESSED | INJECTED);
Keyboard.sendReport();
break; break;
case END: case END:

Write Preview
Loading…
Cancel
Save