aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Young <18669334+noroadsleft@users.noreply.github.com>2022-01-30 10:35:43 -0800
committerGitHub <noreply@github.com>2022-01-30 10:35:43 -0800
commit42ba4e8cae6da1ad0cdc083221449ff19041dc30 (patch)
tree2f01c39a2f667617e96f9d7f4cc7dc16dc028b56
parentaee6ff5c081bce8b4aba75c38ec12d25856abe8e (diff)
downloadqmk_firmware-42ba4e8cae6da1ad0cdc083221449ff19041dc30.tar.gz
qmk_firmware-42ba4e8cae6da1ad0cdc083221449ff19041dc30.zip
Cutie Club Giant Macro Pad: Update QMK Configurator Implementation (#16132)
-rwxr-xr-xkeyboards/cutie_club/giant_macro_pad/giant_macro_pad.h2
-rw-r--r--keyboards/cutie_club/giant_macro_pad/info.json5
-rwxr-xr-xkeyboards/cutie_club/giant_macro_pad/keymaps/default/keymap.c2
-rwxr-xr-xkeyboards/cutie_club/giant_macro_pad/keymaps/via/keymap.c2
4 files changed, 7 insertions, 4 deletions
diff --git a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h b/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h
index 8e0b612f3..478846e3c 100755
--- a/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h
+++ b/keyboards/cutie_club/giant_macro_pad/giant_macro_pad.h
@@ -26,7 +26,7 @@
26 * The second converts the arguments into a two-dimensional array which 26 * The second converts the arguments into a two-dimensional array which
27 * represents the switch matrix. 27 * represents the switch matrix.
28 */ 28 */
29#define LAYOUT_all( \ 29#define LAYOUT_ortho_20x20( \
30 k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, k00_16, k00_17, k00_18, k00_19, \ 30 k00_00, k00_01, k00_02, k00_03, k00_04, k00_05, k00_06, k00_07, k00_08, k00_09, k00_10, k00_11, k00_12, k00_13, k00_14, k00_15, k00_16, k00_17, k00_18, k00_19, \
31 k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, k01_14, k01_15, k01_16, k01_17, k01_18, k01_19, \ 31 k01_00, k01_01, k01_02, k01_03, k01_04, k01_05, k01_06, k01_07, k01_08, k01_09, k01_10, k01_11, k01_12, k01_13, k01_14, k01_15, k01_16, k01_17, k01_18, k01_19, \
32 k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, k02_14, k02_15, k02_16, k02_17, k02_18, k02_19, \ 32 k02_00, k02_01, k02_02, k02_03, k02_04, k02_05, k02_06, k02_07, k02_08, k02_09, k02_10, k02_11, k02_12, k02_13, k02_14, k02_15, k02_16, k02_17, k02_18, k02_19, \
diff --git a/keyboards/cutie_club/giant_macro_pad/info.json b/keyboards/cutie_club/giant_macro_pad/info.json
index 348f3a3f5..f8225fdae 100644
--- a/keyboards/cutie_club/giant_macro_pad/info.json
+++ b/keyboards/cutie_club/giant_macro_pad/info.json
@@ -2,8 +2,11 @@
2 "keyboard_name": "Cupar19 Giant Macro Pad", 2 "keyboard_name": "Cupar19 Giant Macro Pad",
3 "url": "", 3 "url": "",
4 "maintainer": "cutie-club", 4 "maintainer": "cutie-club",
5 "layout_aliases": {
6 "LAYOUT_all": "LAYOUT_ortho_20x20"
7 },
5 "layouts": { 8 "layouts": {
6 "LAYOUT": { 9 "LAYOUT_ortho_20x20": {
7 "layout": [ 10 "layout": [
8 {"label":"k00_00", "x":0, "y":0}, 11 {"label":"k00_00", "x":0, "y":0},
9 {"label":"k00_01", "x":1, "y":0}, 12 {"label":"k00_01", "x":1, "y":0},
diff --git a/keyboards/cutie_club/giant_macro_pad/keymaps/default/keymap.c b/keyboards/cutie_club/giant_macro_pad/keymaps/default/keymap.c
index 2db71e990..422606047 100755
--- a/keyboards/cutie_club/giant_macro_pad/keymaps/default/keymap.c
+++ b/keyboards/cutie_club/giant_macro_pad/keymaps/default/keymap.c
@@ -421,7 +421,7 @@ enum custom_keycodes {
421 421
422const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 422const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
423 /* Base */ 423 /* Base */
424 [0] = LAYOUT_all( 424 [0] = LAYOUT_ortho_20x20(
425 NUM_0, NUM_1, NUM_2, NUM_3, NUM_4, NUM_5, NUM_6, NUM_7, NUM_8, NUM_9, NUM_10, NUM_11, NUM_12, NUM_13, NUM_14, NUM_15, NUM_16, NUM_17, NUM_18, NUM_19, 425 NUM_0, NUM_1, NUM_2, NUM_3, NUM_4, NUM_5, NUM_6, NUM_7, NUM_8, NUM_9, NUM_10, NUM_11, NUM_12, NUM_13, NUM_14, NUM_15, NUM_16, NUM_17, NUM_18, NUM_19,
426 NUM_20, NUM_21, NUM_22, NUM_23, NUM_24, NUM_25, NUM_26, NUM_27, NUM_28, NUM_29, NUM_30, NUM_31, NUM_32, NUM_33, NUM_34, NUM_35, NUM_36, NUM_37, NUM_38, NUM_39, 426 NUM_20, NUM_21, NUM_22, NUM_23, NUM_24, NUM_25, NUM_26, NUM_27, NUM_28, NUM_29, NUM_30, NUM_31, NUM_32, NUM_33, NUM_34, NUM_35, NUM_36, NUM_37, NUM_38, NUM_39,
427 NUM_40, NUM_41, NUM_42, NUM_43, NUM_44, NUM_45, NUM_46, NUM_47, NUM_48, NUM_49, NUM_50, NUM_51, NUM_52, NUM_53, NUM_54, NUM_55, NUM_56, NUM_57, NUM_58, NUM_59, 427 NUM_40, NUM_41, NUM_42, NUM_43, NUM_44, NUM_45, NUM_46, NUM_47, NUM_48, NUM_49, NUM_50, NUM_51, NUM_52, NUM_53, NUM_54, NUM_55, NUM_56, NUM_57, NUM_58, NUM_59,
diff --git a/keyboards/cutie_club/giant_macro_pad/keymaps/via/keymap.c b/keyboards/cutie_club/giant_macro_pad/keymaps/via/keymap.c
index 64b3f2b53..db9a718a9 100755
--- a/keyboards/cutie_club/giant_macro_pad/keymaps/via/keymap.c
+++ b/keyboards/cutie_club/giant_macro_pad/keymaps/via/keymap.c
@@ -18,7 +18,7 @@
18 18
19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 19const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
20 /* Base */ 20 /* Base */
21 [0] = LAYOUT_all( 21 [0] = LAYOUT_ortho_20x20(
22 KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, 22 KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,
23 KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, 23 KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,
24 KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, 24 KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,