Merge remote-tracking branch 'origin/master' into develop

7 files changed, 405 insertions, 0 deletions

diff --git a/keyboards/1upkeyboards/pi60_rgb/config.h b/keyboards/1upkeyboards/pi60_rgb/config.h
new file mode 100644
index 0000000000..19eb8d71a7
--- /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 0000000000..0659e5b2f9
--- /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 0000000000..bc8a5ca95e
--- /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 <http://www.gnu.org/licenses/>.
+ */
+
+#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 0000000000..4d2e654ad6
--- /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 <http://www.gnu.org/licenses/>.
+ */
+
+#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 0000000000..36b7ba9cbc
--- /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 0000000000..0cceb55956
--- /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 0000000000..8e853e0af7
--- /dev/null
+++ b/keyboards/1upkeyboards/pi60_rgb/rules.mk
@@ -0,0 +1 @@
+WS2812_DRIVER = vendor
\ No newline at end of file