From 61a8817f2e823bd92990bcf455736b3fb2b1532b Mon Sep 17 00:00:00 2001 From: Stefan Dorn Date: Sun, 12 Jun 2016 06:44:09 +0100 Subject: [PATCH] get rid of transparent keys as part of the coming sticky cleanup --- generate_layout.rb | 46 +-- src/keyboard/layout.c | 804 +++++++++++++++++++++--------------------- src/main.c | 14 - src/main.h | 1 - 4 files changed, 428 insertions(+), 437 deletions(-) diff --git a/generate_layout.rb b/generate_layout.rb index 77b0169..dd8cc62 100755 --- a/generate_layout.rb +++ b/generate_layout.rb @@ -18,17 +18,16 @@ class Key Layers = [ :basic, :punc, :nav, :func ] Functions = { - # down up - "basic" => [ "&kbfun_press_release", ], - "media" => [ "&kbfun_mediakey_press_release", ], - "transparent" => [ "&kbfun_transparent", ], - # down up - "layer" => [ "&kbfun_layer_enable", "&kbfun_layer_disable" ], - "latch" => [ "&kbfun_layer_sticky", ], - # down up - "shifted" => [ "&kbfun_shift_press_release", ], - "ctrled" => [ "&kbfun_control_press_release", ], - "capslock" => [ "&kbfun_2_keys_capslock_press_release", ], + # down up + "basic" => [ "&kbfun_press_release", ], + "media" => [ "&kbfun_mediakey_press_release", ], + # down up + "layer" => [ "&kbfun_layer_enable", "&kbfun_layer_disable" ], + "latch" => [ "&kbfun_layer_sticky", ], + # down up + "shifted" => [ "&kbfun_shift_press_release", ], + "ctrled" => [ "&kbfun_control_press_release", ], + "capslock" => [ "&kbfun_2_keys_capslock_press_release", ], } Keys = { @@ -187,18 +186,25 @@ class Key end def initialize layers - @layers = layers.map do |key, type| - raise "key not found: #{key}" if not Keys.include? key and not key.nil? - raise "type not found: #{type}" if not Functions.include? type and not type.nil? + @layers = Array.new(layers.size) - # just fall through by default - type = "transparent" if type.nil? and key.nil? - key = Keys[key] || "KEY_NULL" + layers.each.with_index do |(key, type), i| + if type.nil? and key.nil? + @layers[i] = @layers[i-1] + next + end + + keycode = Keys[key] up, down = Functions[type] || Functions["basic"] down ||= up - Layer.new key, down, up + raise "key not found: #{key}" if keycode.nil? + raise "type not found: #{type}" if up.nil? or down.nil? + + @layers[i] = Layer.new(keycode, down, up) end + + raise "transparency error: #{layers}" if @layers.any?(&:nil?) end end @@ -240,7 +246,7 @@ end keys = [ # letter type punc type nav type func type - %w{ }, %w{ }, %w{ }, %w{ }, # dummy key + %w{ NULL }, %w{ }, %w{ }, %w{ }, # dummy key # # left hand # number @@ -313,7 +319,7 @@ keys = [ %w{ 0 }, %w{ f12 }, %w{ f12 }, %w{ f12 }, # top # letter type punc type nav type func type - %w{ }, %w{ }, %w{ }, %w{ }, # 1.5 + %w{ NULL }, %w{ }, %w{ }, %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 }, diff --git a/src/keyboard/layout.c b/src/keyboard/layout.c index c16c3e9..9824871 100644 --- a/src/keyboard/layout.c +++ b/src/keyboard/layout.c @@ -101,33 +101,33 @@ KB_MATRIX_LAYER( (uint8_t) KEY_SingleQuote_DoubleQuote, (uint8_t) KEY_Comma_LessThan, (uint8_t) KEY_Backslash_Pipe, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_Tab, +(uint8_t) KEY_RightAlt, (uint8_t) KEY_Comma_LessThan, (uint8_t) KEY_LeftBracket_LeftBrace, (uint8_t) KEY_Slash_Question, (uint8_t) KEY_1_Exclamation, (uint8_t) KEY_9_LeftParenthesis, -(uint8_t) KEY_NULL, +(uint8_t) KEY_LeftShift, (uint8_t) KEY_GraveAccent_Tilde, (uint8_t) KEY_6_Caret, (uint8_t) KEY_Backslash_Pipe, (uint8_t) KEY_Dash_Underscore, (uint8_t) KEY_2_At, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_ReturnEnter, +(uint8_t) KEY_LeftArrow, +(uint8_t) KEY_UpArrow, +(uint8_t) KEY_DownArrow, +(uint8_t) KEY_RightArrow, +(uint8_t) KEY_LeftGUI, +(uint8_t) KEY_ScrollLock, +(uint8_t) 3, +(uint8_t) KEY_Spacebar, +(uint8_t) KEY_LeftControl, +(uint8_t) KEY_LeftAlt, +(uint8_t) KEY_Spacebar, +(uint8_t) KEY_LeftControl, +(uint8_t) KEY_LeftAlt, (uint8_t) KEY_F5, (uint8_t) KEY_F6, (uint8_t) KEY_F7, @@ -147,26 +147,26 @@ KB_MATRIX_LAYER( (uint8_t) KEY_Slash_Question, (uint8_t) KEY_RightBracket_RightBrace, (uint8_t) KEY_Period_GreaterThan, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_RightAlt, +(uint8_t) KEY_ReturnEnter, (uint8_t) KEY_Equal_Plus, (uint8_t) KEY_4_Dollar, (uint8_t) KEY_7_Ampersand, (uint8_t) KEY_3_Pound, (uint8_t) KEY_6_Caret, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) 3, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_RightShift, +(uint8_t) 2, +(uint8_t) KEY_LeftArrow, +(uint8_t) KEY_UpArrow, +(uint8_t) KEY_DownArrow, +(uint8_t) KEY_RightArrow, (uint8_t) 1, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) 3, +(uint8_t) KEY_Application, +(uint8_t) 3, +(uint8_t) 1, +(uint8_t) KEY_Application, +(uint8_t) 3, (uint8_t) 1), KB_MATRIX_LAYER( @@ -184,33 +184,33 @@ KB_MATRIX_LAYER( (uint8_t) KEY_ReturnEnter, (uint8_t) KEY_DeleteForward, (uint8_t) KEY_Insert, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_Tab, +(uint8_t) KEY_RightAlt, (uint8_t) KEY_LeftArrow, (uint8_t) KEY_UpArrow, (uint8_t) KEY_DownArrow, (uint8_t) KEY_RightArrow, (uint8_t) KEY_Tab, -(uint8_t) KEY_NULL, +(uint8_t) KEY_LeftShift, (uint8_t) KEY_Home, (uint8_t) KEY_PageUp, (uint8_t) KEY_PageDown, (uint8_t) KEY_End, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_2_At, +(uint8_t) KEY_ReturnEnter, +(uint8_t) KEY_LeftArrow, +(uint8_t) KEY_UpArrow, +(uint8_t) KEY_DownArrow, +(uint8_t) KEY_RightArrow, +(uint8_t) KEY_LeftGUI, +(uint8_t) KEY_ScrollLock, +(uint8_t) 3, +(uint8_t) KEY_Spacebar, +(uint8_t) KEY_LeftControl, +(uint8_t) KEY_LeftAlt, +(uint8_t) KEY_Spacebar, +(uint8_t) KEY_LeftControl, +(uint8_t) KEY_LeftAlt, (uint8_t) KEY_F5, (uint8_t) KEY_F6, (uint8_t) KEY_F7, @@ -230,26 +230,26 @@ KB_MATRIX_LAYER( (uint8_t) KEY_2_At, (uint8_t) KEY_3_Pound, (uint8_t) KEY_4_Dollar, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_RightAlt, +(uint8_t) KEY_ReturnEnter, (uint8_t) KEY_9_LeftParenthesis, (uint8_t) KEY_5_Percent, (uint8_t) KEY_6_Caret, (uint8_t) KEY_7_Ampersand, (uint8_t) KEY_8_Asterisk, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_RightShift, +(uint8_t) 2, +(uint8_t) KEY_LeftArrow, +(uint8_t) KEY_UpArrow, +(uint8_t) KEY_DownArrow, +(uint8_t) KEY_RightArrow, +(uint8_t) 3, +(uint8_t) 3, +(uint8_t) KEY_Application, (uint8_t) 3, (uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_Application, +(uint8_t) 3, (uint8_t) KEY_NULL), KB_MATRIX_LAYER( @@ -261,39 +261,39 @@ KB_MATRIX_LAYER( (uint8_t) KEY_F4, (uint8_t) KEY_F5, (uint8_t) KEY_F6, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_Escape, +(uint8_t) KEY_Escape, +(uint8_t) KEY_DeleteBackspace, +(uint8_t) KEY_ReturnEnter, +(uint8_t) KEY_DeleteForward, +(uint8_t) KEY_Insert, +(uint8_t) KEY_Tab, +(uint8_t) KEY_RightAlt, (uint8_t) MEDIAKEY_AUDIO_MUTE, (uint8_t) MEDIAKEY_AUDIO_VOL_UP, (uint8_t) MEDIAKEY_AUDIO_VOL_DOWN, (uint8_t) MEDIAKEY_NEXT_TRACK, (uint8_t) MEDIAKEY_PREV_TRACK, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_LeftShift, +(uint8_t) KEY_Home, +(uint8_t) KEY_PageUp, +(uint8_t) KEY_PageDown, +(uint8_t) KEY_End, +(uint8_t) KEY_2_At, +(uint8_t) KEY_ReturnEnter, +(uint8_t) KEY_LeftArrow, +(uint8_t) KEY_UpArrow, +(uint8_t) KEY_DownArrow, +(uint8_t) KEY_RightArrow, +(uint8_t) KEY_LeftGUI, +(uint8_t) KEY_ScrollLock, +(uint8_t) 3, +(uint8_t) KEY_Spacebar, +(uint8_t) KEY_LeftControl, +(uint8_t) KEY_LeftAlt, +(uint8_t) KEY_Spacebar, +(uint8_t) KEY_LeftControl, +(uint8_t) KEY_LeftAlt, (uint8_t) KEY_F5, (uint8_t) KEY_F6, (uint8_t) KEY_F7, @@ -313,30 +313,30 @@ KB_MATRIX_LAYER( (uint8_t) KEY_F2, (uint8_t) KEY_F3, (uint8_t) KEY_F4, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_RightAlt, +(uint8_t) KEY_ReturnEnter, (uint8_t) KEY_F9, (uint8_t) KEY_F5, (uint8_t) KEY_F6, (uint8_t) KEY_F7, (uint8_t) KEY_F8, +(uint8_t) KEY_RightShift, +(uint8_t) 2, +(uint8_t) KEY_LeftArrow, +(uint8_t) KEY_UpArrow, +(uint8_t) KEY_DownArrow, +(uint8_t) KEY_RightArrow, +(uint8_t) 3, +(uint8_t) 3, +(uint8_t) KEY_Application, +(uint8_t) 3, (uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, -(uint8_t) KEY_NULL, +(uint8_t) KEY_Application, +(uint8_t) 3, (uint8_t) KEY_NULL), }; static const void_funptr_t PROGMEM _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUMNS] = { KB_MATRIX_LAYER( -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -384,7 +384,7 @@ static const void_funptr_t PROGMEM _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUM (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -419,7 +419,7 @@ static const void_funptr_t PROGMEM _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUM (void_funptr_t) &kbfun_layer_sticky), KB_MATRIX_LAYER( -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -433,76 +433,75 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_layer_enable, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_layer_enable, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_layer_enable), KB_MATRIX_LAYER( -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -516,41 +515,6 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -559,33 +523,68 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_layer_enable, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_enable, (void_funptr_t) &kbfun_press_release), KB_MATRIX_LAYER( -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -593,39 +592,26 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_mediakey_press_release, (void_funptr_t) &kbfun_mediakey_press_release, (void_funptr_t) &kbfun_mediakey_press_release, (void_funptr_t) &kbfun_mediakey_press_release, (void_funptr_t) &kbfun_mediakey_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -633,7 +619,7 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_layer_enable, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -645,30 +631,44 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_enable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_enable, (void_funptr_t) &kbfun_press_release), }; static const void_funptr_t PROGMEM _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COLUMNS] = { KB_MATRIX_LAYER( -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -716,7 +716,7 @@ static const void_funptr_t PROGMEM _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COL (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -751,7 +751,7 @@ static const void_funptr_t PROGMEM _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COL (void_funptr_t) &kbfun_layer_sticky), KB_MATRIX_LAYER( -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -765,76 +765,75 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_shift_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_layer_disable, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_layer_disable, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_layer_disable), KB_MATRIX_LAYER( -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -848,41 +847,6 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -891,33 +855,68 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_layer_disable, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_disable, (void_funptr_t) &kbfun_press_release), KB_MATRIX_LAYER( -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -925,39 +924,26 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_mediakey_press_release, (void_funptr_t) &kbfun_mediakey_press_release, (void_funptr_t) &kbfun_mediakey_press_release, (void_funptr_t) &kbfun_mediakey_press_release, (void_funptr_t) &kbfun_mediakey_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_shift_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -965,7 +951,7 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_layer_disable, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, @@ -977,25 +963,39 @@ KB_MATRIX_LAYER( (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, (void_funptr_t) &kbfun_press_release, -(void_funptr_t) &kbfun_transparent, -(void_funptr_t) &kbfun_transparent, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_2_keys_capslock_press_release, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_disable, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_press_release, +(void_funptr_t) &kbfun_layer_disable, (void_funptr_t) &kbfun_press_release), }; diff --git a/src/main.c b/src/main.c index 4fcc25e..4e4b877 100644 --- a/src/main.c +++ b/src/main.c @@ -375,20 +375,6 @@ void kbfun_press_release_preserve_sticky() { _kbfun_press_release(current_is_pressed, keycode); } -/* - * Execute the key that would have been executed if the current layer was not - * active - */ -void kbfun_transparent(void) { - // TODO maybe re-implement this cleaner? - trans_key_pressed = true; - layer_offset++; - current_layer = layer_peek(layer_offset); - layers_pressed[current_row][current_col] = current_layer; - exec_key(); -} - - // ---------------------------------------------------------------------------- // layer helper functions // ---------------------------------------------------------------------------- diff --git a/src/main.h b/src/main.h index 98112a8..12bbc08 100644 --- a/src/main.h +++ b/src/main.h @@ -6,7 +6,6 @@ void kbfun_shift_press_release(void); void kbfun_layer_disable(); void kbfun_layer_sticky(); void kbfun_layer_enable(); -void kbfun_transparent(void); void kbfun_press_release_preserve_sticky(); void kbfun_press_release(); uint8_t _kbfun_get_keycode();