M keyboards/novelkeys/nk20/info.json => keyboards/novelkeys/nk20/info.json +4 -1
@@ 8,8 8,11 @@
"pid": "0x4E4E",
"device_version": "0.0.1"
},
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT"
+ },
"layouts": {
- "LAYOUT_all": {
+ "LAYOUT": {
"layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "h":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "h":2}, {"x":0, "y":5, "w":2}, {"x":2, "y":5}]
}
}
M keyboards/novelkeys/nk20/keymaps/default/keymap.c => keyboards/novelkeys/nk20/keymaps/default/keymap.c +2 -2
@@ 16,7 16,7 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
+[0] = LAYOUT( /* Base */
KC_VOLD, KC_VOLU, KC_MUTE,
MO(1), KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9, KC_PPLS,
@@ 24,7 24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P1, KC_P2, KC_P3, KC_PENT,
KC_P0, KC_PDOT),
-[1] = LAYOUT_all( /* FN */
+[1] = LAYOUT( /* FN */
KC_NLCK, KC_TRNS, KC_TRNS,
KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS,
RGB_TOG, RGB_MOD, RGB_HUD, KC_TRNS,
M keyboards/novelkeys/nk20/keymaps/via/keymap.c => keyboards/novelkeys/nk20/keymaps/via/keymap.c +4 -4
@@ 16,7 16,7 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all( /* Base */
+[0] = LAYOUT( /* Base */
KC_VOLD, KC_VOLU, KC_MUTE,
MO(1), KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9, KC_PPLS,
@@ 24,7 24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_P1, KC_P2, KC_P3, KC_PENT,
KC_P0, KC_PDOT),
-[1] = LAYOUT_all( /* FN */
+[1] = LAYOUT( /* FN */
KC_NLCK, KC_TRNS, KC_TRNS,
KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS,
RGB_TOG, RGB_MOD, RGB_HUD, KC_TRNS,
@@ 32,7 32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS),
-[2] = LAYOUT_all( /* Empty for dynamic keymaps */
+[2] = LAYOUT( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
@@ 40,7 40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS),
-[3] = LAYOUT_all( /* Empty for dynamic keymaps */
+[3] = LAYOUT( /* Empty for dynamic keymaps */
KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
M keyboards/novelkeys/nk20/nk20.h => keyboards/novelkeys/nk20/nk20.h +1 -1
@@ 21,7 21,7 @@
// This a shortcut to help you visually see your layout.
-#define LAYOUT_all( \
+#define LAYOUT( \
K00, K01, K02, \
K10, K11, K12, K13, \
K20, K21, K22, K23, \