From a8ca921c672f1023149f509699e1c5a460dd3736 Mon Sep 17 00:00:00 2001 From: Marco Pelegrini Date: Sat, 23 Nov 2024 12:09:29 -0800 Subject: [PATCH 1/8] Marcopad debut --- keyboards/marcopad/config.h | 5 ++ keyboards/marcopad/keyboard.json | 60 +++++++++++++++++++++ keyboards/marcopad/keymaps/default/keymap.c | 26 +++++++++ keyboards/marcopad/keymaps/default/rules.mk | 3 ++ keyboards/marcopad/readme.md | 27 ++++++++++ 5 files changed, 121 insertions(+) create mode 100644 keyboards/marcopad/config.h create mode 100644 keyboards/marcopad/keyboard.json create mode 100644 keyboards/marcopad/keymaps/default/keymap.c create mode 100644 keyboards/marcopad/keymaps/default/rules.mk create mode 100644 keyboards/marcopad/readme.md diff --git a/keyboards/marcopad/config.h b/keyboards/marcopad/config.h new file mode 100644 index 000000000000..b660986fd6f3 --- /dev/null +++ b/keyboards/marcopad/config.h @@ -0,0 +1,5 @@ +// Copyright (c) 2022 Marco Pelegrini +// SPDX-License-Identifier: GPL-2.0-or-later + +#define WS2812_DRIVER vendor +#define WS2812_DI_PIN GP28 \ No newline at end of file diff --git a/keyboards/marcopad/keyboard.json b/keyboards/marcopad/keyboard.json new file mode 100644 index 000000000000..3171bda0cd7b --- /dev/null +++ b/keyboards/marcopad/keyboard.json @@ -0,0 +1,60 @@ +{ + "manufacturer": "pelegrini.ca", + "keyboard_name": "marcopad", + "maintainer": "Marco Pelegrini", + "development_board": "promicro_rp2040", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": false, + "mousekey": false, + "nkro": false + }, + "matrix_pins": { + "cols": ["GP4", "GP26", "GP27"], + "rows": ["GP15", "GP14", "GP29"] + }, + "url": "https://pelegrini.ca/marcopad", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "backlight": { + "pin": "GP28" + }, + "rgblight": { + "led_count": 9, + "saturation_steps": 8, + "brightness_steps": 8, + "animations": { + "breathing": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "snake": true, + "knight": true, + "christmas": true, + "static_gradient": true, + "rgb_test": true, + "alternating": true, + "twinkle": true + } + }, + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 0, "y": 1 }, + { "matrix": [0, 2], "x": 0, "y": 2 }, + { "matrix": [1, 0], "x": 1, "y": 0 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 1, "y": 2 }, + { "matrix": [2, 0], "x": 2, "y": 0 }, + { "matrix": [2, 1], "x": 2, "y": 1 }, + { "matrix": [2, 2], "x": 2, "y": 2 } + ] + } + } +} diff --git a/keyboards/marcopad/keymaps/default/keymap.c b/keyboards/marcopad/keymaps/default/keymap.c new file mode 100644 index 000000000000..863c3d2303ae --- /dev/null +++ b/keyboards/marcopad/keymaps/default/keymap.c @@ -0,0 +1,26 @@ +// Copyright (c) 2022 Marco Pelegrini +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┐ + * │ 7 │ 8 │ 9 │ + * ├───┼───┼───┤ + * │ 4 │ 5 │ 6 │ + * ├───┼───┼───┤ + * │ 1 │ 2 │ 3 │ + * └───┴───┴───┘ + */ + [0] = LAYOUT( + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3 + ) +}; + +const uint16_t PROGMEM backlight_combo[] = {KC_P7, KC_P8, COMBO_END}; +combo_t key_combos[] = { + COMBO(backlight_combo, UG_NEXT) +}; \ No newline at end of file diff --git a/keyboards/marcopad/keymaps/default/rules.mk b/keyboards/marcopad/keymaps/default/rules.mk new file mode 100644 index 000000000000..97828732936f --- /dev/null +++ b/keyboards/marcopad/keymaps/default/rules.mk @@ -0,0 +1,3 @@ +RGBLIGHT_ENABLE = yes +WS2812_DRIVER = vendor +COMBO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/marcopad/readme.md b/keyboards/marcopad/readme.md new file mode 100644 index 000000000000..96f3060665ea --- /dev/null +++ b/keyboards/marcopad/readme.md @@ -0,0 +1,27 @@ +# Marcopad + +![macropad](imgur.com image replace me!) + +*A compact 3x3 keys macropad built with RP-2040 Zero* + +* Keyboard Maintainer: [Marco Pelegrini](https://pelegrini.ca/marcopad) +* Hardware Supported: [Macropad PCB](https://pelegrini.ca/marcopad/hardware) +* Hardware Availability: [Macropad](https://pelegrini.ca/marcopad) + +Make example for this keyboard (after setting up your build environment): + + make marcopad:default + +Flashing example for this keyboard: + + make marcopad:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key) and plug in the keyboard +* **Physical reset button**: Using 2 paperclips, press and hold the BOOT button, then short press the RESET button on the back of the Marcopad +* **Physical reset button + plug in**: Using a paperclip, press and hold the BOOT button, then plug in the Marcopad \ No newline at end of file From a20661fd8895ee8457cef96a92779898e4efb077 Mon Sep 17 00:00:00 2001 From: Marco Pelegrini Date: Sat, 23 Nov 2024 16:36:14 -0800 Subject: [PATCH 2/8] Applying core review suggestions --- keyboards/marcopad/config.h | 5 ----- keyboards/marcopad/keyboard.json | 8 ++++++-- keyboards/marcopad/keymaps/default/keymap.c | 2 +- keyboards/marcopad/keymaps/default/rules.mk | 3 --- keyboards/marcopad/readme.md | 8 ++++---- 5 files changed, 11 insertions(+), 15 deletions(-) delete mode 100644 keyboards/marcopad/config.h delete mode 100644 keyboards/marcopad/keymaps/default/rules.mk diff --git a/keyboards/marcopad/config.h b/keyboards/marcopad/config.h deleted file mode 100644 index b660986fd6f3..000000000000 --- a/keyboards/marcopad/config.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (c) 2022 Marco Pelegrini -// SPDX-License-Identifier: GPL-2.0-or-later - -#define WS2812_DRIVER vendor -#define WS2812_DI_PIN GP28 \ No newline at end of file diff --git a/keyboards/marcopad/keyboard.json b/keyboards/marcopad/keyboard.json index 3171bda0cd7b..d8fe02f283fd 100644 --- a/keyboards/marcopad/keyboard.json +++ b/keyboards/marcopad/keyboard.json @@ -6,6 +6,8 @@ "diode_direction": "ROW2COL", "features": { "bootmagic": true, + "rgblight": true, + "combo": true, "command": false, "console": false, "extrakey": false, @@ -22,7 +24,8 @@ "pid": "0x0000", "vid": "0xFEED" }, - "backlight": { + "ws2812": { + "driver": "vendor", "pin": "GP28" }, "rgblight": { @@ -42,8 +45,9 @@ "twinkle": true } }, + "community_layouts": ["ortho_3x3"], "layouts": { - "LAYOUT": { + "LAYOUT_ortho_3x3": { "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 0, "y": 1 }, diff --git a/keyboards/marcopad/keymaps/default/keymap.c b/keyboards/marcopad/keymaps/default/keymap.c index 863c3d2303ae..f3c0abf18f15 100644 --- a/keyboards/marcopad/keymaps/default/keymap.c +++ b/keyboards/marcopad/keymaps/default/keymap.c @@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ 1 │ 2 │ 3 │ * └───┴───┴───┘ */ - [0] = LAYOUT( + [0] = LAYOUT_ortho_3x3( KC_P7, KC_P8, KC_P9, KC_P4, KC_P5, KC_P6, KC_P1, KC_P2, KC_P3 diff --git a/keyboards/marcopad/keymaps/default/rules.mk b/keyboards/marcopad/keymaps/default/rules.mk deleted file mode 100644 index 97828732936f..000000000000 --- a/keyboards/marcopad/keymaps/default/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -RGBLIGHT_ENABLE = yes -WS2812_DRIVER = vendor -COMBO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/marcopad/readme.md b/keyboards/marcopad/readme.md index 96f3060665ea..ec3802e498f8 100644 --- a/keyboards/marcopad/readme.md +++ b/keyboards/marcopad/readme.md @@ -1,12 +1,12 @@ # Marcopad -![macropad](imgur.com image replace me!) +![marcopad](https://pelegrini.ca/assets/img/marcopad/hardware/macropad.png) *A compact 3x3 keys macropad built with RP-2040 Zero* -* Keyboard Maintainer: [Marco Pelegrini](https://pelegrini.ca/marcopad) -* Hardware Supported: [Macropad PCB](https://pelegrini.ca/marcopad/hardware) -* Hardware Availability: [Macropad](https://pelegrini.ca/marcopad) +* Keyboard Maintainer: [pelegrini.ca](https://pelegrini.ca/marcopad) +* Hardware Supported: [Marcopad](https://pelegrini.ca/marcopad) +* Hardware Availability: [Marcopad](https://pelegrini.ca/marcopad) Make example for this keyboard (after setting up your build environment): From 72dda1482f7a85d91c4bde3d5df21ceba98d9dfb Mon Sep 17 00:00:00 2001 From: Marco Pelegrini Date: Sat, 23 Nov 2024 17:08:52 -0800 Subject: [PATCH 3/8] Optional layout with backlit --- keyboards/marcopad/keyboard.json | 8 +------ keyboards/marcopad/keymaps/backlit/keymap.c | 26 +++++++++++++++++++++ keyboards/marcopad/keymaps/backlit/rules.mk | 5 ++++ keyboards/marcopad/keymaps/default/keymap.c | 5 ---- 4 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 keyboards/marcopad/keymaps/backlit/keymap.c create mode 100644 keyboards/marcopad/keymaps/backlit/rules.mk diff --git a/keyboards/marcopad/keyboard.json b/keyboards/marcopad/keyboard.json index d8fe02f283fd..8f70ffd42fde 100644 --- a/keyboards/marcopad/keyboard.json +++ b/keyboards/marcopad/keyboard.json @@ -6,13 +6,7 @@ "diode_direction": "ROW2COL", "features": { "bootmagic": true, - "rgblight": true, - "combo": true, - "command": false, - "console": false, - "extrakey": false, - "mousekey": false, - "nkro": false + "rgblight": false }, "matrix_pins": { "cols": ["GP4", "GP26", "GP27"], diff --git a/keyboards/marcopad/keymaps/backlit/keymap.c b/keyboards/marcopad/keymaps/backlit/keymap.c new file mode 100644 index 000000000000..f3c0abf18f15 --- /dev/null +++ b/keyboards/marcopad/keymaps/backlit/keymap.c @@ -0,0 +1,26 @@ +// Copyright (c) 2022 Marco Pelegrini +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┐ + * │ 7 │ 8 │ 9 │ + * ├───┼───┼───┤ + * │ 4 │ 5 │ 6 │ + * ├───┼───┼───┤ + * │ 1 │ 2 │ 3 │ + * └───┴───┴───┘ + */ + [0] = LAYOUT_ortho_3x3( + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3 + ) +}; + +const uint16_t PROGMEM backlight_combo[] = {KC_P7, KC_P8, COMBO_END}; +combo_t key_combos[] = { + COMBO(backlight_combo, UG_NEXT) +}; \ No newline at end of file diff --git a/keyboards/marcopad/keymaps/backlit/rules.mk b/keyboards/marcopad/keymaps/backlit/rules.mk new file mode 100644 index 000000000000..8d55028b7fc5 --- /dev/null +++ b/keyboards/marcopad/keymaps/backlit/rules.mk @@ -0,0 +1,5 @@ +# Copyright (c) 2022 Marco Pelegrini +# SPDX-License-Identifier: GPL-2.0-or-later + +RGBLIGHT_ENABLE = yes +COMBO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/marcopad/keymaps/default/keymap.c b/keyboards/marcopad/keymaps/default/keymap.c index f3c0abf18f15..bfbc091eaf2b 100644 --- a/keyboards/marcopad/keymaps/default/keymap.c +++ b/keyboards/marcopad/keymaps/default/keymap.c @@ -18,9 +18,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P4, KC_P5, KC_P6, KC_P1, KC_P2, KC_P3 ) -}; - -const uint16_t PROGMEM backlight_combo[] = {KC_P7, KC_P8, COMBO_END}; -combo_t key_combos[] = { - COMBO(backlight_combo, UG_NEXT) }; \ No newline at end of file From 73fea49610b7cda8cde067d61ddc6e9d2c602ff1 Mon Sep 17 00:00:00 2001 From: Marco Pelegrini Date: Sun, 24 Nov 2024 08:19:26 -0800 Subject: [PATCH 4/8] Line feeds and replacing dev board configs --- keyboards/marcopad/keyboard.json | 8 ++++---- keyboards/marcopad/keymaps/backlit/keymap.c | 2 +- keyboards/marcopad/keymaps/backlit/rules.mk | 2 +- keyboards/marcopad/keymaps/default/keymap.c | 2 +- keyboards/marcopad/readme.md | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/marcopad/keyboard.json b/keyboards/marcopad/keyboard.json index 8f70ffd42fde..d62f791feb57 100644 --- a/keyboards/marcopad/keyboard.json +++ b/keyboards/marcopad/keyboard.json @@ -1,12 +1,12 @@ { "manufacturer": "pelegrini.ca", - "keyboard_name": "marcopad", + "keyboard_name": "Marcopad", "maintainer": "Marco Pelegrini", - "development_board": "promicro_rp2040", + "bootloader": "rp2040", + "processor": "RP2040", "diode_direction": "ROW2COL", "features": { - "bootmagic": true, - "rgblight": false + "bootmagic": true }, "matrix_pins": { "cols": ["GP4", "GP26", "GP27"], diff --git a/keyboards/marcopad/keymaps/backlit/keymap.c b/keyboards/marcopad/keymaps/backlit/keymap.c index f3c0abf18f15..9d152bcc092d 100644 --- a/keyboards/marcopad/keymaps/backlit/keymap.c +++ b/keyboards/marcopad/keymaps/backlit/keymap.c @@ -23,4 +23,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM backlight_combo[] = {KC_P7, KC_P8, COMBO_END}; combo_t key_combos[] = { COMBO(backlight_combo, UG_NEXT) -}; \ No newline at end of file +}; diff --git a/keyboards/marcopad/keymaps/backlit/rules.mk b/keyboards/marcopad/keymaps/backlit/rules.mk index 8d55028b7fc5..556d89082a70 100644 --- a/keyboards/marcopad/keymaps/backlit/rules.mk +++ b/keyboards/marcopad/keymaps/backlit/rules.mk @@ -2,4 +2,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later RGBLIGHT_ENABLE = yes -COMBO_ENABLE = yes \ No newline at end of file +COMBO_ENABLE = yes diff --git a/keyboards/marcopad/keymaps/default/keymap.c b/keyboards/marcopad/keymaps/default/keymap.c index bfbc091eaf2b..b892c0e80c81 100644 --- a/keyboards/marcopad/keymaps/default/keymap.c +++ b/keyboards/marcopad/keymaps/default/keymap.c @@ -18,4 +18,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P4, KC_P5, KC_P6, KC_P1, KC_P2, KC_P3 ) -}; \ No newline at end of file +}; diff --git a/keyboards/marcopad/readme.md b/keyboards/marcopad/readme.md index ec3802e498f8..996ee0b41537 100644 --- a/keyboards/marcopad/readme.md +++ b/keyboards/marcopad/readme.md @@ -24,4 +24,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key) and plug in the keyboard * **Physical reset button**: Using 2 paperclips, press and hold the BOOT button, then short press the RESET button on the back of the Marcopad -* **Physical reset button + plug in**: Using a paperclip, press and hold the BOOT button, then plug in the Marcopad \ No newline at end of file +* **Physical reset button + plug in**: Using a paperclip, press and hold the BOOT button, then plug in the Marcopad From 2e2b878ef16b39672d4dafa2d2f14ec8ddb455a5 Mon Sep 17 00:00:00 2001 From: Marco Pelegrini Date: Sun, 24 Nov 2024 08:44:02 -0800 Subject: [PATCH 5/8] Function to toggle backlight --- keyboards/marcopad/keymaps/backlit/keymap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/marcopad/keymaps/backlit/keymap.c b/keyboards/marcopad/keymaps/backlit/keymap.c index 9d152bcc092d..7f8d6e7b9696 100644 --- a/keyboards/marcopad/keymaps/backlit/keymap.c +++ b/keyboards/marcopad/keymaps/backlit/keymap.c @@ -20,7 +20,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -const uint16_t PROGMEM backlight_combo[] = {KC_P7, KC_P8, COMBO_END}; +const uint16_t PROGMEM backlight_next[] = {KC_P7, KC_P8, COMBO_END}; +const uint16_t PROGMEM backlight_toggle[] = {KC_P8, KC_P9, COMBO_END}; combo_t key_combos[] = { - COMBO(backlight_combo, UG_NEXT) + COMBO(backlight_next, UG_NEXT), + COMBO(backlight_toggle, UG_TOGG) }; From a5fccd220fc2e192e3d53b2024946cdd2848644b Mon Sep 17 00:00:00 2001 From: Marco Pelegrini Date: Sun, 24 Nov 2024 20:22:41 -0800 Subject: [PATCH 6/8] Move to RGB Matrix --- keyboards/marcopad/keyboard.json | 56 ++++++++++++++------- keyboards/marcopad/keymaps/backlit/keymap.c | 22 ++++++-- keyboards/marcopad/keymaps/backlit/rules.mk | 1 - 3 files changed, 58 insertions(+), 21 deletions(-) diff --git a/keyboards/marcopad/keyboard.json b/keyboards/marcopad/keyboard.json index d62f791feb57..c632add36a85 100644 --- a/keyboards/marcopad/keyboard.json +++ b/keyboards/marcopad/keyboard.json @@ -1,18 +1,19 @@ { - "manufacturer": "pelegrini.ca", "keyboard_name": "Marcopad", + "manufacturer": "pelegrini.ca", + "url": "https://pelegrini.ca/marcopad", "maintainer": "Marco Pelegrini", "bootloader": "rp2040", "processor": "RP2040", "diode_direction": "ROW2COL", "features": { - "bootmagic": true + "bootmagic": true, + "rgb_matrix": true }, "matrix_pins": { "cols": ["GP4", "GP26", "GP27"], "rows": ["GP15", "GP14", "GP29"] }, - "url": "https://pelegrini.ca/marcopad", "usb": { "device_version": "1.0.0", "pid": "0x0000", @@ -22,22 +23,43 @@ "driver": "vendor", "pin": "GP28" }, - "rgblight": { - "led_count": 9, - "saturation_steps": 8, - "brightness_steps": 8, + "rgb_matrix": { + "driver": "ws2812", "animations": { "breathing": true, - "rainbow_mood": true, - "rainbow_swirl": true, - "snake": true, - "knight": true, - "christmas": true, - "static_gradient": true, - "rgb_test": true, - "alternating": true, - "twinkle": true - } + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "dual_beacon": true, + "rainbow_beacon": true, + "pixel_rain": true, + "typing_heatmap": true, + "solid_reactive": true, + "solid_reactive_multiwide": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "splash": true + }, + "layout": [ + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 0, "y": 32 }, + { "flags": 4, "matrix": [0, 2], "x": 0, "y": 64 }, + { "flags": 4, "matrix": [1, 0], "x": 112, "y": 0 }, + { "flags": 4, "matrix": [1, 1], "x": 112, "y": 32 }, + { "flags": 4, "matrix": [1, 2], "x": 112, "y": 64 }, + { "flags": 4, "matrix": [2, 0], "x": 224, "y": 0 }, + { "flags": 4, "matrix": [2, 1], "x": 224, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 224, "y": 64 } + ], + "default": { + "animation": "splash", + "hue": 132, + "sat": 102, + "val": 255, + "speed": 80 + }, + "sleep": true }, "community_layouts": ["ortho_3x3"], "layouts": { diff --git a/keyboards/marcopad/keymaps/backlit/keymap.c b/keyboards/marcopad/keymaps/backlit/keymap.c index 7f8d6e7b9696..d70df8e6f75b 100644 --- a/keyboards/marcopad/keymaps/backlit/keymap.c +++ b/keyboards/marcopad/keymaps/backlit/keymap.c @@ -21,8 +21,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; const uint16_t PROGMEM backlight_next[] = {KC_P7, KC_P8, COMBO_END}; -const uint16_t PROGMEM backlight_toggle[] = {KC_P8, KC_P9, COMBO_END}; +const uint16_t PROGMEM backlight_toggle[] = {KC_P7, KC_P9, COMBO_END}; +const uint16_t PROGMEM hue_up[] = {KC_P7, KC_P4, COMBO_END}; +const uint16_t PROGMEM hue_down[] = {KC_P7, KC_P1, COMBO_END}; +const uint16_t PROGMEM sat_up[] = {KC_P7, KC_P5, COMBO_END}; +const uint16_t PROGMEM sat_down[] = {KC_P7, KC_P2, COMBO_END}; +const uint16_t PROGMEM value_up[] = {KC_P7, KC_P6, COMBO_END}; +const uint16_t PROGMEM value_down[] = {KC_P7, KC_P3, COMBO_END}; +const uint16_t PROGMEM speed_up[] = {KC_P8, KC_P4, COMBO_END}; +const uint16_t PROGMEM speed_down[] = {KC_P8, KC_P1, COMBO_END}; combo_t key_combos[] = { - COMBO(backlight_next, UG_NEXT), - COMBO(backlight_toggle, UG_TOGG) + COMBO(backlight_next, RGB_MODE_FORWARD), + COMBO(backlight_toggle, RGB_TOG), + COMBO(hue_up, RGB_HUI), + COMBO(hue_down, RGB_HUD), + COMBO(sat_up, RGB_SAI), + COMBO(sat_down, RGB_SAD), + COMBO(value_up, RGB_VAI), + COMBO(value_down, RGB_VAD), + COMBO(speed_up, RGB_SPI), + COMBO(speed_down, RGB_SPD) }; diff --git a/keyboards/marcopad/keymaps/backlit/rules.mk b/keyboards/marcopad/keymaps/backlit/rules.mk index 556d89082a70..c358f5460504 100644 --- a/keyboards/marcopad/keymaps/backlit/rules.mk +++ b/keyboards/marcopad/keymaps/backlit/rules.mk @@ -1,5 +1,4 @@ # Copyright (c) 2022 Marco Pelegrini # SPDX-License-Identifier: GPL-2.0-or-later -RGBLIGHT_ENABLE = yes COMBO_ENABLE = yes From c9fec50d7611abcbe834b6dcb3af01c36ca2eeab Mon Sep 17 00:00:00 2001 From: Marco Pelegrini Date: Wed, 27 Nov 2024 10:00:07 -0800 Subject: [PATCH 7/8] Fixing capitalization --- keyboards/marcopad/keyboard.json | 2 +- keyboards/marcopad/readme.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/marcopad/keyboard.json b/keyboards/marcopad/keyboard.json index c632add36a85..1b9be5514ca4 100644 --- a/keyboards/marcopad/keyboard.json +++ b/keyboards/marcopad/keyboard.json @@ -1,5 +1,5 @@ { - "keyboard_name": "Marcopad", + "keyboard_name": "MarcoPad", "manufacturer": "pelegrini.ca", "url": "https://pelegrini.ca/marcopad", "maintainer": "Marco Pelegrini", diff --git a/keyboards/marcopad/readme.md b/keyboards/marcopad/readme.md index 996ee0b41537..15c87265c53d 100644 --- a/keyboards/marcopad/readme.md +++ b/keyboards/marcopad/readme.md @@ -1,12 +1,12 @@ -# Marcopad +# MarcoPad ![marcopad](https://pelegrini.ca/assets/img/marcopad/hardware/macropad.png) *A compact 3x3 keys macropad built with RP-2040 Zero* * Keyboard Maintainer: [pelegrini.ca](https://pelegrini.ca/marcopad) -* Hardware Supported: [Marcopad](https://pelegrini.ca/marcopad) -* Hardware Availability: [Marcopad](https://pelegrini.ca/marcopad) +* Hardware Supported: [MarcoPad](https://pelegrini.ca/marcopad) +* Hardware Availability: [MarcoPad](https://pelegrini.ca/marcopad) Make example for this keyboard (after setting up your build environment): @@ -23,5 +23,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (top left key) and plug in the keyboard -* **Physical reset button**: Using 2 paperclips, press and hold the BOOT button, then short press the RESET button on the back of the Marcopad -* **Physical reset button + plug in**: Using a paperclip, press and hold the BOOT button, then plug in the Marcopad +* **Physical reset button**: Using 2 paperclips, press and hold the BOOT button, then short press the RESET button on the back of the MarcoPad +* **Physical reset button + plug in**: Using a paperclip, press and hold the BOOT button, then plug in the MarcoPad From bb805ff9b07932fc84d6c2c357e1f885c8e9788b Mon Sep 17 00:00:00 2001 From: Marco Pelegrini Date: Mon, 2 Dec 2024 11:19:07 -0800 Subject: [PATCH 8/8] Review comments --- keyboards/marcopad/keyboard.json | 156 +++++++++++++++---------------- keyboards/marcopad/readme.md | 2 +- 2 files changed, 79 insertions(+), 79 deletions(-) diff --git a/keyboards/marcopad/keyboard.json b/keyboards/marcopad/keyboard.json index 1b9be5514ca4..c0a8ca37c049 100644 --- a/keyboards/marcopad/keyboard.json +++ b/keyboards/marcopad/keyboard.json @@ -1,80 +1,80 @@ { - "keyboard_name": "MarcoPad", - "manufacturer": "pelegrini.ca", - "url": "https://pelegrini.ca/marcopad", - "maintainer": "Marco Pelegrini", - "bootloader": "rp2040", - "processor": "RP2040", - "diode_direction": "ROW2COL", - "features": { - "bootmagic": true, - "rgb_matrix": true - }, - "matrix_pins": { - "cols": ["GP4", "GP26", "GP27"], - "rows": ["GP15", "GP14", "GP29"] - }, - "usb": { - "device_version": "1.0.0", - "pid": "0x0000", - "vid": "0xFEED" - }, - "ws2812": { - "driver": "vendor", - "pin": "GP28" - }, - "rgb_matrix": { - "driver": "ws2812", - "animations": { - "breathing": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "dual_beacon": true, - "rainbow_beacon": true, - "pixel_rain": true, - "typing_heatmap": true, - "solid_reactive": true, - "solid_reactive_multiwide": true, - "solid_reactive_multicross": true, - "solid_reactive_multinexus": true, - "splash": true - }, - "layout": [ - { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, - { "flags": 4, "matrix": [0, 1], "x": 0, "y": 32 }, - { "flags": 4, "matrix": [0, 2], "x": 0, "y": 64 }, - { "flags": 4, "matrix": [1, 0], "x": 112, "y": 0 }, - { "flags": 4, "matrix": [1, 1], "x": 112, "y": 32 }, - { "flags": 4, "matrix": [1, 2], "x": 112, "y": 64 }, - { "flags": 4, "matrix": [2, 0], "x": 224, "y": 0 }, - { "flags": 4, "matrix": [2, 1], "x": 224, "y": 32 }, - { "flags": 4, "matrix": [2, 2], "x": 224, "y": 64 } - ], - "default": { - "animation": "splash", - "hue": 132, - "sat": 102, - "val": 255, - "speed": 80 - }, - "sleep": true - }, - "community_layouts": ["ortho_3x3"], - "layouts": { - "LAYOUT_ortho_3x3": { - "layout": [ - { "matrix": [0, 0], "x": 0, "y": 0 }, - { "matrix": [0, 1], "x": 0, "y": 1 }, - { "matrix": [0, 2], "x": 0, "y": 2 }, - { "matrix": [1, 0], "x": 1, "y": 0 }, - { "matrix": [1, 1], "x": 1, "y": 1 }, - { "matrix": [1, 2], "x": 1, "y": 2 }, - { "matrix": [2, 0], "x": 2, "y": 0 }, - { "matrix": [2, 1], "x": 2, "y": 1 }, - { "matrix": [2, 2], "x": 2, "y": 2 } - ] - } - } + "manufacturer": "pelegrini.ca", + "keyboard_name": "MarcoPad", + "maintainer": "Marco Pelegrini", + "bootloader": "rp2040", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP4", "GP26", "GP27"], + "rows": ["GP15", "GP14", "GP29"] + }, + "processor": "RP2040", + "rgb_matrix": { + "animations": { + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "dual_beacon": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "solid_reactive": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "splash": true, + "typing_heatmap": true + }, + "default": { + "animation": "splash", + "hue": 132, + "sat": 102, + "speed": 80, + "val": 255 + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, + {"matrix": [0, 1], "x": 0, "y": 32, "flags": 4}, + {"matrix": [0, 2], "x": 0, "y": 64, "flags": 4}, + {"matrix": [1, 0], "x": 112, "y": 0, "flags": 4}, + {"matrix": [1, 1], "x": 112, "y": 32, "flags": 4}, + {"matrix": [1, 2], "x": 112, "y": 64, "flags": 4}, + {"matrix": [2, 0], "x": 224, "y": 0, "flags": 4}, + {"matrix": [2, 1], "x": 224, "y": 32, "flags": 4}, + {"matrix": [2, 2], "x": 224, "y": 64, "flags": 4} + ], + "sleep": true + }, + "url": "https://pelegrini.ca/marcopad", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0xFEED" + }, + "ws2812": { + "driver": "vendor", + "pin": "GP28" + }, + "community_layouts": ["ortho_3x3"], + "layouts": { + "LAYOUT_ortho_3x3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 0, "y": 1}, + {"matrix": [0, 2], "x": 0, "y": 2}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 1, "y": 2}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 2} + ] + } + } } diff --git a/keyboards/marcopad/readme.md b/keyboards/marcopad/readme.md index 15c87265c53d..6bc1733f30cc 100644 --- a/keyboards/marcopad/readme.md +++ b/keyboards/marcopad/readme.md @@ -1,6 +1,6 @@ # MarcoPad -![marcopad](https://pelegrini.ca/assets/img/marcopad/hardware/macropad.png) +![marcopad](https://i.imgur.com/AnC9SeW.png) *A compact 3x3 keys macropad built with RP-2040 Zero*