Skip to content

Commit

Permalink
handwired/numpad20 Refactor and Configurator support (#4589)
Browse files Browse the repository at this point in the history
* handwired/numpad20: refactor

- layout macro no longer auto-prepends keycodes with KC_
  - keymaps for this keyboard will now compile in QMK Configurator
- keymap now uses #include QMK_KEYBOARD_H
- deleted unused fn_actions code block

* handwired/numpad20: Configurator support
  • Loading branch information
noroadsleft authored and mechmerlin committed Dec 12, 2018
1 parent d46d304 commit 8b6cdd1
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 18 deletions.
33 changes: 33 additions & 0 deletions keyboards/handwired/numpad20/info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"keyboard_name": "numpad20 handwired",
"url": "",
"maintainer": "qmk",
"width": 4,
"height": 5,
"layouts": {
"LAYOUT": {
"layout": [
{"label":"K00", "x":0, "y":0},
{"label":"K01", "x":1, "y":0},
{"label":"K02", "x":2, "y":0},
{"label":"K03", "x":3, "y":0},
{"label":"K10", "x":0, "y":1},
{"label":"K11", "x":1, "y":1},
{"label":"K12", "x":2, "y":1},
{"label":"K13", "x":3, "y":1},
{"label":"K20", "x":0, "y":2},
{"label":"K21", "x":1, "y":2},
{"label":"K22", "x":2, "y":2},
{"label":"K23", "x":3, "y":2},
{"label":"K30", "x":0, "y":3},
{"label":"K31", "x":1, "y":3},
{"label":"K32", "x":2, "y":3},
{"label":"K33", "x":3, "y":3},
{"label":"K40", "x":0, "y":4},
{"label":"K41", "x":1, "y":4},
{"label":"K42", "x":2, "y":4},
{"label":"K43", "x":3, "y":4}
]
}
}
}
19 changes: 7 additions & 12 deletions keyboards/handwired/numpad20/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
#include "numpad20.h"

#define KC_ KC_TRNS
#include QMK_KEYBOARD_H

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
LEFT,RGHT, UP ,DOWN, \
P7 , P8 , P9 ,PLUS, \
P4 , P5 , P6 ,MINS, \
P1 , P2 , P3 , ENT, \
P0 ,DOT ,RGHT, TAB \
)
};

const uint16_t PROGMEM fn_actions[] = {
KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, \
KC_P7, KC_P8, KC_P9, KC_PLUS, \
KC_P4, KC_P5, KC_P6, KC_MINS, \
KC_P1, KC_P2, KC_P3, KC_ENT, \
KC_P0, KC_DOT, KC_RGHT, KC_TAB \
)
};
12 changes: 6 additions & 6 deletions keyboards/handwired/numpad20/numpad20.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
K30, K31, K32, K33, \
K40, K41, K42, K43 \
) { \
{ KC_##K00, KC_##K01, KC_##K02, KC_##K03 }, \
{ KC_##K10, KC_##K11, KC_##K12, KC_##K13 }, \
{ KC_##K20, KC_##K21, KC_##K22, KC_##K23 }, \
{ KC_##K30, KC_##K31, KC_##K32, KC_##K33 }, \
{ KC_##K40, KC_##K41, KC_##K42, KC_##K43 } \
{ K00, K01, K02, K03 }, \
{ K10, K11, K12, K13 }, \
{ K20, K21, K22, K23 }, \
{ K30, K31, K32, K33 }, \
{ K40, K41, K42, K43 } \
}

#endif
#endif

0 comments on commit 8b6cdd1

Please sign in to comment.