diff options
| author | Alex Ong <the.onga@gmail.com> | 2019-01-26 02:13:19 +0100 |
|---|---|---|
| committer | Alex Ong <the.onga@gmail.com> | 2019-01-26 02:13:19 +0100 |
| commit | c9ba618654417ec115809a031d315f8327c79ad4 (patch) | |
| tree | cd5b907af5bebde7062897ff847e473232ed1214 /keyboards/clueboard/17/keymaps/default | |
| parent | 2bb2977c133646c4e056960e72029270d77cc1eb (diff) | |
| parent | d977daa8dc9136746425f9e1414e1f93cb161877 (diff) | |
| download | qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.gz qmk_firmware-c9ba618654417ec115809a031d315f8327c79ad4.tar.xz | |
DO NOT USE Merge branch 'master' into debounce_refactor
Merged, however now there are two debounce.h and debounce.c to mess around with and coalesce.
# Conflicts:
# quantum/matrix.c
Diffstat (limited to 'keyboards/clueboard/17/keymaps/default')
| -rw-r--r-- | keyboards/clueboard/17/keymaps/default/keymap.c | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/keyboards/clueboard/17/keymaps/default/keymap.c b/keyboards/clueboard/17/keymaps/default/keymap.c index e8f3525a8..65c64e43c 100644 --- a/keyboards/clueboard/17/keymaps/default/keymap.c +++ b/keyboards/clueboard/17/keymaps/default/keymap.c @@ -1,6 +1,4 @@ -#include "17.h" - -#include "backlight.h" +#include QMK_KEYBOARD_H // Each layer gets a name for readability, which is then used in the keymap matrix below. // The underscores don't mean anything - you can have a layer called STUFF or any other name. @@ -8,7 +6,6 @@ // entirely and just use numbers. #define _BL 0 #define _FL 1 -#define _RS 2 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap _BL: (Base Layer) Default Layer @@ -24,12 +21,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | 0| .| Ent| * '-------------------' */ -[_BL] = KEYMAP( - LT(_FL, KC_NLCK), KC_PSLS, KC_PAST, KC_PMNS, \ - KC_P7, KC_P8, KC_P9, KC_PPLS, \ - KC_P4, KC_P5, KC_P6, \ - KC_P1, KC_P2, KC_P3, KC_PENT, \ - KC_P0, KC_PDOT), + [_BL] = LAYOUT_numpad_5x4( + LT(_FL, KC_NLCK), KC_PSLS, KC_PAST, KC_PMNS, \ + KC_P7, KC_P8, KC_P9, \ + KC_P4, KC_P5, KC_P6, KC_PPLS, \ + KC_P1, KC_P2, KC_P3, \ + KC_P0, KC_PDOT, KC_PENT \ + ), /* Keymap _FL: Function Layer * .-------------------. @@ -44,22 +42,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * | Fn1| | Fn7| * '-------------------' */ -[_FL] = KEYMAP( - LT(_FL, KC_NLCK), KC_TRNS, KC_TRNS, RGB_TOG, \ - KC_TRNS, RGB_SAI, KC_TRNS, RGB_VAI, \ - RGB_HUD, BL_STEP, RGB_HUI, \ - KC_TRNS, RGB_SAD, KC_TRNS, RGB_VAD, \ - RGB_MOD, KC_TRNS) -}; - -/*enum function_id { -};*/ - -const uint16_t PROGMEM fn_actions[] = { + [_FL] = LAYOUT_numpad_5x4( + LT(_FL, KC_NLCK), _______, _______, RGB_TOG, \ + _______, RGB_SAI, _______, \ + RGB_HUD, BL_STEP, RGB_HUI, RGB_VAI, \ + _______, RGB_SAD, _______, \ + RGB_MOD, _______, RGB_VAD \ + ) }; - -void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { - switch (id) { - } -} - |