From 19fdfccca28f923a12351fbee6c8c8282dca004e Mon Sep 17 00:00:00 2001 From: noroadsleft <18669334+noroadsleft@users.noreply.github.com> Date: Fri, 17 Aug 2018 16:12:22 -0700 Subject: Keyboard: Ckeys refactor (#3681) * Obelus Refactor: LAYOUT to LAYOUT_ortho_4x4 - Keymap also now uses #include QMK_KEYBOARD_H - Readability and white space changes - rules.mk now has LAYOUTS = ortho_4x4 - added info.json * naKey Refactor: LAYOUT to LAYOUT_numpad_5x4 - Matrix LAYOUT renamed to LAYOUT_numpad_5x4 - Now supports community layout numpad_5x4 - White space changes * naKey Configurator update Updated order of JSON objects to match new matrix order. --- keyboards/ckeys/nakey/keymaps/default/keymap.c | 35 +++++++++++++------------- 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'keyboards/ckeys/nakey/keymaps/default') diff --git a/keyboards/ckeys/nakey/keymaps/default/keymap.c b/keyboards/ckeys/nakey/keymaps/default/keymap.c index ebbb128bd2..9c3e45b946 100644 --- a/keyboards/ckeys/nakey/keymaps/default/keymap.c +++ b/keyboards/ckeys/nakey/keymaps/default/keymap.c @@ -16,32 +16,31 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( /* Base */ - 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 \ -), + [0] = LAYOUT_numpad_5x4( /* Base */ + 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 \ + ), }; const uint16_t PROGMEM fn_actions[] = { }; -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { // MACRODOWN only works in this function - switch(id) { - case 0: - if (record->event.pressed) { - register_code(KC_RSFT); - } else { - unregister_code(KC_RSFT); - } - break; + switch(id) { + case 0: + if (record->event.pressed) { + register_code(KC_RSFT); + } else { + unregister_code(KC_RSFT); } - return MACRO_NONE; + break; + } + return MACRO_NONE; }; -- cgit v1.2.3