From 7e47446695739792cf9c45b267bb276e05709840 Mon Sep 17 00:00:00 2001 From: Jesse Leventhal <45154268+jessel92@users.noreply.github.com> Date: Sat, 23 Dec 2023 18:45:33 -0500 Subject: [PATCH] [Keyboard] Noodlepad Additions and Updates (#22701) Co-authored-by: jack <0x6a73@protonmail.com> Co-authored-by: Ryan --- keyboards/themadnoodle/noodlepad/config.h | 6 + keyboards/themadnoodle/noodlepad/info.json | 107 ++++++++---------- .../noodlepad/keymaps/default/keymap.c | 93 +++++++-------- .../noodlepad/keymaps/default/rules.mk | 1 + .../noodlepad/keymaps/via/keymap.c | 85 ++++++++++++++ .../noodlepad/keymaps/via/rules.mk | 2 + keyboards/themadnoodle/noodlepad/readme.md | 17 --- keyboards/themadnoodle/noodlepad/rules.mk | 17 +-- keyboards/themadnoodle/noodlepad/v1/info.json | 25 ++++ keyboards/themadnoodle/noodlepad/v1/readme.md | 27 +++++ keyboards/themadnoodle/noodlepad/v1/rules.mk | 1 + keyboards/themadnoodle/noodlepad/v2/info.json | 24 ++++ keyboards/themadnoodle/noodlepad/v2/readme.md | 27 +++++ keyboards/themadnoodle/noodlepad/v2/rules.mk | 1 + 14 files changed, 299 insertions(+), 134 deletions(-) create mode 100644 keyboards/themadnoodle/noodlepad/config.h create mode 100644 keyboards/themadnoodle/noodlepad/keymaps/default/rules.mk create mode 100644 keyboards/themadnoodle/noodlepad/keymaps/via/keymap.c create mode 100644 keyboards/themadnoodle/noodlepad/keymaps/via/rules.mk delete mode 100644 keyboards/themadnoodle/noodlepad/readme.md create mode 100644 keyboards/themadnoodle/noodlepad/v1/info.json create mode 100644 keyboards/themadnoodle/noodlepad/v1/readme.md create mode 100644 keyboards/themadnoodle/noodlepad/v1/rules.mk create mode 100644 keyboards/themadnoodle/noodlepad/v2/info.json create mode 100644 keyboards/themadnoodle/noodlepad/v2/readme.md create mode 100644 keyboards/themadnoodle/noodlepad/v2/rules.mk diff --git a/keyboards/themadnoodle/noodlepad/config.h b/keyboards/themadnoodle/noodlepad/config.h new file mode 100644 index 0000000000..d51dabf53d --- /dev/null +++ b/keyboards/themadnoodle/noodlepad/config.h @@ -0,0 +1,6 @@ +// Copyright 2023 Jesse Leventhal (@The=Mad-Noodle) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_SWIRL + 5 \ No newline at end of file diff --git a/keyboards/themadnoodle/noodlepad/info.json b/keyboards/themadnoodle/noodlepad/info.json index 5f21cbbc75..8ad698df38 100644 --- a/keyboards/themadnoodle/noodlepad/info.json +++ b/keyboards/themadnoodle/noodlepad/info.json @@ -1,59 +1,52 @@ { - "keyboard_name": "Noodle Pad v1", - "manufacturer": "The Mad Noodle", - "url": "instagram.com/the_mad_noodle", - "maintainer": "The-Mad-Noodle", - "usb": { - "vid": "0xFEED", - "pid": "0x1701", - "device_version": "0.0.1" - }, - "matrix_pins": { - "cols": ["B4", "B5", "B6"], - "rows": ["D4", "D6", "D7"] - }, - "diode_direction": "ROW2COL", - "encoder": { - "rotary": [ - {"pin_a": "D0", "pin_b": "D1"} - ] - }, - "rgblight": { - "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 - } - }, - "ws2812": { - "pin": "B7" - }, - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT_ortho_3x3": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, + "manufacturer": "The Mad Noodle", + "keyboard_name": "NoodlePad", + "maintainer": "The-Mad-Noodle", + "url": "https://www.madnoodleprototypes.com/", + "bootloader": "atmel-dfu", + "processor": "atmega32u4", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgblight": true, + "encoder": 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 + } + }, + "layouts": { + "LAYOUT_ortho_3x3": { + "layout": [ + {"x":0, "y":0, "matrix": [0,0]}, + {"label":"Encoder", "x":1, "y":0, "matrix": [0,1]}, + {"x":2, "y":0, "matrix": [0,2]}, + {"x":0, "y":1, "matrix": [1,0]}, + {"x":1, "y":1, "matrix": [1,1]}, + {"x":2, "y":1, "matrix": [1,2]}, + {"x":0, "y":2, "matrix": [2,0]}, + {"x":1, "y":2, "matrix": [2,1]}, + {"x":2, "y":2, "matrix": [2,2]} + ] + } + }, - {"matrix": [1, 0], "x": 0, "y": 1}, - {"matrix": [1, 1], "x": 1, "y": 1}, - {"matrix": [1, 2], "x": 2, "y": 1}, - - {"matrix": [2, 0], "x": 0, "y": 2}, - {"matrix": [2, 1], "x": 1, "y": 2}, - {"matrix": [2, 2], "x": 2, "y": 2} - ] - } - } -} +} \ No newline at end of file diff --git a/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c b/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c index 8fc7e2a27b..73294a41ab 100644 --- a/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c +++ b/keyboards/themadnoodle/noodlepad/keymaps/default/keymap.c @@ -1,10 +1,13 @@ +// 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 - * ,-----------------------. - * | << | MUTE | >> | ENCODER - PRESS (MUTE) / KNOB (VOLUME CONTROL) + * ,-------|ENCODER|-------. + * | << | MUTE | >> | * |-------+-------+-------| * | STOP | PLAY | MEDIA | * |-------+-------+-------| @@ -13,72 +16,70 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [0] = LAYOUT_ortho_3x3( - KC_MPRV, LT(2, KC_MUTE), KC_MNXT, + KC_MPRV, LT(2, KC_MUTE), KC_MNXT, KC_MSTP, KC_MPLY, KC_MSEL, KC_CALC, KC_MAIL, LT(1, KC_MYCM) ), /* LAYER 1 - * ,-----------------------. - * | MODE+ |RGB TOG| MODE- | ENCODER - PRESS (NA) / KNOB (Hue Control) + * ,-------|ENCODER|-------. + * | MODE+ |RGB TOG| MODE- | * |-------+-------+-------| - * | SPD- | SPD+ |Bright | + * |Bright-| PLAIN |Bright+| * |-------+-------+-------| - * | SAT+ | SAT- | | + * | SWIRL |BREATH | | * `-----------------------' */ - + [1] = LAYOUT_ortho_3x3( - RGB_MOD, RGB_TOG, RGB_RMOD, - RGB_SPI, RGB_SPD, RGB_VAI, - RGB_SAI, RGB_SAD, KC_TRNS + RGB_MOD, RGB_TOG, RGB_RMOD, + RGB_VAD, RGB_M_P, RGB_VAI, + LT(3,RGB_M_SW), RGB_M_B, KC_TRNS ), - - /* LAYER 2 (ENCODER) - * ,-----------------------. - * | | | | ENCODER - PRESS (NA) / KNOB (Arrow Left/Right) + + /* LAYER 2 + * ,-------|ENCODER|-------. + * | | | | * |-------+-------+-------| * | | | | * |-------+-------+-------| * | | | | * `-----------------------' */ - + [2] = LAYOUT_ortho_3x3( - 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 + ), + + + /* LAYER 3 + * ,-------|ENCODER|-------. + * | | | | + * |-------+-------+-------| + * | | | | + * |-------+-------+-------| + * | | | | + * `-----------------------' + */ + + [3] = LAYOUT_ortho_3x3( + KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; -bool encoder_update_user(uint8_t index, bool clockwise) { - - switch (get_highest_layer(layer_state)) { - case 1: - if (clockwise) { - rgblight_increase_hue(); - } else { - rgblight_decrease_hue(); - } - break; - case 2: - if (clockwise) { - tap_code(KC_RGHT); - } else { - tap_code(KC_LEFT); - } - break; - default: - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - - } - return true; -} +/*Encoder Mapping*/ +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI) }, + [2] = { ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, + [3] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, +}; +#endif diff --git a/keyboards/themadnoodle/noodlepad/keymaps/default/rules.mk b/keyboards/themadnoodle/noodlepad/keymaps/default/rules.mk new file mode 100644 index 0000000000..a40474b4d5 --- /dev/null +++ b/keyboards/themadnoodle/noodlepad/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/themadnoodle/noodlepad/keymaps/via/keymap.c b/keyboards/themadnoodle/noodlepad/keymaps/via/keymap.c new file mode 100644 index 0000000000..22ceb93c7e --- /dev/null +++ b/keyboards/themadnoodle/noodlepad/keymaps/via/keymap.c @@ -0,0 +1,85 @@ +// 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 + * ,-------|ENCODER|-------. + * | << | MUTE | >> | + * |-------+-------+-------| + * | STOP | PLAY | MEDIA | + * |-------+-------+-------| + * | CALC | MY PC | TO(3) | + * `-----------------------' + */ + + [0] = LAYOUT_ortho_3x3( + KC_MPRV, KC_MUTE, KC_MNXT, + KC_MSTP, KC_MPLY, KC_MSEL, + KC_CALC, KC_MYCM, TO(3) + ), + + + /* LAYER 1 + * ,-------|ENCODER|-------. + * | MODE+ |RGB TOG| MODE- | + * |-------+-------+-------| + * |Bright-| PLAIN |Bright+| + * |-------+-------+-------| + * | SWIRL |BREATH | TO(0) | + * `-----------------------' + */ + + [1] = LAYOUT_ortho_3x3( + RGB_MOD, RGB_TOG, RGB_RMOD, + RGB_VAD, RGB_M_P, RGB_VAI, + RGB_M_SW, RGB_M_B, TO(0) + ), + + + /* LAYER 2 + * ,-------|ENCODER|-------. + * | | | | + * |-------+-------+-------| + * | | | | + * |-------+-------+-------| + * | | | 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 + * ,-------|ENCODER|-------. + * | | | | + * |-------+-------+-------| + * | 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*/ +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}, + [1] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI)}, + [2] = { ENCODER_CCW_CW(RGB_SAD, RGB_SAI)}, + [3] = { ENCODER_CCW_CW(KC_UP, KC_DOWN)}, +}; +#endif diff --git a/keyboards/themadnoodle/noodlepad/keymaps/via/rules.mk b/keyboards/themadnoodle/noodlepad/keymaps/via/rules.mk new file mode 100644 index 0000000000..6ccd6d9194 --- /dev/null +++ b/keyboards/themadnoodle/noodlepad/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +ENCODER_MAP_ENABLE = yes +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/themadnoodle/noodlepad/readme.md b/keyboards/themadnoodle/noodlepad/readme.md deleted file mode 100644 index e4439dac45..0000000000 --- a/keyboards/themadnoodle/noodlepad/readme.md +++ /dev/null @@ -1,17 +0,0 @@ -# Noodle Pad v1 Keypad with Encoder - -![NoodlePad TOP](https://static.wixstatic.com/media/59d0ff_052f27ee5ae84266821af7277c51c4ed~mv2.jpg) -![NoodlePad RGB](https://static.wixstatic.com/media/59d0ff_c91f2adc258547a38cc5b480a8d9c510~mv2.jpg) - -The Noodle Pad by The Mad Noodle Prototypes is a custom 3x3 mechanical keypad with an encoder knob and full RGB Underglow. - -* Keyboard Maintainer: [The Mad Noodle Prototypes](https://github.com/The-Mad-Noodle) -* Hardware Supported: NoodlePad PCB, ATmega32U4 -* Hardware Availability: [MadNoodlePrototypes.com](https://www.madnoodleprototypes.com/shop) - -Make example for this keyboard (after setting up your build environment): - - make themadnoodle/noodlepad: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). diff --git a/keyboards/themadnoodle/noodlepad/rules.mk b/keyboards/themadnoodle/noodlepad/rules.mk index dd5d8dbfe9..318832e121 100644 --- a/keyboards/themadnoodle/noodlepad/rules.mk +++ b/keyboards/themadnoodle/noodlepad/rules.mk @@ -1,14 +1,3 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode -ENCODER_ENABLE = yes +# Default folder for noodlepad +DEFAULT_FOLDER = themadnoodle/noodlepad/v1 + diff --git a/keyboards/themadnoodle/noodlepad/v1/info.json b/keyboards/themadnoodle/noodlepad/v1/info.json new file mode 100644 index 0000000000..e868400ee1 --- /dev/null +++ b/keyboards/themadnoodle/noodlepad/v1/info.json @@ -0,0 +1,25 @@ +{ + "manufacturer": "The Mad Noodle", + "keyboard_name": "NoodlePad v1", + "maintainer": "The-Mad-Noodle", + "url": "https://www.madnoodleprototypes.com/", + "ws2812": { + "pin": "B7" + }, + "matrix_pins": { + "rows": ["D4", "D6", "D7"], + "cols": ["B4", "B5", "B6"] + }, + "processor": "atmega32u4", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x6A6C" + }, + "encoder": { + "rotary": [ + { "pin_a": "D0", "pin_b": "D1" } + ] + + } +} \ No newline at end of file diff --git a/keyboards/themadnoodle/noodlepad/v1/readme.md b/keyboards/themadnoodle/noodlepad/v1/readme.md new file mode 100644 index 0000000000..a0ef407618 --- /dev/null +++ b/keyboards/themadnoodle/noodlepad/v1/readme.md @@ -0,0 +1,27 @@ +# NoodlePad v.1 + +![NoodPad v1](https://i.imgur.com/dmThaHq.jpg) + +The Noodlepad v.1 is a 8 key macro keypad with a push button encoder knob. + +* Keyboard Maintainer: [The Mad Noodle](https://github.com/The-Mad-Noodle) +* Hardware Supported: NoodlePad v.1 PCB +* Hardware Availability: https://www.madnoodleprototypes.com/shop + + +Compile example for this keyboard (after setting up your build environment): + + qmk compile -kb themadnoodle/noodlepad/v1 -km default + +Flashing example for this keyboard: + + qmk flash -kb themadnoodle/noodlepad/v1 -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**: + +* Press the physical button located on the top left of the back of the PCB (Labeled RST) to enter Bootloader Mode diff --git a/keyboards/themadnoodle/noodlepad/v1/rules.mk b/keyboards/themadnoodle/noodlepad/v1/rules.mk new file mode 100644 index 0000000000..bd92456148 --- /dev/null +++ b/keyboards/themadnoodle/noodlepad/v1/rules.mk @@ -0,0 +1 @@ +#this file was left intentionally blank diff --git a/keyboards/themadnoodle/noodlepad/v2/info.json b/keyboards/themadnoodle/noodlepad/v2/info.json new file mode 100644 index 0000000000..d66c2813ce --- /dev/null +++ b/keyboards/themadnoodle/noodlepad/v2/info.json @@ -0,0 +1,24 @@ +{ + "manufacturer": "The Mad Noodle", + "keyboard_name": "NoodlePad v2", + "maintainer": "The-Mad-Noodle", + "url": "https://www.madnoodleprototypes.com/", + "ws2812": { + "pin": "B7" + }, + "matrix_pins": { + "cols": ["F0", "B5", "B6"], + "rows": ["F1", "D6", "D7"] + }, + "usb": { + "device_version": "2.0.0", + "pid": "0x0002", + "vid": "0x6A6C" + }, + "encoder": { + "rotary": [ + { "pin_a": "D0", "pin_b": "D1" } + ] + + } +} \ No newline at end of file diff --git a/keyboards/themadnoodle/noodlepad/v2/readme.md b/keyboards/themadnoodle/noodlepad/v2/readme.md new file mode 100644 index 0000000000..4b180c2066 --- /dev/null +++ b/keyboards/themadnoodle/noodlepad/v2/readme.md @@ -0,0 +1,27 @@ +# NoodlePad v.2 + +![NoodPad v2](https://i.imgur.com/tzP0tdzh.jpg) + +The Noodlepad v.2 is a 8 hotswap key macro keypad with a push button encoder knob. + +* Keyboard Maintainer: [The Mad Noodle](https://github.com/The-Mad-Noodle) +* Hardware Supported: NoodlePad v.2 PCB +* Hardware Availability: https://www.madnoodleprototypes.com/shop + + +Compile example for this keyboard (after setting up your build environment): + + qmk compile -kb themadnoodle/noodlepad/v2 -km default + +Flashing example for this keyboard: + + qmk flash -kb themadnoodle/noodlepad/v2 -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**: + +* Press the physical button located on the top left of the back of the PCB (Labeled RST) to enter Bootloader Mode diff --git a/keyboards/themadnoodle/noodlepad/v2/rules.mk b/keyboards/themadnoodle/noodlepad/v2/rules.mk new file mode 100644 index 0000000000..bd92456148 --- /dev/null +++ b/keyboards/themadnoodle/noodlepad/v2/rules.mk @@ -0,0 +1 @@ +#this file was left intentionally blank