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

better names

master
Stefan Dorn 2016-02-04 10:09:07 +00:00
parent f9f5e4b5aa
commit ac64381896
4 changed files with 57 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
generate_layout.rb
View File

@ -19,21 +19,21 @@ class Key
Functions = {
# down up
"basic" => [ "&kbfun_press_release", ],
"media" => [ "&kbfun_mediakey_press_release", ],
"toggle" => [ "&kbfun_toggle", ],
"transparent" => [ "&kbfun_transparent", ],
"basic" => [ "&kbfun_press_release", ],
"media" => [ "&kbfun_mediakey_press_release", ],
"toggle" => [ "&kbfun_toggle", ],
"transparent" => [ "&kbfun_transparent", ],
# down up
"punc" => [ "&kbfun_layer_push_1", "&kbfun_layer_pop_1" ],
"nav" => [ "&kbfun_layer_push_2", "&kbfun_layer_pop_2" ],
"func" => [ "&kbfun_layer_push_3", "&kbfun_layer_pop_3" ],
"latch_punc" => [ "&kbfun_layer_sticky_1", ],
"latch_nav" => [ "&kbfun_layer_sticky_2", ],
"latch_func" => [ "&kbfun_layer_sticky_3", ],
"punc" => [ "&kbfun_layer_enable_1", "&kbfun_layer_disable_1" ],
"nav" => [ "&kbfun_layer_enable_2", "&kbfun_layer_disable_2" ],
"func" => [ "&kbfun_layer_enable_3", "&kbfun_layer_disable_3" ],
"latch_punc" => [ "&kbfun_layer_sticky_1", ],
"latch_nav" => [ "&kbfun_layer_sticky_2", ],
"latch_func" => [ "&kbfun_layer_sticky_3", ],
# down up
"shifted" => [ "&kbfun_shift_press_release", ],
"ctrled" => [ "&kbfun_control_press_release", ],
"capslock" => [ "&kbfun_2_keys_capslock_press_release", ],
"shifted" => [ "&kbfun_shift_press_release", ],
"ctrled" => [ "&kbfun_control_press_release", ],
"capslock" => [ "&kbfun_2_keys_capslock_press_release", ],
}
Keys = {

28
src/keyboard/ergodox/layout/saneo-mod.c
View File

@ -412,13 +412,13 @@ const void_funptr_t PROGMEM _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUMNS] =
&kbfun_press_release,
&kbfun_press_release,
&kbfun_2_keys_capslock_press_release,
&kbfun_layer_push_2,
&kbfun_layer_enable_2,
&kbfun_press_release,
&kbfun_press_release,
&kbfun_press_release,
&kbfun_press_release,
&kbfun_layer_push_1,
&kbfun_layer_push_2,
&kbfun_layer_enable_1,
&kbfun_layer_enable_2,
&kbfun_press_release,
&kbfun_press_release,
&kbfun_layer_sticky_1,
@ -501,13 +501,13 @@ KB_MATRIX_LAYER(
&kbfun_transparent,
&kbfun_transparent,
&kbfun_transparent,
&kbfun_layer_push_3,
&kbfun_layer_enable_3,
&kbfun_transparent,
&kbfun_transparent,
&kbfun_layer_push_1,
&kbfun_layer_enable_1,
&kbfun_transparent,
&kbfun_transparent,
&kbfun_layer_push_1),
&kbfun_layer_enable_1),
KB_MATRIX_LAYER(
&kbfun_transparent,
@ -583,7 +583,7 @@ KB_MATRIX_LAYER(
&kbfun_transparent,
&kbfun_transparent,
&kbfun_transparent,
&kbfun_layer_push_3,
&kbfun_layer_enable_3,
&kbfun_transparent,
&kbfun_transparent,
&kbfun_transparent,
@ -744,13 +744,13 @@ const void_funptr_t PROGMEM _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COLUMNS] =
&kbfun_press_release,
&kbfun_press_release,
&kbfun_2_keys_capslock_press_release,
&kbfun_layer_pop_2,
&kbfun_layer_disable_2,
&kbfun_press_release,
&kbfun_press_release,
&kbfun_press_release,
&kbfun_press_release,
&kbfun_layer_pop_1,
&kbfun_layer_pop_2,
&kbfun_layer_disable_1,
&kbfun_layer_disable_2,
&kbfun_press_release,
&kbfun_press_release,
&kbfun_layer_sticky_1,
@ -833,13 +833,13 @@ KB_MATRIX_LAYER(
&kbfun_transparent,
&kbfun_transparent,
&kbfun_transparent,
&kbfun_layer_pop_3,
&kbfun_layer_disable_3,
&kbfun_transparent,
&kbfun_transparent,
&kbfun_layer_pop_1,
&kbfun_layer_disable_1,
&kbfun_transparent,
&kbfun_transparent,
&kbfun_layer_pop_1),
&kbfun_layer_disable_1),
KB_MATRIX_LAYER(
&kbfun_transparent,
@ -915,7 +915,7 @@ KB_MATRIX_LAYER(
&kbfun_transparent,
&kbfun_transparent,
&kbfun_transparent,
&kbfun_layer_pop_3,
&kbfun_layer_disable_3,
&kbfun_transparent,
&kbfun_transparent,
&kbfun_transparent,

28
src/lib/key-functions/public.h
View File

@ -22,21 +22,21 @@ void kbfun_toggle (void);
void kbfun_transparent (void);
// layer push/pop functions
#define simple_layer(n) \
void kbfun_layer_push_##n (void); \
void kbfun_layer_sticky_##n (void); \
void kbfun_layer_pop_##n (void);
#define define_layer(n) \
void kbfun_layer_enable_##n (void); \
void kbfun_layer_sticky_##n (void); \
void kbfun_layer_disable_##n (void);
simple_layer(1);
simple_layer(2);
simple_layer(3);
simple_layer(4);
simple_layer(5);
simple_layer(6);
simple_layer(7);
simple_layer(8);
simple_layer(9);
simple_layer(10);
define_layer(1);
define_layer(2);
define_layer(3);
define_layer(4);
define_layer(5);
define_layer(6);
define_layer(7);
define_layer(8);
define_layer(9);
define_layer(10);
// device
void kbfun_jump_to_bootloader (void);

32
src/lib/key-functions/public/basic.c
View File

@ -69,7 +69,7 @@ void kbfun_transparent(void) {
* Push a layer element containing the layer value specified in the keymap to
* the top of the stack, and record the id of that layer element
*/
static void layer_push(uint8_t layer) {
static void layer_enable(uint8_t layer) {
// FIXME necessary?
main_layers_disable(layer);
@ -153,24 +153,24 @@ static void layer_sticky(uint8_t layer) {
* out of the layer stack (no matter where it is in the stack, without
* touching any other elements)
*/
static void layer_pop(uint8_t layer) {
static void layer_disable(uint8_t layer) {
main_layers_disable(layer);
}
// push/pop functions for all layers
#define simple_layer(n) \
void kbfun_layer_push_##n (void) { layer_push(n); } \
void kbfun_layer_sticky_##n (void) { layer_sticky(n); } \
void kbfun_layer_pop_##n (void) { layer_pop(n); }
#define define_layer(n) \
void kbfun_layer_enable_##n (void) { layer_enable(n); } \
void kbfun_layer_sticky_##n (void) { layer_sticky(n); } \
void kbfun_layer_disable_##n (void) { layer_disable(n); }
simple_layer(1);
simple_layer(2);
simple_layer(3);
simple_layer(4);
simple_layer(5);
simple_layer(6);
simple_layer(7);
simple_layer(8);
simple_layer(9);
simple_layer(10);
define_layer(1);
define_layer(2);
define_layer(3);
define_layer(4);
define_layer(5);
define_layer(6);
define_layer(7);
define_layer(8);
define_layer(9);
define_layer(10);