summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authornoroadsleft <18669334+noroadsleft@users.noreply.github.com>2018-12-11 20:49:44 -0800
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-12-11 20:49:44 -0800
commit8b6cdd17886db9847ff91be9c10a1788a7c74a6a (patch)
tree0834501dc68cbe93e0cff504dc89b9ca4524b812 /keyboards
parentd46d3043957b75369923cb0202c632fa1d8f0311 (diff)
handwired/numpad20 Refactor and Configurator support (#4589)
* 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
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/handwired/numpad20/info.json33
-rw-r--r--keyboards/handwired/numpad20/keymaps/default/keymap.c19
-rw-r--r--keyboards/handwired/numpad20/numpad20.h12
3 files changed, 46 insertions, 18 deletions
diff --git a/keyboards/handwired/numpad20/info.json b/keyboards/handwired/numpad20/info.json
new file mode 100644
index 0000000000..691acb3150
--- /dev/null
+++ b/keyboards/handwired/numpad20/info.json
@@ -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}
+ ]
+ }
+ }
+}
diff --git a/keyboards/handwired/numpad20/keymaps/default/keymap.c b/keyboards/handwired/numpad20/keymaps/default/keymap.c
index 65799bfee4..414b104afd 100644
--- a/keyboards/handwired/numpad20/keymaps/default/keymap.c
+++ b/keyboards/handwired/numpad20/keymaps/default/keymap.c
@@ -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 \
+ )
};
diff --git a/keyboards/handwired/numpad20/numpad20.h b/keyboards/handwired/numpad20/numpad20.h
index a2aa8d16ba..c15aa9ac70 100644
--- a/keyboards/handwired/numpad20/numpad20.h
+++ b/keyboards/handwired/numpad20/numpad20.h
@@ -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 \ No newline at end of file
+#endif