From c8fd4b83e15c2b8cef34949dfc1a1ac99fe9b781 Mon Sep 17 00:00:00 2001 From: Stefan Dorn Date: Tue, 31 May 2016 17:14:53 +0100 Subject: [PATCH] make f key available --- generate_layout.rb | 36 ++++---- src/keyboard/ergodox/layout/saneo-mod.c | 108 ++++++++++++------------ 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/generate_layout.rb b/generate_layout.rb index d0b53dc..72124b8 100755 --- a/generate_layout.rb +++ b/generate_layout.rb @@ -323,28 +323,28 @@ keys = [ # top # letter type punc type nav type func type %w{ }, %w{ }, %w{ }, %w{ }, # 1.5 - %w{ k }, %w{ = }, %w{ 9 }, %w{ }, - %w{ h }, %w{ > shifted }, %w{ 5 }, %w{ }, - %w{ g }, %w{ " shifted }, %w{ 6 }, %w{ }, - %w{ f }, %w{ ] }, %w{ 7 }, %w{ }, - %w{ q }, %w{ ` }, %w{ 8 }, %w{ }, - %w{ q }, %w{ ` }, %w{ 8 }, %w{ }, # 1.5 + %w{ k }, %w{ = }, %w{ 9 }, %w{ f9 }, + %w{ h }, %w{ > shifted }, %w{ 5 }, %w{ f5 }, + %w{ g }, %w{ " shifted }, %w{ 6 }, %w{ f6 }, + %w{ f }, %w{ ] }, %w{ 7 }, %w{ f7 }, + %w{ q }, %w{ ` }, %w{ 8 }, %w{ f8 }, + %w{ q }, %w{ ` }, %w{ 8 }, %w{ f8 }, # 1.5 # home # letter type punc type nav type func type - %w{ s }, %w{ ) shifted }, %w{ 0 }, %w{ }, - %w{ n }, %w{ _ shifted }, %w{ 1 }, %w{ }, - %w{ r }, %w{ / }, %w{ 2 }, %w{ }, - %w{ t }, %w{ \} shifted }, %w{ 3 }, %w{ }, - %w{ d }, %w{ . }, %w{ 4 }, %w{ }, + %w{ s }, %w{ ) shifted }, %w{ 0 }, %w{ f10 }, + %w{ n }, %w{ _ shifted }, %w{ 1 }, %w{ f1 }, + %w{ r }, %w{ / }, %w{ 2 }, %w{ f2 }, + %w{ t }, %w{ \} shifted }, %w{ 3 }, %w{ f3 }, + %w{ d }, %w{ . }, %w{ 4 }, %w{ f4 }, %w{ umlaut }, %w{ }, %w{ }, %w{ }, # 1.5 # bottom # letter type punc type nav type func type %w{ enter }, %w{ }, %w{ }, %w{ }, # 1.5 - %w{ b }, %w{ + shifted }, %w{ 9 }, %w{ }, - %w{ m }, %w{ $ shifted }, %w{ 5 }, %w{ }, - %w{ j }, %w{ & shifted }, %w{ 6 }, %w{ }, - %w{ y }, %w{ # shifted }, %w{ 7 }, %w{ }, - %w{ ; }, %w{ ^ shifted }, %w{ 8 }, %w{ }, + %w{ b }, %w{ + shifted }, %w{ 9 }, %w{ f9 }, + %w{ m }, %w{ $ shifted }, %w{ 5 }, %w{ f5 }, + %w{ j }, %w{ & shifted }, %w{ 6 }, %w{ f6 }, + %w{ y }, %w{ # shifted }, %w{ 7 }, %w{ f7 }, + %w{ ; }, %w{ ^ shifted }, %w{ 8 }, %w{ f8 }, %w{ shift_r capslock }, %w{ }, %w{ }, %w{ }, # 1.5 # underbottom # letter type punc type nav type func type @@ -360,12 +360,12 @@ keys = [ # thumb-double # letter type punc type nav type func type %w{ menu }, %w{ }, %w{ }, %w{ }, - %w{ alt }, %w{ }, %w{ }, %w{ }, + %w{ func layer }, %w{ }, %w{ }, %w{ }, %w{ punc latch }, %w{ punc layer }, %w{ NULL }, %w{ NULL }, # thumb-home # letter type punc type nav type func type %w{ menu }, %w{ }, %w{ }, %w{ }, - %w{ alt }, %w{ }, %w{ }, %w{ }, + %w{ func layer }, %w{ }, %w{ }, %w{ }, %w{ punc latch }, %w{ punc layer }, %w{ NULL }, %w{ NULL }, ].each_slice(Key::Layers.size).map do |layers| diff --git a/src/keyboard/ergodox/layout/saneo-mod.c b/src/keyboard/ergodox/layout/saneo-mod.c index 00363be..c89a879 100644 --- a/src/keyboard/ergodox/layout/saneo-mod.c +++ b/src/keyboard/ergodox/layout/saneo-mod.c @@ -88,10 +88,10 @@ KEY_RightArrow, 1, 2, KEY_Application, -KEY_LeftAlt, +3, 1, KEY_Application, -KEY_LeftAlt, +3, 1), KB_MATRIX_LAYER( @@ -310,24 +310,24 @@ KEY_F9, KEY_F10, KEY_F12, NULL, +KEY_F9, +KEY_F5, +KEY_F6, +KEY_F7, +KEY_F8, +KEY_F8, +KEY_F10, +KEY_F1, +KEY_F2, +KEY_F3, +KEY_F4, NULL, NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, -NULL, +KEY_F9, +KEY_F5, +KEY_F6, +KEY_F7, +KEY_F8, NULL, NULL, NULL, @@ -420,10 +420,10 @@ const void_funptr_t PROGMEM _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUMNS] = &kbfun_layer_enable, &kbfun_layer_enable, &kbfun_press_release, -&kbfun_press_release, +&kbfun_layer_enable, &kbfun_layer_sticky, &kbfun_press_release, -&kbfun_press_release, +&kbfun_layer_enable, &kbfun_layer_sticky), KB_MATRIX_LAYER( @@ -642,24 +642,24 @@ KB_MATRIX_LAYER( &kbfun_press_release, &kbfun_press_release, &kbfun_transparent, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, &kbfun_transparent, &kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, &kbfun_transparent, &kbfun_transparent, &kbfun_transparent, @@ -752,10 +752,10 @@ const void_funptr_t PROGMEM _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COLUMNS] = &kbfun_layer_disable, &kbfun_layer_disable, &kbfun_press_release, -&kbfun_press_release, +&kbfun_layer_disable, &kbfun_layer_sticky, &kbfun_press_release, -&kbfun_press_release, +&kbfun_layer_disable, &kbfun_layer_sticky), KB_MATRIX_LAYER( @@ -974,24 +974,24 @@ KB_MATRIX_LAYER( &kbfun_press_release, &kbfun_press_release, &kbfun_transparent, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, &kbfun_transparent, &kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, -&kbfun_transparent, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, +&kbfun_press_release, &kbfun_transparent, &kbfun_transparent, &kbfun_transparent,