From 33b6cf6f4746b136aefe3d5edbd99b9536b67b84 Mon Sep 17 00:00:00 2001 From: Ben Blazak Date: Fri, 15 Jun 2012 16:50:02 -0700 Subject: [PATCH] (reverting after test) i did want to save the test code though --- src/keyboard/ergodox/layout.h | 26 +++++---------- src/keyboard/ergodox/layout/qwerty.c | 47 ++++++++++------------------ 2 files changed, 25 insertions(+), 48 deletions(-) diff --git a/src/keyboard/ergodox/layout.h b/src/keyboard/ergodox/layout.h index c5c9a0f..e58eb51 100644 --- a/src/keyboard/ergodox/layout.h +++ b/src/keyboard/ergodox/layout.h @@ -71,33 +71,23 @@ #endif #ifndef kb_layout_press_get - extern kbfun_funptr_t PROGMEM _kb_layout_functions[6]; - extern uint8_t PROGMEM \ + extern kbfun_funptr_t PROGMEM \ _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUMNS]; #define kb_layout_press_get(layer,row,column) \ - ( (kbfun_funptr_t) \ - pgm_read_word(&( \ - _kb_layout_functions[ \ - ( (uint8_t) \ - pgm_read_byte(&( \ - _kb_layout_press[layer][row][column] \ - )) ) ] )) ) + ( (kbfun_funptr_t) \ + pgm_read_word(&( \ + _kb_layout_press[layer][row][column] )) ) #endif #ifndef kb_layout_release_get - extern kbfun_funptr_t PROGMEM _kb_layout_functions[6]; - extern uint8_t PROGMEM \ + extern kbfun_funptr_t PROGMEM \ _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COLUMNS]; #define kb_layout_release_get(layer,row,column) \ - ( (kbfun_funptr_t) \ - pgm_read_word(&( \ - _kb_layout_functions[ \ - ( (uint8_t) \ - pgm_read_byte(&( \ - _kb_layout_release[layer][row][column] \ - )) ) ] )) ) + ( (kbfun_funptr_t) \ + pgm_read_word(&( \ + _kb_layout_release[layer][row][column] )) ) #endif diff --git a/src/keyboard/ergodox/layout/qwerty.c b/src/keyboard/ergodox/layout/qwerty.c index 3b5d3c8..8169a27 100644 --- a/src/keyboard/ergodox/layout/qwerty.c +++ b/src/keyboard/ergodox/layout/qwerty.c @@ -19,27 +19,14 @@ #include "../layout.h" +#include "../../../lib/key-functions.h" // aliases -// #define f_press &kbfun_press -// #define f_relea &kbfun_release -// #define f_l_set &kbfun_layer_set -// #define f_l_inc &kbfun_layer_inc -// #define f_l_dec &kbfun_layer_dec -// #define f_2kcap &kbfun_2_keys_capslock_press_release -kbfun_funptr_t PROGMEM _kb_layout_functions[6] = { - &kbfun_press, - &kbfun_release, - &kbfun_layer_set, - &kbfun_layer_inc, - &kbfun_layer_dec, - &kbfun_2_keys_capslock_press_release -}; -#define f_press 0 -#define f_relea 1 -#define f_l_set 2 -#define f_l_inc 3 -#define f_l_dec 4 -#define f_2kcap 5 +#define f_press &kbfun_press +#define f_relea &kbfun_release +#define f_l_set &kbfun_layer_set +#define f_l_inc &kbfun_layer_inc +#define f_l_dec &kbfun_layer_dec +#define f_2kcap &kbfun_2_keys_capslock_press_release uint8_t PROGMEM _kb_layout[KB_LAYERS][KB_ROWS][KB_COLUMNS] = { @@ -91,11 +78,11 @@ _altR, _pageU, _pageD ) }; -uint8_t PROGMEM _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUMNS] = { +kbfun_funptr_t PROGMEM _kb_layout_press[KB_LAYERS][KB_ROWS][KB_COLUMNS] = { // ---------------------------------------------------------------------------- LAYER( // layer 0: default // unused - 0, +NULL, // left hand f_press,f_press,f_press,f_press,f_press,f_press,f_press, f_press,f_press,f_press,f_press,f_press,f_press,f_press, @@ -117,12 +104,12 @@ f_press,f_press,f_press ), // ---------------------------------------------------------------------------- LAYER( // layer 1: function and symbol keys // unused - 0, +NULL, // left hand f_press,f_press,f_press,f_press,f_press,f_press,f_press, f_press,f_press,f_press,f_press,f_press,f_press,f_press, f_press,f_press,f_press,f_press,f_press,f_press, -f_press,f_press,f_press,f_press,f_press,f_press, 0, +f_press,f_press,f_press,f_press,f_press,f_press, NULL, f_press,f_press,f_press,f_press,f_press, f_press, f_press, f_press, @@ -131,7 +118,7 @@ f_press,f_press,f_press,f_press,f_press, f_press,f_press,f_press,f_press,f_press,f_press,f_press, f_press,f_press,f_press,f_press,f_press,f_press,f_press, f_press,f_press,f_press,f_press,f_press,f_press, - 0,f_press,f_press,f_press,f_press,f_press,f_press, + NULL,f_press,f_press,f_press,f_press,f_press,f_press, f_press,f_press,f_press,f_press,f_press, f_press, f_press, f_press, @@ -140,11 +127,11 @@ f_press,f_press,f_press ) }; -uint8_t PROGMEM _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COLUMNS] = { +kbfun_funptr_t PROGMEM _kb_layout_release[KB_LAYERS][KB_ROWS][KB_COLUMNS] = { // ---------------------------------------------------------------------------- LAYER( // layer 0: default // unused - 0, +NULL, // left hand f_relea,f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, f_relea,f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, @@ -166,12 +153,12 @@ f_relea,f_relea,f_relea ), // ---------------------------------------------------------------------------- LAYER( // layer 1: function and symbol keys // unused - 0, +NULL, // left hand f_relea,f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, f_relea,f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, -f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, 0, +f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, NULL, f_relea,f_relea,f_relea,f_relea,f_relea, f_relea, f_relea, f_relea, @@ -180,7 +167,7 @@ f_relea,f_relea,f_relea,f_relea,f_relea, f_relea,f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, f_relea,f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, - 0,f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, + NULL,f_relea,f_relea,f_relea,f_relea,f_relea,f_relea, f_relea,f_relea,f_relea,f_relea,f_relea, f_relea, f_relea, f_relea,