From 17dd157c1d7d6b8be3e4c332e920284e954690c0 Mon Sep 17 00:00:00 2001 From: Stefan Dorn Date: Tue, 9 Aug 2016 16:13:20 +0100 Subject: [PATCH] cleanup --- generate_layout.rb | 4 ++-- src/keyboard/layout.c | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/generate_layout.rb b/generate_layout.rb index 1946ede..4c8a0fd 100755 --- a/generate_layout.rb +++ b/generate_layout.rb @@ -402,12 +402,12 @@ keys = [ # letter type punc type nav type func type %w{ menu }, %w{ }, %w{ }, %w{ }, %w{ func }, %w{ }, %w{ }, %w{ }, - %w{ punc sticky }, %w{ punc }, %w{ NULL }, %w{ NULL }, + %w{ punc sticky }, %w{ }, %w{ }, %w{ }, # thumb-home # letter type punc type nav type func type %w{ menu }, %w{ }, %w{ }, %w{ }, %w{ func }, %w{ }, %w{ }, %w{ }, - %w{ punc sticky }, %w{ punc }, %w{ NULL }, %w{ NULL }, + %w{ punc sticky }, %w{ }, %w{ }, %w{ }, ].each_slice(Key::Layers.size).map do |layers| Key.new layers diff --git a/src/keyboard/layout.c b/src/keyboard/layout.c index ed7a473..06e1959 100644 --- a/src/keyboard/layout.c +++ b/src/keyboard/layout.c @@ -247,10 +247,10 @@ KB_MATRIX_LAYER( (keycode) 3, (keycode) KEY_Application, (keycode) 3, -(keycode) KEY_NULL, +(keycode) 1, (keycode) KEY_Application, (keycode) 3, -(keycode) KEY_NULL), +(keycode) 1), KB_MATRIX_LAYER( (keycode) KEY_NULL, @@ -330,10 +330,10 @@ KB_MATRIX_LAYER( (keycode) 3, (keycode) KEY_Application, (keycode) 3, -(keycode) KEY_NULL, +(keycode) 1, (keycode) KEY_Application, (keycode) 3, -(keycode) KEY_NULL), +(keycode) 1), }; static const keyfunc PROGMEM _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUMNS] = { KB_MATRIX_LAYER( (keyfunc) &kbfun_normal_press_release, @@ -496,10 +496,10 @@ KB_MATRIX_LAYER( (keyfunc) &kbfun_control_layer_press_release, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_layer_press_release, +(keyfunc) &kbfun_layer_sticky, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_layer_press_release), +(keyfunc) &kbfun_layer_sticky), KB_MATRIX_LAYER( (keyfunc) &kbfun_normal_press_release, @@ -579,10 +579,10 @@ KB_MATRIX_LAYER( (keyfunc) &kbfun_control_layer_press_release, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_normal_press_release, +(keyfunc) &kbfun_layer_sticky, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_normal_press_release), +(keyfunc) &kbfun_layer_sticky), KB_MATRIX_LAYER( (keyfunc) &kbfun_normal_press_release, @@ -662,10 +662,10 @@ KB_MATRIX_LAYER( (keyfunc) &kbfun_control_layer_press_release, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_normal_press_release, +(keyfunc) &kbfun_layer_sticky, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_normal_press_release), +(keyfunc) &kbfun_layer_sticky), }; static const keyfunc PROGMEM _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COLUMNS] = { KB_MATRIX_LAYER( (keyfunc) &kbfun_normal_press_release, @@ -828,10 +828,10 @@ KB_MATRIX_LAYER( (keyfunc) &kbfun_control_layer_press_release, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_layer_press_release, +(keyfunc) &kbfun_layer_sticky, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_layer_press_release), +(keyfunc) &kbfun_layer_sticky), KB_MATRIX_LAYER( (keyfunc) &kbfun_normal_press_release, @@ -911,10 +911,10 @@ KB_MATRIX_LAYER( (keyfunc) &kbfun_control_layer_press_release, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_normal_press_release, +(keyfunc) &kbfun_layer_sticky, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_normal_press_release), +(keyfunc) &kbfun_layer_sticky), KB_MATRIX_LAYER( (keyfunc) &kbfun_normal_press_release, @@ -994,8 +994,8 @@ KB_MATRIX_LAYER( (keyfunc) &kbfun_control_layer_press_release, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_normal_press_release, +(keyfunc) &kbfun_layer_sticky, (keyfunc) &kbfun_normal_press_release, (keyfunc) &kbfun_layer_press_release, -(keyfunc) &kbfun_normal_press_release), +(keyfunc) &kbfun_layer_sticky), };