From db3255b035ed36a5ca51440501ce227e64d930f0 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Fri, 16 Sep 2022 10:49:57 -0400 Subject: [PATCH 01/49] updates to 1up product line removed v2 option from original sweet16 folder added sweet16v2 product added pi60hse product --- keyboards/1upkeyboards/pi60_hse/config.h | 75 +++++++++++ keyboards/1upkeyboards/pi60_hse/info.json | 125 ++++++++++++++++++ .../pi60_hse/keymaps/default/keymap.c | 36 +++++ .../pi60_hse/keymaps/via/keymap.c | 84 ++++++++++++ .../pi60_hse/keymaps/via/rules.mk | 2 + keyboards/1upkeyboards/pi60_hse/readme.md | 23 ++++ keyboards/1upkeyboards/pi60_hse/rules.mk | 1 + .../1upkeyboards/sweet16/v2/promicro/config.h | 26 ---- .../sweet16/v2/promicro/info.json | 6 - .../sweet16/v2/promicro/promicro.c | 8 -- .../sweet16/v2/promicro/promicro.h | 30 ----- .../sweet16/v2/promicro/readme.md | 13 -- .../1upkeyboards/sweet16/v2/promicro/rules.mk | 14 -- .../1upkeyboards/sweet16/v2/proton_c/config.h | 19 --- .../sweet16/v2/proton_c/info.json | 6 - .../sweet16/v2/proton_c/proton_c.c | 1 - .../sweet16/v2/proton_c/proton_c.h | 30 ----- .../sweet16/v2/proton_c/readme.md | 13 -- .../1upkeyboards/sweet16/v2/proton_c/rules.mk | 11 -- .../1upkeyboards/sweet16v2/kb2040/config.h | 98 ++++++++++++++ .../1upkeyboards/sweet16v2/kb2040/info.json | 76 +++++++++++ .../1upkeyboards/sweet16v2/kb2040/rules.mk | 6 + .../sweet16v2/keymaps/default/keymap.c | 41 ++++++ .../sweet16v2/keymaps/default/readme.md | 1 + .../sweet16v2/keymaps/via/keymap.c | 105 +++++++++++++++ .../sweet16v2/keymaps/via/readme.md | 1 + .../sweet16v2/keymaps/via/rules.mk | 2 + .../1upkeyboards/sweet16v2/pro_micro/config.h | 84 ++++++++++++ .../sweet16v2/pro_micro/info.json | 101 ++++++++++++++ .../1upkeyboards/sweet16v2/pro_micro/rules.mk | 0 keyboards/1upkeyboards/sweet16v2/readme.md | 39 ++++++ 31 files changed, 900 insertions(+), 177 deletions(-) create mode 100644 keyboards/1upkeyboards/pi60_hse/config.h create mode 100644 keyboards/1upkeyboards/pi60_hse/info.json create mode 100644 keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c create mode 100644 keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c create mode 100644 keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk create mode 100644 keyboards/1upkeyboards/pi60_hse/readme.md create mode 100644 keyboards/1upkeyboards/pi60_hse/rules.mk delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/config.h delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/info.json delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/readme.md delete mode 100644 keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/config.h delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/info.json delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md delete mode 100644 keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk create mode 100644 keyboards/1upkeyboards/sweet16v2/kb2040/config.h create mode 100644 keyboards/1upkeyboards/sweet16v2/kb2040/info.json create mode 100644 keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk create mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c create mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md create mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c create mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md create mode 100644 keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk create mode 100644 keyboards/1upkeyboards/sweet16v2/pro_micro/config.h create mode 100644 keyboards/1upkeyboards/sweet16v2/pro_micro/info.json create mode 100644 keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk create mode 100644 keyboards/1upkeyboards/sweet16v2/readme.md diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h new file mode 100644 index 000000000000..263ff8b40053 --- /dev/null +++ b/keyboards/1upkeyboards/pi60_hse/config.h @@ -0,0 +1,75 @@ +// Copyright 2022 ziptyze (@ziptyze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +#define DYNAMIC_KEYMAP_LAYER_COUNT 10 + +#define NOP_FUDGE 0.4 + +#define RGB_DI_PIN GP15 +#define DRIVER_LED_TOTAL 16 +#define RGBLED_NUM 16 +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES +#define RGB_DISABLE_WHEN_USB_SUSPENDED +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json new file mode 100644 index 000000000000..01f5982e7270 --- /dev/null +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -0,0 +1,125 @@ +{ + "manufacturer": "1upkeyboards", + "keyboard_name": "pi60_hse", + "maintainer": "ziptyze", + "processor": "RP2040", + "bootloader": "rp2040", + "board": "GENERIC_RP_RP2040", + "usb": { + "device_ver": "0x0001", + "device_version": "1.0.0", + "pid": "0x5603", + "vid": "0x6F75" + }, + "debounce": 5, + "diode_direction": "COL2ROW", + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true, + "rgblight": false + }, + "matrix_pins": { + "cols": ["GP9", "GP8", "GP6", "GP5", "GP14", "GP20", "GP13", "GP12", "GP11", "GP16", "GP17", "GP10", "GP19", "GP18"], + "rows": ["GP4", "GP3", "GP2", "GP1", "GP0", "GP21"] + }, + "mouse_key": { + "enabled": true + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 2, "x": 98, "y": 51 }, + { "flags": 2, "x": 68, "y": 51 }, + { "flags": 2, "x": 41, "y": 51 }, + { "flags": 2, "x": 12, "y": 51 }, + { "flags": 2, "x": 12, "y": 13 }, + { "flags": 2, "x": 41, "y": 13 }, + { "flags": 2, "x": 69, "y": 13 }, + { "flags": 2, "x": 98, "y": 13 }, + { "flags": 2, "x": 126, "y": 13 }, + { "flags": 2, "x": 155, "y": 13 }, + { "flags": 2, "x": 183, "y": 13 }, + { "flags": 2, "x": 212, "y": 13 }, + { "flags": 2, "x": 208, "y": 51 }, + { "flags": 2, "x": 183, "y": 51 }, + { "flags": 2, "x": 157, "y": 51 }, + { "flags": 2, "x": 126, "y": 51 } + ] + }, + "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "BS", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "~", "matrix": [1, 13], "w": 1, "x": 14, "y": 0 }, + { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [2, 12], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, + { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 }, + { "label": "/", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 }, + { "label": "RShift", "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, + { "label": "FN", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, + { "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4 }, + { "label": "RAlt", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4 }, + { "label": "RGui", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4 }, + { "label": "Menu", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4 }, + { "label": "RCtrl", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c new file mode 100644 index 000000000000..c9a49e7d54f0 --- /dev/null +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_60_ansi( + 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, 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, 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] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [3] = LAYOUT_60_ansi( + 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, 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, 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 + ) +}; diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c new file mode 100644 index 000000000000..b0cd3de4a39c --- /dev/null +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -0,0 +1,84 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_60_ansi( + 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, 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, 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] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [3] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [4] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [5] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [6] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [7] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [8] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [9] = LAYOUT_60_ansi( + 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, 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, 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 + ) +}; diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk b/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/1upkeyboards/pi60_hse/readme.md b/keyboards/1upkeyboards/pi60_hse/readme.md new file mode 100644 index 000000000000..bd9b3e2cc1b1 --- /dev/null +++ b/keyboards/1upkeyboards/pi60_hse/readme.md @@ -0,0 +1,23 @@ +# pi60_hse + +The pi60 HSE is the update to the original 1up Keyboards 60% HSE. This keyboard features a multi layout hot swap PCB with options for split backspace, split right shift, and 6.25u and 7u space bottom rows. The controller is a Raspberry Pi rp2040 microcontroller. + +* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze) +* Hardware Availability: (https://1upkeyboards.com/shop/controllers/1upkeyboards-pi60hse-60-pcb/) + +Make example for this keyboard (after setting up your build environment): + + make pi60_hse:default + +Flashing example for this keyboard: + + make pi60_hse: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 2 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Bootloader button**: Hold the button on the back of the PCB and plug in the keyboard diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk new file mode 100644 index 000000000000..8e853e0af70b --- /dev/null +++ b/keyboards/1upkeyboards/pi60_hse/rules.mk @@ -0,0 +1 @@ +WS2812_DRIVER = vendor \ No newline at end of file diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h b/keyboards/1upkeyboards/sweet16/v2/promicro/config.h deleted file mode 100644 index 8bacff2f6e57..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/promicro/config.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "config_common.h" - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D4, D1, E6, B5 } -#define MATRIX_COL_PINS { F7, F6, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* Encoder pins */ -#define ENCODERS_PAD_A { F4 } -#define ENCODERS_PAD_B { F5 } -#define ENCODER_RESOLUTION 4 - -/* Underglow options */ -#define RGB_DI_PIN F4 -#define RGBLIGHT_ANIMATIONS -#define RGBLED_NUM 1 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/info.json b/keyboards/1upkeyboards/sweet16/v2/promicro/info.json deleted file mode 100644 index bed6579e824d..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/promicro/info.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "usb": { - "pid": "0x0162", - "device_version": "0.0.1" - } -} diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c deleted file mode 100644 index d850a3b5c61f..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.c +++ /dev/null @@ -1,8 +0,0 @@ -#include "promicro.h" -#include "encoder.h" - -#ifdef ENCODER_ENABLED -bool encoder_update_kb(uint8_t index, bool clockwise) { - return encoder_update_user(index, clockwise); -} -#endif diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h b/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h deleted file mode 100644 index 7320ccd9e074..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/promicro/promicro.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Any changes to the layout names and/or definitions must also be made to info.json - -#define LAYOUT_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} - -#define LAYOUT_numpad_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K31, K32 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { KC_NO, K31, K32, KC_NO } \ -} - diff --git a/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md b/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md deleted file mode 100644 index 584b446511d9..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/promicro/readme.md +++ /dev/null @@ -1,13 +0,0 @@ -# Sweet16 V2 (Pro Micro) - -A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Clueboard - -* Keyboard Maintainer: skullydazed -* Hardware Supported: Sweet16 V2 PCB, Pro Micro -* Hardware Availability: [1up Keyboards](https://1upkeyboards.com/) - -Make example for this keyboard (after setting up your build environment): - - make 1upkeyboards/sweet16/v2/promicro: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/1upkeyboards/sweet16/v2/promicro/rules.mk b/keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk deleted file mode 100644 index a8249511bcef..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/promicro/rules.mk +++ /dev/null @@ -1,14 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - -## Features -CONSOLE_ENABLE = yes - -## On a Pro Micro you have to choose between underglow and the rotary encoder. -RGBLIGHT_ENABLE = no -ENCODER_ENABLE = yes - -LTO_ENABLE = yes diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h deleted file mode 100644 index e1d66894b3d0..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/proton_c/config.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "config_common.h" - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, B7, B2, B0 } -#define MATRIX_COL_PINS { B8, A0, A10, A9 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* Encoder pins */ -#define ENCODERS_PAD_A { A2 } -#define ENCODERS_PAD_B { A1 } -#define ENCODER_RESOLUTION 4 - -#define AUDIO_PIN A5 -#define AUDIO_PIN_ALT A4 -#define AUDIO_PIN_ALT_AS_NEGATIVE diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json b/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json deleted file mode 100644 index bed6579e824d..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/proton_c/info.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "usb": { - "pid": "0x0162", - "device_version": "0.0.1" - } -} diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c b/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c deleted file mode 100644 index b08e33e81b01..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.c +++ /dev/null @@ -1 +0,0 @@ -#include "proton_c.h" diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h b/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h deleted file mode 100644 index 7320ccd9e074..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/proton_c/proton_c.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Any changes to the layout names and/or definitions must also be made to info.json - -#define LAYOUT_ortho_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} - -#define LAYOUT_numpad_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K31, K32 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { KC_NO, K31, K32, KC_NO } \ -} - diff --git a/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md b/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md deleted file mode 100644 index 6806cc5739ec..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/proton_c/readme.md +++ /dev/null @@ -1,13 +0,0 @@ -# Sweet16 V2 (Proton C) - -A 4x4 numpad/macro pad sold by 1up Keyboards - designed by Clueboard - -* Keyboard Maintainer: skullydazed -* Hardware Supported: Sweet16 V2 PCB, Proton C -* Hardware Availability: [1up Keyboards](https://1upkeyboards.com/) - -Make example for this keyboard (after setting up your build environment): - - make 1upkeyboards/sweet16/v2/proton_c: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/1upkeyboards/sweet16/v2/proton_c/rules.mk b/keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk deleted file mode 100644 index fcfa05c3a1f0..000000000000 --- a/keyboards/1upkeyboards/sweet16/v2/proton_c/rules.mk +++ /dev/null @@ -1,11 +0,0 @@ -# MCU name -MCU = STM32F303 -BOARD = QMK_PROTON_C - -# Bootloader selection -BOOTLOADER = stm32-dfu - -## Features -CONSOLE_ENABLE = yes -ENCODER_ENABLE = yes -AUDIO_ENABLE = yes diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h new file mode 100644 index 000000000000..b992961a9098 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h @@ -0,0 +1,98 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include "config_common.h" + +#define DYNAMIC_KEYMAP_LAYER_COUNT 10 + +#define MATRIX_ROWS 4 +#define MATRIX_COLS 4 + +#define DIODE_DIRECTION COL2ROW + +#define MATRIX_ROW_PINS { GP2, GP9, GP8, GP7 } +#define MATRIX_COL_PINS { GP26, GP1, GP18, GP5 } + +#define ENCODERS_PAD_A { GP27, GP4 } +#define ENCODERS_PAD_B { GP28, GP3 } + +#define NOP_FUDGE 0.4 + +#define RGB_DI_PIN GP6 +#define DRIVER_LED_TOTAL 20 +#define RGBLED_NUM 20 +#define RGB_MATRIX_KEYPRESSES +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_DISABLE_WHEN_USB_SUSPENDED +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json new file mode 100644 index 000000000000..0e6d0937764c --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -0,0 +1,76 @@ +{ + "manufacturer": "1upkeyboards", + "keyboard_name": "sweet16v2", + "url": "1upkeyboards.com/shop/keyboard-kits/macro-pads/sweet-16-v2-macropad-kit/", + "maintainer": "ziptyze", + "usb": { + "device_version": "1.0.0", + "pid": "0x5518", + "vid": "0x6F75" + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "encoder_map": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true, + "rgblight": false + }, + "mouse_key": { + "enabled": true + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 4, "matrix": [0, 0], "x": 28, "y": 12 }, + { "flags": 4, "matrix": [0, 1], "x": 84, "y": 12 }, + { "flags": 4, "matrix": [0, 2], "x": 140, "y": 12 }, + { "flags": 4, "matrix": [0, 3], "x": 196, "y": 12 }, + { "flags": 2, "x": 196, "y": 17 }, + { "flags": 4, "matrix": [1, 3], "x": 196, "y": 28 }, + { "flags": 4, "matrix": [1, 2], "x": 140, "y": 28 }, + { "flags": 4, "matrix": [1, 1], "x": 84, "y": 28 }, + { "flags": 2, "x": 28, "y": 17 }, + { "flags": 4, "matrix": [1, 0], "x": 28, "y": 28 }, + { "flags": 4, "matrix": [2, 0], "x": 28, "y": 44 }, + { "flags": 4, "matrix": [2, 1], "x": 84, "y": 44 }, + { "flags": 4, "matrix": [2, 2], "x": 140, "y": 44 }, + { "flags": 4, "matrix": [2, 3], "x": 196, "y": 44 }, + { "flags": 2, "x": 196, "y": 47 }, + { "flags": 4, "matrix": [3, 3], "x": 196, "y": 60 }, + { "flags": 4, "matrix": [3, 2], "x": 140, "y": 60 }, + { "flags": 4, "matrix": [3, 1], "x": 84, "y": 60 }, + { "flags": 2, "x": 28, "y": 47 }, + { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 } + ] + }, + "layouts": { + "LAYOUT_ortho_4x4": { + "c_macro": false, + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "x": 2, "y": 3 }, + { "matrix": [3, 3], "x": 3, "y": 3 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk new file mode 100644 index 000000000000..f969e63f3aa6 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk @@ -0,0 +1,6 @@ +# MCU name +MCU = RP2040 +BOOTLOADER = rp2040 +BOARD = GENERIC_RP_RP2040 + +WS2812_DRIVER = vendor \ No newline at end of file diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c new file mode 100644 index 000000000000..1994a5bde1ee --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/keymaps/default/keymap.c @@ -0,0 +1,41 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x4( + KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PSLS, + MO(1), KC_P0, KC_PDOT, KC_PENT + ), + + [1] = LAYOUT_ortho_4x4( + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, + RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT + ) +}; + + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(RGB_VAD, RGB_VAI) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } +}; +#endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md b/keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md new file mode 100644 index 000000000000..fcf8c8723488 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/keymaps/default/readme.md @@ -0,0 +1 @@ +# The default keymap for Sweet 16 V2 diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c b/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c new file mode 100644 index 000000000000..8bb0368d098f --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/keymaps/via/keymap.c @@ -0,0 +1,105 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_4x4( + KC_P7, KC_P8, KC_P9, KC_PMNS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PSLS, + MO(1), KC_P0, KC_PDOT, KC_PENT + ), + + [1] = LAYOUT_ortho_4x4( + RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, + RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, + RGB_SPD, RGB_SPI, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT + ), + + [2] = LAYOUT_ortho_4x4( + 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 + ), + + [3] = LAYOUT_ortho_4x4( + 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 + ), + + [4] = LAYOUT_ortho_4x4( + 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 + ), + + [5] = LAYOUT_ortho_4x4( + 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 + ), + + [6] = LAYOUT_ortho_4x4( + 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 + ), + + [7] = LAYOUT_ortho_4x4( + 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 + ), + + [8] = LAYOUT_ortho_4x4( + 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 + ), + + [9] = LAYOUT_ortho_4x4( + 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 + ), +}; + + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md b/keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md new file mode 100644 index 000000000000..b0fba0bdd91e --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/keymaps/via/readme.md @@ -0,0 +1 @@ +# The default keymap for via on the Sweet 16 V2 diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk b/keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h new file mode 100644 index 000000000000..0e2ec9cca776 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/config.h @@ -0,0 +1,84 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include "config_common.h" + +#define DYNAMIC_KEYMAP_LAYER_COUNT 10 + +#define RGB_DI_PIN D7 +#define DRIVER_LED_TOTAL 20 +#define RGB_MATRIX_KEYPRESSES +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_DISABLE_WHEN_USB_SUSPENDED +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json new file mode 100644 index 000000000000..f7d16dadfb2f --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -0,0 +1,101 @@ +{ + "manufacturer": "1upkeyboards", + "keyboard_name": "sweet16v2", + "url": "1upkeyboards.com/shop/keyboard-kits/macro-pads/sweet-16-v2-macropad-kit/", + "maintainer": "ziptyze", + "bootloader": "atmel-dfu", + "processor": "atmega32u4", + "processor_type": "avr", + "usb": { + "device_version": "1.0.0", + "pid": "0x5518", + "vid": "0x6F75" + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "encoder_map": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true, + "rgblight": false + }, + "matrix_pins": { + "cols": ["F7", "D2", "B1", "C6"], + "rows": ["D1", "B5", "B4", "E6"] + }, + "matrix_size": { + "cols": 4, + "rows": 4 + }, + "mouse_key": { + "enabled": true + }, + "diode_direction": "COL2ROW", + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "F6", + "pin_b": "F5" + }, + { + "pin_a": "D4", + "pin_b": "D0" + } + ] + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 4, "matrix": [0, 0], "x": 28, "y": 12 }, + { "flags": 4, "matrix": [0, 1], "x": 84, "y": 12 }, + { "flags": 4, "matrix": [0, 2], "x": 140, "y": 12 }, + { "flags": 4, "matrix": [0, 3], "x": 196, "y": 12 }, + { "flags": 2, "x": 196, "y": 17 }, + { "flags": 4, "matrix": [1, 3], "x": 196, "y": 28 }, + { "flags": 4, "matrix": [1, 2], "x": 140, "y": 28 }, + { "flags": 4, "matrix": [1, 1], "x": 84, "y": 28 }, + { "flags": 2, "x": 28, "y": 17 }, + { "flags": 4, "matrix": [1, 0], "x": 28, "y": 28 }, + { "flags": 4, "matrix": [2, 0], "x": 28, "y": 44 }, + { "flags": 4, "matrix": [2, 1], "x": 84, "y": 44 }, + { "flags": 4, "matrix": [2, 2], "x": 140, "y": 44 }, + { "flags": 4, "matrix": [2, 3], "x": 196, "y": 44 }, + { "flags": 2, "x": 196, "y": 47 }, + { "flags": 4, "matrix": [3, 3], "x": 196, "y": 60 }, + { "flags": 4, "matrix": [3, 2], "x": 140, "y": 60 }, + { "flags": 4, "matrix": [3, 1], "x": 84, "y": 60 }, + { "flags": 2, "x": 28, "y": 47 }, + { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 } + ] + }, + "layouts": { + "LAYOUT_ortho_4x4": { + "c_macro": false, + "layout": [ + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2, "y": 0 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "x": 2, "y": 1 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "x": 2, "y": 2 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "x": 2, "y": 3 }, + { "matrix": [3, 3], "x": 3, "y": 3 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk b/keyboards/1upkeyboards/sweet16v2/pro_micro/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/1upkeyboards/sweet16v2/readme.md b/keyboards/1upkeyboards/sweet16v2/readme.md new file mode 100644 index 000000000000..e96865a0d128 --- /dev/null +++ b/keyboards/1upkeyboards/sweet16v2/readme.md @@ -0,0 +1,39 @@ +# sweet16v2 + +A 4x4 macropad with RGB inswitch lighting and underglow. + +* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze) +* Hardware Supported: 1upkeyboards Sweet 16 v2 +* Hardware Availability: [1upkeyboards](https://1upkeyboards.com/) + +Make example for this keyboard using an atmel-based controller (after setting up your build environment): + + make 1upkeyboards/sweet16v2/pico:default + +Flashing example for this keyboard using an atmel-based controller: + + make 1upkeyboards/sweet16v2/pico:default:flash + +Make example for this keyboard using an rp2040-based controller (after setting up your build environment): + + make 1upkeyboards/sweet16v2/rp2040:default + +Flashing example for this keyboard using an rp2040-based controller: + + make 1upkeyboards/sweet16v2/pico:rp2040: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 for atmel-based controllers: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available + + +Enter the bootloader in 2 ways for rp2040-based controllers: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Bootsel button**: Hold the bootsel button on controller and plug in the keyboard \ No newline at end of file From 7ada529630f8eb223eeec8fd7a7afaf281208d48 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Mon, 26 Sep 2022 12:40:34 -0400 Subject: [PATCH 02/49] Update keyboards/1upkeyboards/pi60_hse/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json index 01f5982e7270..893b25176038 100644 --- a/keyboards/1upkeyboards/pi60_hse/info.json +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -6,7 +6,6 @@ "bootloader": "rp2040", "board": "GENERIC_RP_RP2040", "usb": { - "device_ver": "0x0001", "device_version": "1.0.0", "pid": "0x5603", "vid": "0x6F75" From 875c221ee4285b91af22326e10d6e0c20f4c12c6 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Mon, 26 Sep 2022 12:40:51 -0400 Subject: [PATCH 03/49] Update keyboards/1upkeyboards/pi60_hse/config.h Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/1upkeyboards/pi60_hse/config.h b/keyboards/1upkeyboards/pi60_hse/config.h index 263ff8b40053..9cae4cbf42cc 100644 --- a/keyboards/1upkeyboards/pi60_hse/config.h +++ b/keyboards/1upkeyboards/pi60_hse/config.h @@ -6,9 +6,6 @@ #include "config_common.h" #define DYNAMIC_KEYMAP_LAYER_COUNT 10 - -#define NOP_FUDGE 0.4 - #define RGB_DI_PIN GP15 #define DRIVER_LED_TOTAL 16 #define RGBLED_NUM 16 From 8854afff53f9271407b3d9bc0aaf94bf645bd422 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Mon, 26 Sep 2022 12:41:05 -0400 Subject: [PATCH 04/49] Update keyboards/1upkeyboards/pi60_hse/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/info.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json index 893b25176038..6ef5f518c5d2 100644 --- a/keyboards/1upkeyboards/pi60_hse/info.json +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -28,9 +28,6 @@ "cols": ["GP9", "GP8", "GP6", "GP5", "GP14", "GP20", "GP13", "GP12", "GP11", "GP16", "GP17", "GP10", "GP19", "GP18"], "rows": ["GP4", "GP3", "GP2", "GP1", "GP0", "GP21"] }, - "mouse_key": { - "enabled": true - }, "rgb_matrix": { "driver": "WS2812", "layout": [ From 0cfca45303eb06237ef8033b6d489b5e35d98296 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Mon, 26 Sep 2022 12:41:32 -0400 Subject: [PATCH 05/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c Co-authored-by: Joel Challis --- .../pi60_hse/keymaps/default/keymap.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c index c9a49e7d54f0..a04a13bee24d 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c @@ -16,21 +16,5 @@ 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, 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] = LAYOUT_60_ansi( - 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, 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, 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 - ), - - [3] = LAYOUT_60_ansi( - 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, 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, 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 ) }; From abb73c30c6ce9742f6bc8b32111a38bd9ae0af87 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Mon, 26 Sep 2022 12:42:02 -0400 Subject: [PATCH 06/49] Update keyboards/1upkeyboards/sweet16v2/pro_micro/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/pro_micro/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json index f7d16dadfb2f..6ed6e9d5278d 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -18,7 +18,6 @@ "command": false, "console": false, "encoder": true, - "encoder_map": true, "extrakey": true, "mousekey": true, "nkro": false, From 1a5c6c94bc0d5edef561a2edde01faece23a05bf Mon Sep 17 00:00:00 2001 From: ziptyze Date: Mon, 26 Sep 2022 12:43:23 -0400 Subject: [PATCH 07/49] Update keyboards/1upkeyboards/sweet16v2/pro_micro/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/pro_micro/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json index 6ed6e9d5278d..0dd99a9097eb 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -76,7 +76,6 @@ }, "layouts": { "LAYOUT_ortho_4x4": { - "c_macro": false, "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, From 16f103d8f1d4bf85e1462901b311343e45a7ce73 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Mon, 26 Sep 2022 12:44:08 -0400 Subject: [PATCH 08/49] Update keyboards/1upkeyboards/sweet16v2/readme.md Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/1upkeyboards/sweet16v2/readme.md b/keyboards/1upkeyboards/sweet16v2/readme.md index e96865a0d128..e3f5859f961c 100644 --- a/keyboards/1upkeyboards/sweet16v2/readme.md +++ b/keyboards/1upkeyboards/sweet16v2/readme.md @@ -8,19 +8,19 @@ A 4x4 macropad with RGB inswitch lighting and underglow. Make example for this keyboard using an atmel-based controller (after setting up your build environment): - make 1upkeyboards/sweet16v2/pico:default + make 1upkeyboards/sweet16v2/promicro:default Flashing example for this keyboard using an atmel-based controller: - make 1upkeyboards/sweet16v2/pico:default:flash + make 1upkeyboards/sweet16v2/promicro:default:flash Make example for this keyboard using an rp2040-based controller (after setting up your build environment): - make 1upkeyboards/sweet16v2/rp2040:default + make 1upkeyboards/sweet16v2/kb2040:default Flashing example for this keyboard using an rp2040-based controller: - make 1upkeyboards/sweet16v2/pico:rp2040:flash + make 1upkeyboards/sweet16v2/kb2040: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). From 7662150dba8529a955489aa1f7c7eb8f5cd4c203 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Mon, 26 Sep 2022 12:48:15 -0400 Subject: [PATCH 09/49] keymap changes --- .../1upkeyboards/pi60_hse/keymaps/via/keymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index b0cd3de4a39c..8206a2e16146 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -7,22 +7,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL ), [1] = LAYOUT_60_ansi( - 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, 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, 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_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, + KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS ), [2] = LAYOUT_60_ansi( 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), From bf0a058359124ee0d2ef6ce89d6877aabd96a68e Mon Sep 17 00:00:00 2001 From: ziptyze Date: Mon, 26 Sep 2022 13:17:19 -0400 Subject: [PATCH 10/49] requested changes --- .../pi60_hse/keymaps/default/keymap.c | 30 +++++++++++++++++-- .../pi60_hse/keymaps/via/keymap.c | 16 ++++++++++ .../1upkeyboards/sweet16v2/kb2040/config.h | 11 ------- .../1upkeyboards/sweet16v2/kb2040/info.json | 25 ++++++++++++++++ .../1upkeyboards/sweet16v2/kb2040/rules.mk | 3 -- 5 files changed, 68 insertions(+), 17 deletions(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c index a04a13bee24d..c88f35c76d79 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -7,14 +23,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL ), [1] = LAYOUT_60_ansi( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, + KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT_60_ansi( 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index 8206a2e16146..fb1a72f65fb4 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h index b992961a9098..7cd157f5d67d 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h @@ -20,17 +20,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 10 -#define MATRIX_ROWS 4 -#define MATRIX_COLS 4 - -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { GP2, GP9, GP8, GP7 } -#define MATRIX_COL_PINS { GP26, GP1, GP18, GP5 } - -#define ENCODERS_PAD_A { GP27, GP4 } -#define ENCODERS_PAD_B { GP28, GP3 } - #define NOP_FUDGE 0.4 #define RGB_DI_PIN GP6 diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index 0e6d0937764c..1ed130ad13e9 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -3,6 +3,9 @@ "keyboard_name": "sweet16v2", "url": "1upkeyboards.com/shop/keyboard-kits/macro-pads/sweet-16-v2-macropad-kit/", "maintainer": "ziptyze", + "processor": "RP2040", + "bootloader": "rp2040", + "board": "GENERIC_RP_RP2040", "usb": { "device_version": "1.0.0", "pid": "0x5518", @@ -22,9 +25,31 @@ "rgb_matrix": true, "rgblight": false }, + "matrix_pins": { + "cols": ["GP2", "GP9", "GP8", "GP7"], + "rows": ["GP26", "GP1", "GP18", "GP5"] + }, + "matrix_size": { + "cols": 4, + "rows": 4 + }, "mouse_key": { "enabled": true }, + "diode_direction": "COL2ROW", + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "GP27", + "pin_b": "GP28" + }, + { + "pin_a": "GP4", + "pin_b": "GP3" + } + ] + }, "rgb_matrix": { "driver": "WS2812", "layout": [ diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk index f969e63f3aa6..6d262dc58d15 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk @@ -1,6 +1,3 @@ # MCU name -MCU = RP2040 -BOOTLOADER = rp2040 -BOARD = GENERIC_RP_RP2040 WS2812_DRIVER = vendor \ No newline at end of file From 05f62395ea8599fed31c02d69a5f99e52a2b53e4 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 16:23:59 -0400 Subject: [PATCH 11/49] Update keyboards/1upkeyboards/pi60_hse/readme.md Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/1upkeyboards/pi60_hse/readme.md b/keyboards/1upkeyboards/pi60_hse/readme.md index bd9b3e2cc1b1..cc6ee8812f1d 100644 --- a/keyboards/1upkeyboards/pi60_hse/readme.md +++ b/keyboards/1upkeyboards/pi60_hse/readme.md @@ -7,11 +7,11 @@ The pi60 HSE is the update to the original 1up Keyboards 60% HSE. This keyboard Make example for this keyboard (after setting up your build environment): - make pi60_hse:default + make 1upkeyboards/pi60_hse:default Flashing example for this keyboard: - make pi60_hse:default:flash + make 1upkeyboards/pi60_hse: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). From 0bfbf8312d35734b49a7b1cae7bcab89e79a8999 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 16:24:18 -0400 Subject: [PATCH 12/49] Update keyboards/1upkeyboards/sweet16v2/kb2040/config.h Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/kb2040/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h index 7cd157f5d67d..e22c63b98858 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/config.h +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/config.h @@ -19,9 +19,6 @@ #include "config_common.h" #define DYNAMIC_KEYMAP_LAYER_COUNT 10 - -#define NOP_FUDGE 0.4 - #define RGB_DI_PIN GP6 #define DRIVER_LED_TOTAL 20 #define RGBLED_NUM 20 From 06e9d8295ca2881c2e0ed878a0f71ada34a9ee41 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 16:25:30 -0400 Subject: [PATCH 13/49] Update keyboards/1upkeyboards/sweet16v2/kb2040/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/kb2040/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index 1ed130ad13e9..566ae0b2117f 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -77,7 +77,6 @@ }, "layouts": { "LAYOUT_ortho_4x4": { - "c_macro": false, "layout": [ { "matrix": [0, 0], "x": 0, "y": 0 }, { "matrix": [0, 1], "x": 1, "y": 0 }, From ff0a310f8350f6058ce0654664cd8477a2cc3d98 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 16:25:46 -0400 Subject: [PATCH 14/49] Update keyboards/1upkeyboards/sweet16v2/kb2040/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/kb2040/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index 566ae0b2117f..392756548b4a 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -18,7 +18,6 @@ "command": false, "console": false, "encoder": true, - "encoder_map": true, "extrakey": true, "mousekey": true, "nkro": false, From 9ef14e0cf8fa6c4038f9f63564260d17d913f18a Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 16:30:39 -0400 Subject: [PATCH 15/49] Update keyboards/1upkeyboards/sweet16v2/kb2040/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/kb2040/info.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index 392756548b4a..7eed9be2ec17 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -32,9 +32,6 @@ "cols": 4, "rows": 4 }, - "mouse_key": { - "enabled": true - }, "diode_direction": "COL2ROW", "encoder": { "enabled": true, From 98c8371429557919301e6244affc2850a28b8817 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 16:31:21 -0400 Subject: [PATCH 16/49] Update keyboards/1upkeyboards/sweet16v2/pro_micro/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/pro_micro/info.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json index 0dd99a9097eb..ee66e02ffc80 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -28,13 +28,6 @@ "cols": ["F7", "D2", "B1", "C6"], "rows": ["D1", "B5", "B4", "E6"] }, - "matrix_size": { - "cols": 4, - "rows": 4 - }, - "mouse_key": { - "enabled": true - }, "diode_direction": "COL2ROW", "encoder": { "enabled": true, From 4e518af527b063e357f852efc35a5ba1f7e5921b Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 16:33:12 -0400 Subject: [PATCH 17/49] Update rules.mk --- keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk b/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk index 36b7ba9cbc98..1189f4ad1927 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk @@ -1,2 +1,3 @@ VIA_ENABLE = yes LTO_ENABLE = yes +ENCODER_MAP_ENABLE = yes From d4a4ee7c4c5e7d21a8efc59697bba1a7f97583bb Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 16:34:02 -0400 Subject: [PATCH 18/49] Update rules.mk --- keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk b/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk index 1189f4ad1927..36b7ba9cbc98 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/rules.mk @@ -1,3 +1,2 @@ VIA_ENABLE = yes LTO_ENABLE = yes -ENCODER_MAP_ENABLE = yes From 60ca7082b5a1f3b83f718eee92e59a913bb7ec82 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 16:34:57 -0400 Subject: [PATCH 19/49] Update rules.mk --- keyboards/1upkeyboards/pi60_hse/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk index 8e853e0af70b..f0b9e380da7c 100644 --- a/keyboards/1upkeyboards/pi60_hse/rules.mk +++ b/keyboards/1upkeyboards/pi60_hse/rules.mk @@ -1 +1,2 @@ -WS2812_DRIVER = vendor \ No newline at end of file +WS2812_DRIVER = vendor +ENCODER_MAP_ENABLE = yes From 953588bf73226dffd7aace2f147851b45dc7009e Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 19:50:36 -0400 Subject: [PATCH 20/49] Update keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk Co-authored-by: Ryan --- keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk index 6d262dc58d15..8e853e0af70b 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk @@ -1,3 +1 @@ -# MCU name - WS2812_DRIVER = vendor \ No newline at end of file From b370a528a1a4d8b44d4701fa5cf158bed03d4fdd Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 20:04:29 -0400 Subject: [PATCH 21/49] Update keyboards/1upkeyboards/sweet16v2/pro_micro/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/pro_micro/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json index ee66e02ffc80..f360be0dba31 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -5,7 +5,6 @@ "maintainer": "ziptyze", "bootloader": "atmel-dfu", "processor": "atmega32u4", - "processor_type": "avr", "usb": { "device_version": "1.0.0", "pid": "0x5518", From c0a1c9406fc4e92de2440cf3c6ac662d523c151e Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 20:05:16 -0400 Subject: [PATCH 22/49] Update keyboards/1upkeyboards/sweet16v2/kb2040/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/kb2040/info.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index 7eed9be2ec17..a72977eac436 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -28,10 +28,6 @@ "cols": ["GP2", "GP9", "GP8", "GP7"], "rows": ["GP26", "GP1", "GP18", "GP5"] }, - "matrix_size": { - "cols": 4, - "rows": 4 - }, "diode_direction": "COL2ROW", "encoder": { "enabled": true, From 2801dd43b28409ae1d2b8078142f009c43b6c32e Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 20:07:23 -0400 Subject: [PATCH 23/49] Update keyboards/1upkeyboards/pi60_hse/rules.mk Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk index f0b9e380da7c..997fce7e65c8 100644 --- a/keyboards/1upkeyboards/pi60_hse/rules.mk +++ b/keyboards/1upkeyboards/pi60_hse/rules.mk @@ -1,2 +1 @@ WS2812_DRIVER = vendor -ENCODER_MAP_ENABLE = yes From c94d75bd6c719e3e588f2f1a6dcdba56e4a9ac98 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 20:08:55 -0400 Subject: [PATCH 24/49] Update keyboards/1upkeyboards/sweet16v2/kb2040/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/kb2040/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json index a72977eac436..91fa58035476 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/info.json +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/info.json @@ -67,6 +67,9 @@ { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 } ] }, + "community_layouts": [ + "ortho_4x4" + ], "layouts": { "LAYOUT_ortho_4x4": { "layout": [ From 9808b8915708127c78faa8d3afcf583c7e32237b Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 20:09:12 -0400 Subject: [PATCH 25/49] Update keyboards/1upkeyboards/sweet16v2/pro_micro/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/sweet16v2/pro_micro/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json index f360be0dba31..efdb94cd7415 100644 --- a/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json +++ b/keyboards/1upkeyboards/sweet16v2/pro_micro/info.json @@ -66,6 +66,9 @@ { "flags": 4, "matrix": [3, 0], "x": 28, "y": 60 } ] }, + "community_layouts": [ + "ortho_4x4" + ], "layouts": { "LAYOUT_ortho_4x4": { "layout": [ From e155bf8d753197418e10dadb9919798e1907c8d8 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 20:09:30 -0400 Subject: [PATCH 26/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index fb1a72f65fb4..5a87fcd85caa 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -58,7 +58,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 ), - [5] = LAYOUT_60_ansi( + [5] = LAYOUT_60_ansi_split_bs_rshift( 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, 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, From c3f3f324a9fc720c39ccdac465497ebcb9510d64 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 20:10:43 -0400 Subject: [PATCH 27/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index 5a87fcd85caa..b117483ae2e4 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -66,7 +66,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 ), - [6] = LAYOUT_60_ansi( + [6] = LAYOUT_60_ansi_split_bs_rshift( 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, 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, From a43c03509f49a333cb3521e2992e214cd5c25434 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 20:10:54 -0400 Subject: [PATCH 28/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index b117483ae2e4..573e5e8e4164 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -74,7 +74,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 ), - [7] = LAYOUT_60_ansi( + [7] = LAYOUT_60_ansi_split_bs_rshift( 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, 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, From c3080741dc7cb2e6673277c463f734c74aab688e Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 20:11:03 -0400 Subject: [PATCH 29/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index 573e5e8e4164..0cc211a1d0f4 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -82,7 +82,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 ), - [8] = LAYOUT_60_ansi( + [8] = LAYOUT_60_ansi_split_bs_rshift( 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, 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, From f960a6d5ee4a8577bcf22f3c672c68d09901fb27 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 4 Oct 2022 20:11:13 -0400 Subject: [PATCH 30/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index 0cc211a1d0f4..09875daf93bf 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -90,7 +90,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 ), - [9] = LAYOUT_60_ansi( + [9] = LAYOUT_60_ansi_split_bs_rshift( 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, 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, From fca35dbc05e66bcc51c7abfc8217c1ac9195db03 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 11:18:16 -0400 Subject: [PATCH 31/49] Update keyboards/1upkeyboards/pi60_hse/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/info.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json index 6ef5f518c5d2..f85430fa8ba6 100644 --- a/keyboards/1upkeyboards/pi60_hse/info.json +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -49,6 +49,9 @@ { "flags": 2, "x": 126, "y": 51 } ] }, + "community_layouts": [ + "60_ansi_split_bs_rshift" + ], "layouts": { "LAYOUT_60_ansi": { "layout": [ From 6d68a0307a5d435000a0ba06ec9a3d781bd5263f Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 11:18:24 -0400 Subject: [PATCH 32/49] Update keyboards/1upkeyboards/pi60_hse/info.json Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json index f85430fa8ba6..012d6698a66c 100644 --- a/keyboards/1upkeyboards/pi60_hse/info.json +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -53,7 +53,7 @@ "60_ansi_split_bs_rshift" ], "layouts": { - "LAYOUT_60_ansi": { + "LAYOUT_60_ansi_split_bs_rshift": { "layout": [ { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, From e7ff77a20b772b52c6fd4894f5013bd51d6f4f04 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 11:18:39 -0400 Subject: [PATCH 33/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c index c88f35c76d79..ebce44298f0c 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi( + [0] = LAYOUT_60_ansi_split_bs_rshift( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, From 129642103c3e3c984cbc8db6b30f110a4ac6d2d0 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 11:18:54 -0400 Subject: [PATCH 34/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c index ebce44298f0c..6ee015b618d0 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL ), - [1] = LAYOUT_60_ansi( + [1] = LAYOUT_60_ansi_split_bs_rshift( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, From 248a24b9167b77d26f23c0eac623104e91236f64 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 11:22:05 -0400 Subject: [PATCH 35/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c index 6ee015b618d0..5548adb7ba3e 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS ), - [2] = LAYOUT_60_ansi( + [2] = LAYOUT_60_ansi_split_bs_rshift( 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS, KC_TRNS, From d68b92a82e439df8474cbada379ddd7848fd64ac Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 11:22:15 -0400 Subject: [PATCH 36/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index 09875daf93bf..896802f7e647 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_60_ansi( + [0] = LAYOUT_60_ansi_split_bs_rshift( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, From b3bfd77159ca53dbbd68c5082774fbcb8f15e24f Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 11:22:29 -0400 Subject: [PATCH 37/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index 896802f7e647..89bd30d83fb1 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL ), - [1] = LAYOUT_60_ansi( + [1] = LAYOUT_60_ansi_split_bs_rshift( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, From cbbb17b31bce9d2094ade60b3b3d95c71a2dc4a9 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 11:22:46 -0400 Subject: [PATCH 38/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index 89bd30d83fb1..75208be182d1 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS ), - [2] = LAYOUT_60_ansi( + [2] = LAYOUT_60_ansi_split_bs_rshift( 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS, KC_TRNS, From 18c0ee910fad934e5fb61c88896a87fe18f72a76 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 11:22:54 -0400 Subject: [PATCH 39/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index 75208be182d1..4289ff8b2853 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -42,7 +42,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 ), - [3] = LAYOUT_60_ansi( + [3] = LAYOUT_60_ansi_split_bs_rshift( 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, 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, From e9fc7f5511a78dc1f0e932a1c8532b935a52e447 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 11:23:27 -0400 Subject: [PATCH 40/49] Update keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c Co-authored-by: Joel Challis --- keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c index 4289ff8b2853..1f38a7c4c136 100644 --- a/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60_hse/keymaps/via/keymap.c @@ -50,7 +50,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 ), - [4] = LAYOUT_60_ansi( + [4] = LAYOUT_60_ansi_split_bs_rshift( 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, 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, From ce3cb2d7592b8edac1d10f0af5f743722823ecc4 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 13:00:01 -0400 Subject: [PATCH 41/49] Update rules.mk --- keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk index 8e853e0af70b..f0b9e380da7c 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk @@ -1 +1,2 @@ -WS2812_DRIVER = vendor \ No newline at end of file +WS2812_DRIVER = vendor +ENCODER_MAP_ENABLE = yes From efb2d44292b54d78debafd30f06da3826e89fa2b Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 13:00:26 -0400 Subject: [PATCH 42/49] Update rules.mk --- keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk index f0b9e380da7c..997fce7e65c8 100644 --- a/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk +++ b/keyboards/1upkeyboards/sweet16v2/kb2040/rules.mk @@ -1,2 +1 @@ WS2812_DRIVER = vendor -ENCODER_MAP_ENABLE = yes From 5cf2e020694a75d8be64b46d0614d3243f1afe70 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Wed, 5 Oct 2022 13:01:01 -0400 Subject: [PATCH 43/49] Update rules.mk --- keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk b/keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk index 36b7ba9cbc98..1189f4ad1927 100644 --- a/keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk +++ b/keyboards/1upkeyboards/sweet16v2/keymaps/via/rules.mk @@ -1,2 +1,3 @@ VIA_ENABLE = yes LTO_ENABLE = yes +ENCODER_MAP_ENABLE = yes From 180147132898cdd40a6caa09fd61a947d073f59b Mon Sep 17 00:00:00 2001 From: ziptyze Date: Fri, 7 Oct 2022 13:47:09 -0400 Subject: [PATCH 44/49] added pi60_rgb --- keyboards/1upkeyboards/pi60_rgb/config.h | 73 ++++++++ keyboards/1upkeyboards/pi60_rgb/info.json | 170 ++++++++++++++++++ .../pi60_rgb/keymaps/default/keymap.c | 36 ++++ .../pi60_rgb/keymaps/via/keymap.c | 100 +++++++++++ .../pi60_rgb/keymaps/via/rules.mk | 2 + keyboards/1upkeyboards/pi60_rgb/readme.md | 23 +++ keyboards/1upkeyboards/pi60_rgb/rules.mk | 1 + 7 files changed, 405 insertions(+) create mode 100644 keyboards/1upkeyboards/pi60_rgb/config.h create mode 100644 keyboards/1upkeyboards/pi60_rgb/info.json create mode 100644 keyboards/1upkeyboards/pi60_rgb/keymaps/default/keymap.c create mode 100644 keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c create mode 100644 keyboards/1upkeyboards/pi60_rgb/keymaps/via/rules.mk create mode 100644 keyboards/1upkeyboards/pi60_rgb/readme.md create mode 100644 keyboards/1upkeyboards/pi60_rgb/rules.mk diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h new file mode 100644 index 000000000000..19eb8d71a7d1 --- /dev/null +++ b/keyboards/1upkeyboards/pi60_rgb/config.h @@ -0,0 +1,73 @@ +// Copyright 2022 ziptyze (@ziptyze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +#define RGB_DI_PIN GP19 +#define DRIVER_LED_TOTAL 61 +#define RGBLED_NUM 61 +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES // reacts to keypresses +#define RGBLIGHT_LIMIT_VAL 125 +#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended +#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 125 +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE + +/* Bootmagic Lite key configuration */ +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json new file mode 100644 index 000000000000..0659e5b2f91d --- /dev/null +++ b/keyboards/1upkeyboards/pi60_rgb/info.json @@ -0,0 +1,170 @@ +{ + "manufacturer": "1upkeyboards", + "keyboard_name": "pi60_rgb", + "maintainer": "ziptyze", + "processor": "RP2040", + "bootloader": "rp2040", + "board": "GENERIC_RP_RP2040", + "usb": { + "device_version": "1.0.0", + "pid": "0x5602", + "vid": "0x6F75" + }, + "debounce": 5, + "diode_direction": "COL2ROW", + "dynamic_keymap": { + "layer_count": 10 + }, + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true, + "rgblight": false + }, + "matrix_pins": { + "cols": ["GP3", "GP4", "GP5", "GP20", "GP18", "GP13", "GP17", "GP16", "GP15", "GP12", "GP11", "GP14", "GP10", "GP9"], + "rows": ["GP1", "GP2", "GP8", "GP6", "GP0", "GP21"] + }, + "mouse_key": { + "enabled": true + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 1, "matrix": [5, 5], "x": 103, "y": 58 }, + { "flags": 1, "matrix": [5, 10], "x": 159, "y": 58 }, + { "flags": 1, "matrix": [5, 11], "x": 178, "y": 58 }, + { "flags": 1, "matrix": [5, 12], "x": 196, "y": 58 }, + { "flags": 1, "matrix": [5, 13], "x": 215, "y": 58 }, + { "flags": 1, "matrix": [3, 13], "x": 204, "y": 45 }, + { "flags": 4, "matrix": [3, 10], "x": 176, "y": 45 }, + { "flags": 4, "matrix": [3, 9], "x": 161, "y": 45 }, + { "flags": 4, "matrix": [3, 8], "x": 146, "y": 45 }, + { "flags": 4, "matrix": [3, 7], "x": 131, "y": 45 }, + { "flags": 4, "matrix": [3, 6], "x": 116, "y": 45 }, + { "flags": 4, "matrix": [3, 5], "x": 101, "y": 45 }, + { "flags": 4, "matrix": [3, 4], "x": 86, "y": 45 }, + { "flags": 4, "matrix": [3, 3], "x": 71, "y": 45 }, + { "flags": 4, "matrix": [3, 2], "x": 56, "y": 45 }, + { "flags": 4, "matrix": [3, 1], "x": 41, "y": 45 }, + { "flags": 1, "matrix": [4, 2], "x": 47, "y": 58 }, + { "flags": 1, "matrix": [4, 1], "x": 28, "y": 58 }, + { "flags": 1, "matrix": [4, 0], "x": 10, "y": 58 }, + { "flags": 1, "matrix": [3, 0], "x": 17, "y": 45 }, + { "flags": 1, "matrix": [2, 0], "x": 13, "y": 32 }, + { "flags": 4, "matrix": [2, 1], "x": 34, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 49, "y": 32 }, + { "flags": 4, "matrix": [2, 3], "x": 64, "y": 32 }, + { "flags": 4, "matrix": [2, 4], "x": 79, "y": 32 }, + { "flags": 4, "matrix": [2, 5], "x": 94, "y": 32 }, + { "flags": 4, "matrix": [2, 6], "x": 109, "y": 32 }, + { "flags": 4, "matrix": [2, 7], "x": 124, "y": 32 }, + { "flags": 4, "matrix": [2, 8], "x": 139, "y": 32 }, + { "flags": 4, "matrix": [2, 9], "x": 153, "y": 32 }, + { "flags": 4, "matrix": [2, 10], "x": 168, "y": 32 }, + { "flags": 4, "matrix": [2, 11], "x": 183, "y": 32 }, + { "flags": 1, "matrix": [2, 13], "x": 208, "y": 32 }, + { "flags": 1, "matrix": [1, 13], "x": 213, "y": 19 }, + { "flags": 4, "matrix": [1, 12], "x": 195, "y": 19 }, + { "flags": 4, "matrix": [1, 11], "x": 180, "y": 19 }, + { "flags": 4, "matrix": [1, 10], "x": 165, "y": 19 }, + { "flags": 4, "matrix": [1, 9], "x": 150, "y": 19 }, + { "flags": 4, "matrix": [1, 8], "x": 135, "y": 19 }, + { "flags": 4, "matrix": [1, 7], "x": 120, "y": 19 }, + { "flags": 4, "matrix": [1, 6], "x": 105, "y": 19 }, + { "flags": 4, "matrix": [1, 5], "x": 90, "y": 19 }, + { "flags": 4, "matrix": [1, 4], "x": 75, "y": 19 }, + { "flags": 4, "matrix": [1, 3], "x": 60, "y": 19 }, + { "flags": 4, "matrix": [1, 2], "x": 45, "y": 19 }, + { "flags": 4, "matrix": [1, 1], "x": 30, "y": 19 }, + { "flags": 1, "matrix": [1, 0], "x": 12, "y": 19 }, + { "flags": 1, "matrix": [0, 0], "x": 8, "y": 7 }, + { "flags": 4, "matrix": [0, 1], "x": 23, "y": 7 }, + { "flags": 4, "matrix": [0, 2], "x": 38, "y": 7 }, + { "flags": 4, "matrix": [0, 3], "x": 53, "y": 7 }, + { "flags": 4, "matrix": [0, 4], "x": 68, "y": 7 }, + { "flags": 4, "matrix": [0, 5], "x": 83, "y": 7 }, + { "flags": 4, "matrix": [0, 6], "x": 98, "y": 7 }, + { "flags": 4, "matrix": [0, 7], "x": 113, "y": 7 }, + { "flags": 4, "matrix": [0, 8], "x": 127, "y": 7 }, + { "flags": 4, "matrix": [0, 9], "x": 142, "y": 7 }, + { "flags": 4, "matrix": [0, 10], "x": 157, "y": 7 }, + { "flags": 4, "matrix": [0, 11], "x": 172, "y": 7 }, + { "flags": 4, "matrix": [0, 12], "x": 187, "y": 7 }, + { "flags": 1, "matrix": [0, 13], "x": 209, "y": 7 } + ] + }, + "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "BS", "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, + { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Caps", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "Enter", "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "label": "LShift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, + { "label": "Z", "matrix": [3, 1], "w": 1, "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 2], "w": 1, "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 3], "w": 1, "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 4], "w": 1, "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 5], "w": 1, "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 6], "w": 1, "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 7], "w": 1, "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 8], "w": 1, "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 9], "w": 1, "x": 10.25, "y": 3 }, + { "label": "/", "matrix": [3, 10], "w": 1, "x": 11.25, "y": 3 }, + { "label": "RShift", "matrix": [3, 13], "w": 2.75, "x": 12.25, "y": 3 }, + { "label": "LCtrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, + { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "Space", "matrix": [5, 5], "w": 6.25, "x": 3.75, "y": 4 }, + { "label": "RAlt", "matrix": [5, 9], "w": 1.25, "x": 10, "y": 4 }, + { "label": "RGui", "matrix": [5, 10], "w": 1.25, "x": 11.25, "y": 4 }, + { "label": "FN", "matrix": [5, 12], "w": 1.25, "x": 12.5, "y": 4 }, + { "label": "RCtrl", "matrix": [5, 13], "w": 1.25, "x": 13.75, "y": 4 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60_rgb/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60_rgb/keymaps/default/keymap.c new file mode 100644 index 000000000000..bc8a5ca95e20 --- /dev/null +++ b/keyboards/1upkeyboards/pi60_rgb/keymaps/default/keymap.c @@ -0,0 +1,36 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_ansi( + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_60_ansi( + 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, 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, 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 + ), +}; diff --git a/keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c new file mode 100644 index 000000000000..4d2e654ad681 --- /dev/null +++ b/keyboards/1upkeyboards/pi60_rgb/keymaps/via/keymap.c @@ -0,0 +1,100 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + ), + + [1] = LAYOUT_60_ansi( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, + KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS + ), + + [2] = LAYOUT_60_ansi( + 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + + [3] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [4] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [5] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [6] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [7] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [8] = LAYOUT_60_ansi( + 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, 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, 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 + ), + + [9] = LAYOUT_60_ansi( + 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, 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, 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 + ) +}; \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60_rgb/keymaps/via/rules.mk b/keyboards/1upkeyboards/pi60_rgb/keymaps/via/rules.mk new file mode 100644 index 000000000000..36b7ba9cbc98 --- /dev/null +++ b/keyboards/1upkeyboards/pi60_rgb/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/1upkeyboards/pi60_rgb/readme.md b/keyboards/1upkeyboards/pi60_rgb/readme.md new file mode 100644 index 000000000000..0cceb5595628 --- /dev/null +++ b/keyboards/1upkeyboards/pi60_rgb/readme.md @@ -0,0 +1,23 @@ +# pi60_rgb + +The pi60 RGB is a 60% pcb from 1upkeyboards. This keyboard features an ANSI layout hot swap PCB with per-key in-switch RGB lighting. The controller is a Raspberry Pi rp2040 microcontroller. + +* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze) +* Hardware Availability: (https://1upkeyboards.com/shop/controllers/1upkeyboards-pi60rgb-60-pcb/) + +Make example for this keyboard (after setting up your build environment): + + make 1upkeyboards/pi60_rgb:default + +Flashing example for this keyboard: + + make 1upkeyboards/pi60_rgb: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 2 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Bootloader button**: Hold the button on the back of the PCB and plug in the keyboard diff --git a/keyboards/1upkeyboards/pi60_rgb/rules.mk b/keyboards/1upkeyboards/pi60_rgb/rules.mk new file mode 100644 index 000000000000..8e853e0af70b --- /dev/null +++ b/keyboards/1upkeyboards/pi60_rgb/rules.mk @@ -0,0 +1 @@ +WS2812_DRIVER = vendor \ No newline at end of file From 35c2d6a789f8d2c60298df2a0261d1bc807de778 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 27 Dec 2022 13:00:39 -0500 Subject: [PATCH 45/49] added pi60 --- keyboards/1upkeyboards/pi60/config.h | 70 ++++++++ keyboards/1upkeyboards/pi60/info.json | 150 ++++++++++++++++++ .../pi60/keymaps/default/keymap.c | 45 ++++++ .../pi60/keymaps/default/rules.mk | 1 + .../1upkeyboards/pi60/keymaps/via/keymap.c | 99 ++++++++++++ .../1upkeyboards/pi60/keymaps/via/rules.mk | 3 + keyboards/1upkeyboards/pi60/readme.md | 22 +++ keyboards/1upkeyboards/pi60/rules.mk | 1 + 8 files changed, 391 insertions(+) create mode 100644 keyboards/1upkeyboards/pi60/config.h create mode 100644 keyboards/1upkeyboards/pi60/info.json create mode 100644 keyboards/1upkeyboards/pi60/keymaps/default/keymap.c create mode 100644 keyboards/1upkeyboards/pi60/keymaps/default/rules.mk create mode 100644 keyboards/1upkeyboards/pi60/keymaps/via/keymap.c create mode 100644 keyboards/1upkeyboards/pi60/keymaps/via/rules.mk create mode 100644 keyboards/1upkeyboards/pi60/readme.md create mode 100644 keyboards/1upkeyboards/pi60/rules.mk diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h new file mode 100644 index 000000000000..2d10536b4124 --- /dev/null +++ b/keyboards/1upkeyboards/pi60/config.h @@ -0,0 +1,70 @@ +// Copyright 2022 ziptyze (@ziptyze) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +#define DYNAMIC_KEYMAP_LAYER_COUNT 10 + +#define NOP_FUDGE 0.4 + +#define RGB_DI_PIN GP17 +#define RGB_MATRIX_LED_COUNT 21 +//#define RGB_MATRIX_FRAMEBUFFER_EFFECTS +//#define RGB_MATRIX_KEYPRESSES +#define RGB_DISABLE_WHEN_USB_SUSPENDED +// RGB Matrix Animation modes. Explicitly enabled +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +//# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +//# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined +//# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +//# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +//# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +//# define ENABLE_RGB_MATRIX_SPLASH +//# define ENABLE_RGB_MATRIX_MULTISPLASH +//# define ENABLE_RGB_MATRIX_SOLID_SPLASH +//# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH + + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +#define LOCKING_RESYNC_ENABLE \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json new file mode 100644 index 000000000000..80f0c6afdd62 --- /dev/null +++ b/keyboards/1upkeyboards/pi60/info.json @@ -0,0 +1,150 @@ +{ + "manufacturer": "1upkeyboards", + "keyboard_name": "pi60", + "maintainer": "ziptyze", + "processor": "RP2040", + "bootloader": "rp2040", + "board": "GENERIC_RP_RP2040", + "usb": { + "device_ver": "0x0001", + "device_version": "1.0.0", + "pid": "0x5604", + "vid": "0x6F75" + }, + "debounce": 5, + "diode_direction": "COL2ROW", + "features": { + "audio": false, + "backlight": false, + "bootmagic": true, + "command": false, + "console": false, + "encoder": true, + "extrakey": true, + "mousekey": true, + "nkro": false, + "rgb_matrix": true, + "rgblight": false + }, + "matrix_pins": { + "cols": ["GP5", "GP8", "GP11", "GP6", "GP7", "GP0", "GP26", "GP10", "GP9", "GP1", "GP18", "GP20", "GP21", "GP27", "GP28", "GP19"], + "rows": ["GP12", "GP13", "GP16", "GP25", "GP29"] + }, + "encoder": { + "enabled": true, + "rotary": [ + { + "pin_a": "GP4", + "pin_b": "GP3" + }, + { + "pin_a": "GP22", + "pin_b": "GP2" + }, + { + "pin_a": "GP23", + "pin_b": "GP24" + } + ] + }, + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 2, "x": 17, "y": 50 }, + { "flags": 2, "x": 37, "y": 50 }, + { "flags": 2, "x": 56, "y": 50 }, + { "flags": 2, "x": 77, "y": 50 }, + { "flags": 2, "x": 94, "y": 50 }, + { "flags": 2, "x": 114, "y": 50 }, + { "flags": 2, "x": 131, "y": 50 }, + { "flags": 2, "x": 148, "y": 50 }, + { "flags": 2, "x": 168, "y": 50 }, + { "flags": 2, "x": 188, "y": 50 }, + { "flags": 2, "x": 209, "y": 50 }, + { "flags": 2, "x": 209, "y": 13 }, + { "flags": 2, "x": 187, "y": 13 }, + { "flags": 2, "x": 166, "y": 13 }, + { "flags": 2, "x": 145, "y": 13 }, + { "flags": 2, "x": 126, "y": 13 }, + { "flags": 2, "x": 109, "y": 13 }, + { "flags": 2, "x": 90, "y": 13 }, + { "flags": 2, "x": 71, "y": 13 }, + { "flags": 2, "x": 54, "y": 13 }, + { "flags": 2, "x": 20, "y": 13 } + ] + }, + "layouts": { + "LAYOUT_60_ansi": { + "layout": [ + { "label": "Esc", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "8", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "9", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "0", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "-", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "=", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "BS", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "~", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 }, + { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 }, + { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 }, + { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 }, + { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 }, + { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 }, + { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 }, + { "label": "I", "matrix": [1, 8], "w": 1, "x": 8.5, "y": 1 }, + { "label": "O", "matrix": [1, 9], "w": 1, "x": 9.5, "y": 1 }, + { "label": "P", "matrix": [1, 10], "w": 1, "x": 10.5, "y": 1 }, + { "label": "[", "matrix": [1, 11], "w": 1, "x": 11.5, "y": 1 }, + { "label": "]", "matrix": [1, 12], "w": 1, "x": 12.5, "y": 1 }, + { "label": "|", "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "label": "Caps", "matrix": [2, 15], "w": 1.75, "x": 0, "y": 2 }, + { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 }, + { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 }, + { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 }, + { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 }, + { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 }, + { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 }, + { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 }, + { "label": "K", "matrix": [2, 8], "w": 1, "x": 8.75, "y": 2 }, + { "label": "L", "matrix": [2, 9], "w": 1, "x": 9.75, "y": 2 }, + { "label": ";", "matrix": [2, 10], "w": 1, "x": 10.75, "y": 2 }, + { "label": "'", "matrix": [2, 11], "w": 1, "x": 11.75, "y": 2 }, + { "label": "ISO'", "matrix": [2, 12], "w": 1, "x": 12.75, "y": 2 }, + { "label": "Enter", "matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2 }, + { "label": "LShift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, + { "label": "ISO<>", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "w": 1, "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 9], "w": 1, "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 10], "w": 1, "x": 10.25, "y": 3 }, + { "label": "/", "matrix": [3, 11], "w": 1.75, "x": 11.25, "y": 3 }, + { "label": "RShift", "matrix": [3, 12], "w": 1, "x": 13, "y": 3 }, + { "label": "FN", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 }, + { "label": "LCtrl", "matrix": [4, 15], "w": 1.25, "x": 0, "y": 4 }, + { "label": "LGui", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, + { "label": "LAlt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "label": "LSpace", "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 }, + { "label": "CSpace", "matrix": [4, 6], "w": 1.25, "x": 6.5, "y": 4 }, + { "label": "RSpace", "matrix": [4, 8], "w": 2.25, "x": 7.75, "y": 4 }, + { "label": "RAlt", "matrix": [4, 10], "w": 1, "x": 10, "y": 4 }, + { "label": "FN", "matrix": [4, 11], "w": 1, "x": 11, "y": 4 }, + { "label": "Mid1U", "matrix": [4, 12], "w": 1, "x": 12, "y": 4 }, + { "label": "Menu", "matrix": [4, 13], "w": 1, "x": 13, "y": 4 }, + { "label": "RCtrl", "matrix": [4, 14], "w": 1, "x": 14, "y": 4 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c new file mode 100644 index 000000000000..4b7d5988ecde --- /dev/null +++ b/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c @@ -0,0 +1,45 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_TRNS, KC_ENT, + KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_TRNS, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_60_ansi( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, 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] = LAYOUT_60_ansi( + 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, 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 + ), + + [3] = LAYOUT_60_ansi( + 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, 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, 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, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } +}; +#endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60/keymaps/default/rules.mk b/keyboards/1upkeyboards/pi60/keymaps/default/rules.mk new file mode 100644 index 000000000000..a40474b4d5c7 --- /dev/null +++ b/keyboards/1upkeyboards/pi60/keymaps/default/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c new file mode 100644 index 000000000000..8c69314fdf99 --- /dev/null +++ b/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c @@ -0,0 +1,99 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_60_ansi( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_GRV, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_TRNS, KC_ENT, + KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, KC_UP, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_TRNS, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_60_ansi( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS, + KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_TRNS, + KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_HOME, KC_PGUP, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDN, 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] = LAYOUT_60_ansi( + 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SN,RGB_M_K, RGB_M_X, RGB_M_G, 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 + ), + + [3] = LAYOUT_60_ansi( + 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, 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, 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, KC_TRNS, KC_TRNS + ), + + [4] = LAYOUT_60_ansi( + 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, 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, 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, KC_TRNS, KC_TRNS + ), + + [5] = LAYOUT_60_ansi( + 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, 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, 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, KC_TRNS, KC_TRNS + ), + + [6] = LAYOUT_60_ansi( + 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, 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, 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, KC_TRNS, KC_TRNS + ), + + [7] = LAYOUT_60_ansi( + 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, 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, 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, KC_TRNS, KC_TRNS + ), + + [8] = LAYOUT_60_ansi( + 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, 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, 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, KC_TRNS, KC_TRNS + ), + + [9] = LAYOUT_60_ansi( + 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, 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, 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, KC_TRNS, KC_TRNS + ) +}; + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [4] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [5] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [6] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [7] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, + [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60/keymaps/via/rules.mk b/keyboards/1upkeyboards/pi60/keymaps/via/rules.mk new file mode 100644 index 000000000000..aaf0497be139 --- /dev/null +++ b/keyboards/1upkeyboards/pi60/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes +ENCODER_MAP_ENABLE = yes \ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60/readme.md b/keyboards/1upkeyboards/pi60/readme.md new file mode 100644 index 000000000000..f8444b04a6ea --- /dev/null +++ b/keyboards/1upkeyboards/pi60/readme.md @@ -0,0 +1,22 @@ +# pi60_rgb + +The pi60 is a solderable 60% pcb supporting millions of configuration options including standard options like ansi, iso, and tsangan as well as various split-shift and split-space configurations with three possible encoder positions. The board has RGB underglow with 21 leds and is compatible with many o-ring mount cases. The pcb is available with USB and an external i2c connector, or daughterboard connector. + +* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze) + +Make example for this keyboard (after setting up your build environment): + + make 1upkeyboards/pi60:default + +Flashing example for this keyboard: + + make 1upkeyboards/pi60: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 2 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Bootloader button**: Hold the button on the back of the PCB and plug in the keyboard diff --git a/keyboards/1upkeyboards/pi60/rules.mk b/keyboards/1upkeyboards/pi60/rules.mk new file mode 100644 index 000000000000..8e853e0af70b --- /dev/null +++ b/keyboards/1upkeyboards/pi60/rules.mk @@ -0,0 +1 @@ +WS2812_DRIVER = vendor \ No newline at end of file From 1e86324e3d0a2bcdbc5f8cf2eee0f3e4f517363c Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 27 Dec 2022 14:32:43 -0500 Subject: [PATCH 46/49] Update keyboards/1upkeyboards/pi60/config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/1upkeyboards/pi60/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/1upkeyboards/pi60/config.h b/keyboards/1upkeyboards/pi60/config.h index 2d10536b4124..24a8d9218bb4 100644 --- a/keyboards/1upkeyboards/pi60/config.h +++ b/keyboards/1upkeyboards/pi60/config.h @@ -7,8 +7,6 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 10 -#define NOP_FUDGE 0.4 - #define RGB_DI_PIN GP17 #define RGB_MATRIX_LED_COUNT 21 //#define RGB_MATRIX_FRAMEBUFFER_EFFECTS From f4470fe18bcedd7d43bb27066ba0f715b951f40b Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 27 Dec 2022 14:33:16 -0500 Subject: [PATCH 47/49] Update keyboards/1upkeyboards/pi60/info.json Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/1upkeyboards/pi60/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json index 80f0c6afdd62..bbc17d0e1704 100644 --- a/keyboards/1upkeyboards/pi60/info.json +++ b/keyboards/1upkeyboards/pi60/info.json @@ -6,7 +6,6 @@ "bootloader": "rp2040", "board": "GENERIC_RP_RP2040", "usb": { - "device_ver": "0x0001", "device_version": "1.0.0", "pid": "0x5604", "vid": "0x6F75" From b5c7e8dc4b0458762f812d832f807cca6aca5486 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 27 Dec 2022 14:41:35 -0500 Subject: [PATCH 48/49] Update keymap.c --- .../1upkeyboards/pi60/keymaps/default/keymap.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c b/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c index 4b7d5988ecde..fb11a271d7f2 100644 --- a/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c +++ b/keyboards/1upkeyboards/pi60/keymaps/default/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -42,4 +58,4 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) } }; -#endif \ No newline at end of file +#endif From 8fdc719f0c00b4219fef58284af9a66777157e31 Mon Sep 17 00:00:00 2001 From: ziptyze Date: Tue, 27 Dec 2022 14:42:08 -0500 Subject: [PATCH 49/49] Update keymap.c --- .../1upkeyboards/pi60/keymaps/via/keymap.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c b/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c index 8c69314fdf99..70739d2e9e55 100644 --- a/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c +++ b/keyboards/1upkeyboards/pi60/keymaps/via/keymap.c @@ -1,3 +1,19 @@ +/* Copyright 2022 ziptyze + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -96,4 +112,4 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [8] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [9] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, }; -#endif \ No newline at end of file +#endif