From b791282c971a57f8c2499b0f54d3e63f0b045186 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 17:49:18 -0500 Subject: [PATCH 01/20] Added Keyboard Noodlepad_Micro --- .../themadnoodle/noodlepad_micro/config.h | 29 +++++++ .../themadnoodle/noodlepad_micro/info.json | 70 +++++++++++++++ .../noodlepad_micro/keymaps/default/keymap.c | 87 +++++++++++++++++++ .../noodlepad_micro/keymaps/default/rules.mk | 4 + .../noodlepad_micro/keymaps/via/keymap.c | 87 +++++++++++++++++++ .../noodlepad_micro/keymaps/via/rules.mk | 5 ++ .../themadnoodle/noodlepad_micro/readme.md | 30 +++++++ .../themadnoodle/noodlepad_micro/rules.mk | 2 + 8 files changed, 314 insertions(+) create mode 100644 keyboards/themadnoodle/noodlepad_micro/config.h create mode 100644 keyboards/themadnoodle/noodlepad_micro/info.json create mode 100644 keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c create mode 100644 keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk create mode 100644 keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c create mode 100644 keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk create mode 100644 keyboards/themadnoodle/noodlepad_micro/readme.md create mode 100644 keyboards/themadnoodle/noodlepad_micro/rules.mk diff --git a/keyboards/themadnoodle/noodlepad_micro/config.h b/keyboards/themadnoodle/noodlepad_micro/config.h new file mode 100644 index 000000000000..8a29c615a0d5 --- /dev/null +++ b/keyboards/themadnoodle/noodlepad_micro/config.h @@ -0,0 +1,29 @@ +// Copyright 2023 The Mad Noodle(@the_mad_noodle) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT + + +/* RGB BackLight */ +#define WS2812_PIO_USE_PIO1 +#define WS2812_DI_PIN GP29 + +/*RGB Defaults*/ +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 +/* See info.json for more RGB settings*/ diff --git a/keyboards/themadnoodle/noodlepad_micro/info.json b/keyboards/themadnoodle/noodlepad_micro/info.json new file mode 100644 index 000000000000..45da68e019eb --- /dev/null +++ b/keyboards/themadnoodle/noodlepad_micro/info.json @@ -0,0 +1,70 @@ +{ + "manufacturer": "The Mad Noodle", + "keyboard_name": "NoodlePad Micro", + "maintainer": "the-mad-noodle", + "url": "https://www.madnoodleprototypes.com/", + "bootloader": "rp2040", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true + }, + "rgblight": { + "hue_steps": 10, + "led_count": 4, + "sleep": true, + "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 + } + }, + "matrix_pins": { + "cols": ["GP6", "GP7", "GP0"], + "rows": ["GP26", "GP27", "GP28"] + }, + "processor": "RP2040", + "usb": { + "device_version": "3.0.0", + "pid": "0x0004", + "vid": "0x6A6C" + }, + "layouts": { + "LAYOUT_ortho_3x3": { + "layout": [ + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2} + ] + } + }, + + "encoder": { + "enabled": true, + "rotary": [ + { "pin_a": "GP2", "pin_b": "GP1", "resolution": 4 } + { "pin_a": "GP3", "pin_b": "GP4", "resolution": 4 } + ] + + } + + +} diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c new file mode 100644 index 000000000000..bf3b482b3acd --- /dev/null +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c @@ -0,0 +1,87 @@ +// Copyright 2023 The Mad Noodle(@the_mad_noodle) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* LAYER 0 + * ,--ENC2-- --ENC1--. + * | << | | >> | + * |-------+-------+-------| + * | STOP | PLAY | MEDIA | + * |-------+-------+-------| + * | CALC | MAIL | PC/FN | + * `-----------------------' + */ + + [0] = LAYOUT_ortho_3x3( + KC_MPRV, KC_TRNS, KC_MNXT, + KC_MSTP, KC_MPLY, KC_MSEL, + LT(2,KC_CALC), KC_MAIL, LT(1, KC_MYCM) + ), + + + /* LAYER 1 + * ,--ENC2-- --ENC1--. + * | MODE+ | | MODE- | + * |-------+-------+-------| + * |Bright-| Tog |Bright+| + * |-------+-------+-------| + * | PLAIN |BREATH | | + * `-----------------------' + */ + + [1] = LAYOUT_ortho_3x3( + RGB_MOD, KC_TRNS, RGB_RMOD, + RGB_VAD, RGB_TOG, RGB_VAI, + RGB_M_P, RGB_M_B, KC_TRNS + ), + + + /* LAYER 2 (ENCODER) + * ,--ENC2-- --ENC1--. + * | | | | + * |-------+-------+-------| + * | | | | + * |-------+-------+-------| + * | | | | + * `-----------------------' + */ + + [2] = LAYOUT_ortho_3x3( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ), + + /* LAYER 3 (ENCODER) + * ,--ENC2-- --ENC1--. + * | | | | + * |-------+-------+-------| + * | | | | + * |-------+-------+-------| + * | | | | + * `-----------------------' + */ + + [3] = LAYOUT_ortho_3x3( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS + ) + +}; + + +/*Encoder Mapping*/ +//-----------------------(ENC1)---------------------------------(ENC2)----------------- +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, + [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, + [3] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_DOWN, KC_UP) }, + +}; +#endif diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk new file mode 100644 index 000000000000..dcbb56cab004 --- /dev/null +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk @@ -0,0 +1,4 @@ +# This file is used to override the default rules.mk file +WS2812_DRIVER = vendor +RGBLIGHT_DRIVER = ws2812 +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c new file mode 100644 index 000000000000..4b1151c742df --- /dev/null +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c @@ -0,0 +1,87 @@ +// Copyright 2023 The Mad Noodle(@the_mad_noodle) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* LAYER 0 + * ,--ENC2-- --ENC1--. + * | << | | >> | + * |-------+-------+-------| + * | STOP | PLAY | MEDIA | + * |-------+-------+-------| + * | CALC | MY PC | TO(3) | + * `-----------------------' + */ + + [0] = LAYOUT_ortho_3x3( + KC_MPRV, KC_TRNS, KC_MNXT, + KC_MSTP, KC_MPLY, KC_MSEL, + KC_CALC, KC_MYCM, TO(3) + ), + + + /* LAYER 1 + * ,--ENC2-- --ENC1--. + * | MODE+ | | MODE- | + * |-------+-------+-------| + * |Bright-| Tog |Bright+| + * |-------+-------+-------| + * | PLAIN |BREATH | TO(0) | + * `-----------------------' + */ + + [1] = LAYOUT_ortho_3x3( + RGB_MOD, KC_TRNS, RGB_RMOD, + RGB_VAD, RGB_TOG, RGB_VAI, + RGB_M_P, RGB_M_B, TO(0) + ), + + + /* LAYER 2 + * ,--ENC2-- --ENC1--. + * | | | | + * |-------+-------+-------| + * | | | | + * |-------+-------+-------| + * | | | TO(0) | + * `-----------------------' + */ + + [2] = LAYOUT_ortho_3x3( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, TO(0) + ), + + /* LAYER 3 + * ,--ENC2-- --ENC1--. + * | | | | + * |-------+-------+-------| + * | TO(1) | | TO(2) | + * |-------+-------+-------| + * | | | TO(0) | + * `-----------------------' + */ + + [3] = LAYOUT_ortho_3x3( + KC_TRNS, KC_TRNS, KC_TRNS, + TO(1), KC_TRNS, TO(2), + KC_TRNS, KC_TRNS, TO(0) + ) + +}; + + +/*Encoder Mapping*/ +//-----------------------(ENC1)---------------------------------(ENC2)----------------- +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, + [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, + [3] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_DOWN, KC_UP) }, + +}; +#endif diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk new file mode 100644 index 000000000000..2cb508f62e7f --- /dev/null +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk @@ -0,0 +1,5 @@ +# This file is used to override the default rules.mk file +WS2812_DRIVER = vendor +RGBLIGHT_DRIVER = ws2812 +ENCODER_MAP_ENABLE = yes +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/themadnoodle/noodlepad_micro/readme.md b/keyboards/themadnoodle/noodlepad_micro/readme.md new file mode 100644 index 000000000000..78645dede867 --- /dev/null +++ b/keyboards/themadnoodle/noodlepad_micro/readme.md @@ -0,0 +1,30 @@ +# NoodlePad [Micro] + +![NoodPad[Mircro]](https://static.wixstatic.com/media/59d0ff_a93e3066685e4273b4c628e702ba981d~mv2.jpg) + +The Noodlepad [Micro] is a 6 key 2 encoder macro keypad designed using RP2040 chipset + +* Keyboard Maintainer: [The Mad Noodle](https://github.com/The-Mad-Noodle) +* Hardware Supported: NoodlePad [Micro] +* Hardware Availability: https://www.madnoodleprototypes.com/shop + +This folder is set as default in the parent rules.mk - it will build firmware compatible with the RP2040 Community Edition. See [here](https://docs.qmk.fm/#/platformdev_rp2040?id=rp2040_ce) for a list. + +Compile example for this keyboard (after setting up your build environment): + + qmk compile -kb themadnoodle/noodlepad/micro -km default + +Flashing example for this keyboard: + + qmk flash -kb themadnoodle/noodlepad/micro -km default + +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 & Flashing + + +**Physical reset button**: + +* Double press the button on the back, center, left of the PCB labeled "R" to enter the bootloader drive mode. + +* If you have a pre-compiled .uf2 file, copy it into bootloader drive (RPI-RP2), board will reset automatically once file is copied sucessfully \ No newline at end of file diff --git a/keyboards/themadnoodle/noodlepad_micro/rules.mk b/keyboards/themadnoodle/noodlepad_micro/rules.mk new file mode 100644 index 000000000000..6968c523355c --- /dev/null +++ b/keyboards/themadnoodle/noodlepad_micro/rules.mk @@ -0,0 +1,2 @@ +# This file intentionally left blank + From aa8507770c5d7f78946c0bcaa20c7f079fd40560 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:46:43 -0500 Subject: [PATCH 02/20] Update keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk Co-authored-by: Joel Challis --- keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk index 2cb508f62e7f..ced38020d873 100644 --- a/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk @@ -1,5 +1,3 @@ -# This file is used to override the default rules.mk file -WS2812_DRIVER = vendor RGBLIGHT_DRIVER = ws2812 ENCODER_MAP_ENABLE = yes VIA_ENABLE = yes \ No newline at end of file From 358c0b2994bb2559df705ed8167cfbac96e79962 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:46:51 -0500 Subject: [PATCH 03/20] Update keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk Co-authored-by: Joel Challis --- .../themadnoodle/noodlepad_micro/keymaps/default/rules.mk | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk index dcbb56cab004..a40474b4d5c7 100644 --- a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/rules.mk @@ -1,4 +1 @@ -# This file is used to override the default rules.mk file -WS2812_DRIVER = vendor -RGBLIGHT_DRIVER = ws2812 ENCODER_MAP_ENABLE = yes \ No newline at end of file From 1dc717ae5541019a50423dc09cb8c7779cb94ba3 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:47:03 -0500 Subject: [PATCH 04/20] Update keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c Co-authored-by: Joel Challis --- .../noodlepad_micro/keymaps/default/keymap.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c index bf3b482b3acd..9cfddc06845e 100644 --- a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c @@ -53,24 +53,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 - ), - - /* LAYER 3 (ENCODER) - * ,--ENC2-- --ENC1--. - * | | | | - * |-------+-------+-------| - * | | | | - * |-------+-------+-------| - * | | | | - * `-----------------------' - */ - - [3] = LAYOUT_ortho_3x3( - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS - ) - + ) }; From 5e7cd77fc026e8ea21c895ba04ee44036e12ed9a Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:47:19 -0500 Subject: [PATCH 05/20] Update keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c Co-authored-by: Joel Challis --- .../themadnoodle/noodlepad_micro/keymaps/default/keymap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c index 9cfddc06845e..d9118c1df30f 100644 --- a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c @@ -63,8 +63,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, - [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, - [3] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT), ENCODER_CCW_CW(KC_DOWN, KC_UP) }, - + [2] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) } }; #endif From 16781a6812d2e37f5348b582254e40a4e2f3b6e4 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:47:34 -0500 Subject: [PATCH 06/20] Update keyboards/themadnoodle/noodlepad_micro/info.json Co-authored-by: Joel Challis --- keyboards/themadnoodle/noodlepad_micro/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/info.json b/keyboards/themadnoodle/noodlepad_micro/info.json index 45da68e019eb..a97b8e440b28 100644 --- a/keyboards/themadnoodle/noodlepad_micro/info.json +++ b/keyboards/themadnoodle/noodlepad_micro/info.json @@ -60,8 +60,8 @@ "encoder": { "enabled": true, "rotary": [ - { "pin_a": "GP2", "pin_b": "GP1", "resolution": 4 } - { "pin_a": "GP3", "pin_b": "GP4", "resolution": 4 } + { "pin_a": "GP2", "pin_b": "GP1" } + { "pin_a": "GP3", "pin_b": "GP4" } ] } From 9ae636d857f220fae1a5f24d4bddad9d883fbe07 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:47:54 -0500 Subject: [PATCH 07/20] Update keyboards/themadnoodle/noodlepad_micro/config.h Co-authored-by: Joel Challis --- .../themadnoodle/noodlepad_micro/config.h | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/config.h b/keyboards/themadnoodle/noodlepad_micro/config.h index 8a29c615a0d5..1dd3a20816b2 100644 --- a/keyboards/themadnoodle/noodlepad_micro/config.h +++ b/keyboards/themadnoodle/noodlepad_micro/config.h @@ -3,27 +3,4 @@ #pragma once -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT - - -/* RGB BackLight */ -#define WS2812_PIO_USE_PIO1 -#define WS2812_DI_PIN GP29 - -/*RGB Defaults*/ #define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 -/* See info.json for more RGB settings*/ From 20d01745239a4ba7b4be36b4fb7bd72905c50cb5 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:52:05 -0500 Subject: [PATCH 08/20] Update keyboards/themadnoodle/noodlepad_micro/info.json Co-authored-by: Joel Challis --- keyboards/themadnoodle/noodlepad_micro/info.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/info.json b/keyboards/themadnoodle/noodlepad_micro/info.json index a97b8e440b28..a76e6cca0be3 100644 --- a/keyboards/themadnoodle/noodlepad_micro/info.json +++ b/keyboards/themadnoodle/noodlepad_micro/info.json @@ -42,10 +42,9 @@ "vid": "0x6A6C" }, "layouts": { - "LAYOUT_ortho_3x3": { + "LAYOUT": { "layout": [ {"matrix": [0, 2], "x": 2, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [1, 2], "x": 2, "y": 1}, {"matrix": [1, 1], "x": 1, "y": 1}, From 3276b8388b5eff7c37a0f325c8a3cb24e6926a6b Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:52:17 -0500 Subject: [PATCH 09/20] Update keyboards/themadnoodle/noodlepad_micro/info.json Co-authored-by: Joel Challis --- keyboards/themadnoodle/noodlepad_micro/info.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/info.json b/keyboards/themadnoodle/noodlepad_micro/info.json index a76e6cca0be3..20804a32aeeb 100644 --- a/keyboards/themadnoodle/noodlepad_micro/info.json +++ b/keyboards/themadnoodle/noodlepad_micro/info.json @@ -55,7 +55,10 @@ ] } }, - + "ws2812": { + "pin": "GP29", + "driver": "vendor" + }, "encoder": { "enabled": true, "rotary": [ From 32ee157db311898912c3548e125ffa7021e13f61 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:52:32 -0500 Subject: [PATCH 10/20] Update keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c Co-authored-by: Joel Challis --- .../noodlepad_micro/keymaps/default/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c index d9118c1df30f..663a668ae849 100644 --- a/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/default/keymap.c @@ -15,8 +15,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------' */ - [0] = LAYOUT_ortho_3x3( - KC_MPRV, KC_TRNS, KC_MNXT, + [0] = LAYOUT( + KC_MPRV, KC_MNXT, KC_MSTP, KC_MPLY, KC_MSEL, LT(2,KC_CALC), KC_MAIL, LT(1, KC_MYCM) ), @@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------' */ - [1] = LAYOUT_ortho_3x3( - RGB_MOD, KC_TRNS, RGB_RMOD, + [1] = LAYOUT( + RGB_MOD, RGB_RMOD, RGB_VAD, RGB_TOG, RGB_VAI, RGB_M_P, RGB_M_B, KC_TRNS ), @@ -49,8 +49,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------' */ - [2] = LAYOUT_ortho_3x3( - KC_TRNS, KC_TRNS, KC_TRNS, + [2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) From 77e33adbcbbd65df2c67287a76f584d98018e8ee Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:53:04 -0500 Subject: [PATCH 11/20] Update keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c Co-authored-by: Joel Challis --- .../noodlepad_micro/keymaps/via/keymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c index 4b1151c742df..d6df824a5089 100644 --- a/keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/keymap.c @@ -15,8 +15,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------' */ - [0] = LAYOUT_ortho_3x3( - KC_MPRV, KC_TRNS, KC_MNXT, + [0] = LAYOUT( + KC_MPRV, KC_MNXT, KC_MSTP, KC_MPLY, KC_MSEL, KC_CALC, KC_MYCM, TO(3) ), @@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------' */ - [1] = LAYOUT_ortho_3x3( - RGB_MOD, KC_TRNS, RGB_RMOD, + [1] = LAYOUT( + RGB_MOD, RGB_RMOD, RGB_VAD, RGB_TOG, RGB_VAI, RGB_M_P, RGB_M_B, TO(0) ), @@ -49,8 +49,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------' */ - [2] = LAYOUT_ortho_3x3( - KC_TRNS, KC_TRNS, KC_TRNS, + [2] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(0) ), @@ -65,8 +65,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * `-----------------------' */ - [3] = LAYOUT_ortho_3x3( - KC_TRNS, KC_TRNS, KC_TRNS, + [3] = LAYOUT( + KC_TRNS, KC_TRNS, TO(1), KC_TRNS, TO(2), KC_TRNS, KC_TRNS, TO(0) ) From c3a86fdcee9a994439c1026a865106c6845c0572 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:56:34 -0500 Subject: [PATCH 12/20] Update keyboards/themadnoodle/noodlepad_micro/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/themadnoodle/noodlepad_micro/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/info.json b/keyboards/themadnoodle/noodlepad_micro/info.json index 20804a32aeeb..c4f648102316 100644 --- a/keyboards/themadnoodle/noodlepad_micro/info.json +++ b/keyboards/themadnoodle/noodlepad_micro/info.json @@ -60,7 +60,6 @@ "driver": "vendor" }, "encoder": { - "enabled": true, "rotary": [ { "pin_a": "GP2", "pin_b": "GP1" } { "pin_a": "GP3", "pin_b": "GP4" } From 351e2e522ef67a9914d5b73c6dff9a62ffb45509 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:56:47 -0500 Subject: [PATCH 13/20] Update keyboards/themadnoodle/noodlepad_micro/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/themadnoodle/noodlepad_micro/info.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/info.json b/keyboards/themadnoodle/noodlepad_micro/info.json index c4f648102316..fe7ab9ea7511 100644 --- a/keyboards/themadnoodle/noodlepad_micro/info.json +++ b/keyboards/themadnoodle/noodlepad_micro/info.json @@ -12,7 +12,8 @@ "extrakey": true, "mousekey": true, "nkro": true, - "rgblight": true + "rgblight": true, + "encoder": true }, "rgblight": { "hue_steps": 10, From 346cafaedd245bfa8b264821a0e2d2814c353e25 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 18:56:57 -0500 Subject: [PATCH 14/20] Update keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk index ced38020d873..6ccd6d91943d 100644 --- a/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk +++ b/keyboards/themadnoodle/noodlepad_micro/keymaps/via/rules.mk @@ -1,3 +1,2 @@ -RGBLIGHT_DRIVER = ws2812 ENCODER_MAP_ENABLE = yes VIA_ENABLE = yes \ No newline at end of file From 3e1766496f3faaf5a62442f0ec8e661930f46c23 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Mon, 18 Dec 2023 20:01:20 -0500 Subject: [PATCH 15/20] Readme image re-hosted --- keyboards/themadnoodle/noodlepad_micro/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/readme.md b/keyboards/themadnoodle/noodlepad_micro/readme.md index 78645dede867..03f2f8d37fb0 100644 --- a/keyboards/themadnoodle/noodlepad_micro/readme.md +++ b/keyboards/themadnoodle/noodlepad_micro/readme.md @@ -1,6 +1,6 @@ # NoodlePad [Micro] -![NoodPad[Mircro]](https://static.wixstatic.com/media/59d0ff_a93e3066685e4273b4c628e702ba981d~mv2.jpg) +![NoodPad[Mircro]](https://imgur.com/a/l1iZjWX) The Noodlepad [Micro] is a 6 key 2 encoder macro keypad designed using RP2040 chipset From 80211f4cd7e13e67900b1434e3e478e5cf58c2dd Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Tue, 19 Dec 2023 03:29:04 -0500 Subject: [PATCH 16/20] Update keyboards/themadnoodle/noodlepad_micro/readme.md Co-authored-by: Sergey Vlasov --- keyboards/themadnoodle/noodlepad_micro/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/readme.md b/keyboards/themadnoodle/noodlepad_micro/readme.md index 03f2f8d37fb0..bf47c03c3f76 100644 --- a/keyboards/themadnoodle/noodlepad_micro/readme.md +++ b/keyboards/themadnoodle/noodlepad_micro/readme.md @@ -1,6 +1,6 @@ # NoodlePad [Micro] -![NoodPad[Mircro]](https://imgur.com/a/l1iZjWX) +![NoodlePad [Micro]](https://i.imgur.com/uRmVt3ah.jpg) The Noodlepad [Micro] is a 6 key 2 encoder macro keypad designed using RP2040 chipset From c9143ec4447881d2d677f5e8ac6cf92e6f797622 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Tue, 19 Dec 2023 03:29:18 -0500 Subject: [PATCH 17/20] Update keyboards/themadnoodle/noodlepad_micro/readme.md Co-authored-by: Sergey Vlasov --- keyboards/themadnoodle/noodlepad_micro/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/readme.md b/keyboards/themadnoodle/noodlepad_micro/readme.md index bf47c03c3f76..808cef806589 100644 --- a/keyboards/themadnoodle/noodlepad_micro/readme.md +++ b/keyboards/themadnoodle/noodlepad_micro/readme.md @@ -12,7 +12,7 @@ This folder is set as default in the parent rules.mk - it will build firmware co Compile example for this keyboard (after setting up your build environment): - qmk compile -kb themadnoodle/noodlepad/micro -km default + qmk compile -kb themadnoodle/noodlepad_micro -km default Flashing example for this keyboard: From 19af5f020ab01d3e711bef553b9fd601433fb511 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Tue, 19 Dec 2023 03:31:01 -0500 Subject: [PATCH 18/20] Update keyboards/themadnoodle/noodlepad_micro/readme.md Co-authored-by: Sergey Vlasov --- keyboards/themadnoodle/noodlepad_micro/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/readme.md b/keyboards/themadnoodle/noodlepad_micro/readme.md index 808cef806589..b3b574f7799f 100644 --- a/keyboards/themadnoodle/noodlepad_micro/readme.md +++ b/keyboards/themadnoodle/noodlepad_micro/readme.md @@ -2,7 +2,7 @@ ![NoodlePad [Micro]](https://i.imgur.com/uRmVt3ah.jpg) -The Noodlepad [Micro] is a 6 key 2 encoder macro keypad designed using RP2040 chipset +The NoodlePad [Micro] is a 6 key 2 encoder macro keypad designed using RP2040 chipset. * Keyboard Maintainer: [The Mad Noodle](https://github.com/The-Mad-Noodle) * Hardware Supported: NoodlePad [Micro] From 2154b4fc0a2e7fef4f68cc2a175136640386c1da Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Tue, 19 Dec 2023 03:31:10 -0500 Subject: [PATCH 19/20] Update keyboards/themadnoodle/noodlepad_micro/readme.md Co-authored-by: Sergey Vlasov --- keyboards/themadnoodle/noodlepad_micro/readme.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/readme.md b/keyboards/themadnoodle/noodlepad_micro/readme.md index b3b574f7799f..7112c5a57fe8 100644 --- a/keyboards/themadnoodle/noodlepad_micro/readme.md +++ b/keyboards/themadnoodle/noodlepad_micro/readme.md @@ -8,8 +8,6 @@ The NoodlePad [Micro] is a 6 key 2 encoder macro keypad designed using RP2040 ch * Hardware Supported: NoodlePad [Micro] * Hardware Availability: https://www.madnoodleprototypes.com/shop -This folder is set as default in the parent rules.mk - it will build firmware compatible with the RP2040 Community Edition. See [here](https://docs.qmk.fm/#/platformdev_rp2040?id=rp2040_ce) for a list. - Compile example for this keyboard (after setting up your build environment): qmk compile -kb themadnoodle/noodlepad_micro -km default From 18fee978fcae06428a5c82dc1d80c5584adfa96b Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Tue, 19 Dec 2023 04:01:50 -0500 Subject: [PATCH 20/20] Update keyboards/themadnoodle/noodlepad_micro/readme.md Co-authored-by: Sergey Vlasov --- keyboards/themadnoodle/noodlepad_micro/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/themadnoodle/noodlepad_micro/readme.md b/keyboards/themadnoodle/noodlepad_micro/readme.md index 7112c5a57fe8..a77c1ad7ba39 100644 --- a/keyboards/themadnoodle/noodlepad_micro/readme.md +++ b/keyboards/themadnoodle/noodlepad_micro/readme.md @@ -14,7 +14,7 @@ Compile example for this keyboard (after setting up your build environment): Flashing example for this keyboard: - qmk flash -kb themadnoodle/noodlepad/micro -km default + qmk flash -kb themadnoodle/noodlepad_micro -km default 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).