muflax
/
ergodox-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor

master
Stefan Dorn 2016-08-22 18:31:11 +01:00
parent 487f81b873
commit 8199d8d21d
2 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main.c
View File

@ -350,21 +350,8 @@ keyfunc kb_keyfunc (layer l, u8 row, u8 col) { return (keyfunc) pgm_read_word(&(
void _kbfun_normal_press_release(keycode key, bool is_pressed) { void _kbfun_normal_press_release(keycode key, bool is_pressed) {
if (key == 0) { return; } // noop if (key == 0) { return; } // noop
if (is_pressed) { if (is_pressed) { _kbfun_normal_swap(0, key); }
for (u8 i=0; i < sizeof(keyboard_keys); i++) { else { _kbfun_normal_swap(key, 0); }
if (keyboard_keys[i] == 0) {
keyboard_keys[i] = key;
return;
}
}
} else {
for (u8 i=0; i < sizeof(keyboard_keys); i++) {
if (keyboard_keys[i] == key) {
keyboard_keys[i] = 0;
return;
}
}
}
} }
void _kbfun_mediakey_press_release(keycode key, bool is_pressed) { void _kbfun_mediakey_press_release(keycode key, bool is_pressed) {
@ -387,6 +374,15 @@ void _kbfun_modifier_press_release(keycode key, bool is_pressed) {
} }
} }
void _kbfun_normal_swap(keycode from, keycode to) {
for (u8 i=0; i < sizeof(keyboard_keys); i++) {
if (keyboard_keys[i] == from) {
keyboard_keys[i] = to;
return;
}
}
}
bool _kbfun_normal_is_pressed(keycode key) { bool _kbfun_normal_is_pressed(keycode key) {
for (u8 i=0; i < sizeof(keyboard_keys); i++) { for (u8 i=0; i < sizeof(keyboard_keys); i++) {
if (keyboard_keys[i] == key) { if (keyboard_keys[i] == key) {

1
src/main.h
View File

@ -21,6 +21,7 @@ bool _kbfun_mediakey_is_pressed(keycode key);
bool _kbfun_normal_is_pressed(keycode key); bool _kbfun_normal_is_pressed(keycode key);
void _kbfun_modifier_press_release(keycode key,bool is_pressed); void _kbfun_modifier_press_release(keycode key,bool is_pressed);
void _kbfun_mediakey_press_release(keycode key,bool is_pressed); void _kbfun_mediakey_press_release(keycode key,bool is_pressed);
void _kbfun_normal_swap(keycode from,keycode to);
void _kbfun_normal_press_release(keycode key,bool is_pressed); void _kbfun_normal_press_release(keycode key,bool is_pressed);
keycode kb_keycode(layer l,u8 row,u8 col); keycode kb_keycode(layer l,u8 row,u8 col);
bool is_layer_keyfunc(keyfunc f); bool is_layer_keyfunc(keyfunc f);