g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2022-09-29 16:49:32 +00:00
parent 84ef824236 14e1886405
commit 8349ff1e8b
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyboards/novelkeys/nk20/info.json
View File

@ -8,8 +8,11 @@
"pid": "0x4E4E", "pid": "0x4E4E",
"device_version": "0.0.1" "device_version": "0.0.1"
}, },
"layout_aliases": {
"LAYOUT_all": "LAYOUT"
},
"layouts": { "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}] "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}]
} }
} }

4
keyboards/novelkeys/nk20/keymaps/default/keymap.c
View File

@ -16,7 +16,7 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all( /* Base */ [0] = LAYOUT( /* Base */
KC_VOLD, KC_VOLU, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE,
MO(1), KC_PSLS, KC_PAST, KC_PMNS, MO(1), KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9, KC_PPLS, 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_P1, KC_P2, KC_P3, KC_PENT,
KC_P0, KC_PDOT), KC_P0, KC_PDOT),
[1] = LAYOUT_all( /* FN */ [1] = LAYOUT( /* FN */
KC_NLCK, KC_TRNS, KC_TRNS, KC_NLCK, KC_TRNS, KC_TRNS,
KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS,
RGB_TOG, RGB_MOD, RGB_HUD, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUD, KC_TRNS,

8
keyboards/novelkeys/nk20/keymaps/via/keymap.c
View File

@ -16,7 +16,7 @@
#include QMK_KEYBOARD_H #include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all( /* Base */ [0] = LAYOUT( /* Base */
KC_VOLD, KC_VOLU, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE,
MO(1), KC_PSLS, KC_PAST, KC_PMNS, MO(1), KC_PSLS, KC_PAST, KC_PMNS,
KC_P7, KC_P8, KC_P9, KC_PPLS, 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_P1, KC_P2, KC_P3, KC_PENT,
KC_P0, KC_PDOT), KC_P0, KC_PDOT),
[1] = LAYOUT_all( /* FN */ [1] = LAYOUT( /* FN */
KC_NLCK, KC_TRNS, KC_TRNS, KC_NLCK, KC_TRNS, KC_TRNS,
KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, RGB_SPD, RGB_SPI, KC_TRNS,
RGB_TOG, RGB_MOD, RGB_HUD, 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, RGB_VAD, RGB_VAI, KC_TRNS, KC_TRNS,
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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,

2
keyboards/novelkeys/nk20/nk20.h
View File

@ -21,7 +21,7 @@
// This a shortcut to help you visually see your layout. // This a shortcut to help you visually see your layout.
#define LAYOUT_all( \ #define LAYOUT( \
K00, K01, K02, \ K00, K01, K02, \
K10, K11, K12, K13, \ K10, K11, K12, K13, \
K20, K21, K22, K23, \ K20, K21, K22, K23, \