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

refactor

master
Stefan Dorn 2016-06-14 05:53:45 +01:00
parent 118f511e61
commit 5dc33a30d0
2 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main.c
View File

@ -262,17 +262,9 @@ void layer_enable_upto(layer max_layer) {
// layout info
// ----------------------------------------------------------------------------
keycode kb_keycode(layer l, u8 row, u8 col) {
return (keycode) pgm_read_byte(&(_kb_layout[l][row][col]));
}
keyfunc kb_keyfunc_press(layer l, u8 row, u8 col) {
return (keyfunc) pgm_read_word(&(_kb_layout_press[l][row][col]));
}
keyfunc kb_keyfunc_release(layer l, u8 row, u8 col) {
return (keyfunc) pgm_read_word(&(_kb_layout_release[l][row][col]));
}
keycode kb_keycode (layer l, u8 row, u8 col) { return (keycode) pgm_read_byte(&(_kb_layout[l][row][col])); }
keyfunc kb_keyfunc_press (layer l, u8 row, u8 col) { return (keyfunc) pgm_read_word(&(_kb_layout_press[l][row][col])); }
keyfunc kb_keyfunc_release (layer l, u8 row, u8 col) { return (keyfunc) pgm_read_word(&(_kb_layout_release[l][row][col])); }
// ----------------------------------------------------------------------------
// keyfunc primitives
@ -454,29 +446,15 @@ void kbfun_layer_sticky() {
// combo keyfuncs
// ----------------------------------------------------------------------------
// +shift
void kbfun_shift_press_release() {
_kbfun_press_release(current_is_pressed, KEY_LeftShift);
void _kbfun_combo_press_release(keycode combo_key) {
_kbfun_press_release(current_is_pressed, combo_key);
kbfun_press_release();
}
// +control
void kbfun_control_press_release() {
_kbfun_press_release(current_is_pressed, KEY_LeftControl);
kbfun_press_release();
}
// +alt
void kbfun_alt_press_release() {
_kbfun_press_release(current_is_pressed, KEY_LeftAlt);
kbfun_press_release();
}
// +win
void kbfun_win_press_release() {
_kbfun_press_release(current_is_pressed, KEY_LeftGUI);
kbfun_press_release();
}
void kbfun_shift_press_release() { _kbfun_combo_press_release(KEY_LeftShift); } // +shift
void kbfun_control_press_release() { _kbfun_combo_press_release(KEY_LeftControl); } // +control
void kbfun_alt_press_release() { _kbfun_combo_press_release(KEY_LeftAlt); } // +alt
void kbfun_win_press_release() { _kbfun_combo_press_release(KEY_LeftGUI); } // +win
// capslock
void kbfun_2_keys_capslock_press_release() {

1
src/main.h
View File

@ -4,6 +4,7 @@ void kbfun_win_press_release();
void kbfun_alt_press_release();
void kbfun_control_press_release();
void kbfun_shift_press_release();
void _kbfun_combo_press_release(keycode combo_key);
void kbfun_mediakey_press_release();
void kbfun_press_release();
bool key_is_modifier(keycode key);