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

This commit is contained in:
QMK Bot 2024-01-13 06:14:16 +00:00
commit 889d32f6ab
6 changed files with 356 additions and 0 deletions

View File

@ -0,0 +1,258 @@
{
"manufacturer": "1upkeyboards",
"keyboard_name": "pi60_rgb_v2",
"maintainer": "ziptyze",
"processor": "RP2040",
"bootloader": "rp2040",
"usb": {
"device_version": "1.0.0",
"pid": "0x5612",
"vid": "0x6F75"
},
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 10
},
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true,
"rgb_matrix": true,
},
"qmk": {
"locking": {
"enabled": true,
"resync": true
}
},
"matrix_pins": {
"cols": ["GP25", "GP1", "GP15", "GP4", "GP5", "GP14", "GP6", "GP7", "GP8", "GP13", "GP12", "GP9", "GP11", "GP10"],
"rows": ["GP29", "GP27", "GP26", "GP17", "GP16"]
},
"rgb_matrix": {
"max_brightness": 125,
"sleep": true,
"animations": {
"alphas_mods": true,
"band_pinwheel_sat": true,
"band_pinwheel_val": true,
"band_sat": true,
"band_spiral_sat": true,
"band_spiral_val": true,
"band_val": true,
"breathing": true,
"cycle_all": true,
"cycle_left_right": true,
"cycle_out_in": true,
"cycle_out_in_dual": true,
"cycle_pinwheel": true,
"cycle_spiral": true,
"cycle_up_down": true,
"digital_rain": true,
"dual_beacon": true,
"gradient_left_right": true,
"gradient_up_down": true,
"hue_breathing": true,
"hue_pendulum": true,
"hue_wave": true,
"jellybean_raindrops": true,
"multisplash": true,
"pixel_flow": true,
"pixel_rain": true,
"rainbow_beacon": true,
"rainbow_moving_chevron": true,
"rainbow_pinwheels": true,
"raindrops": true,
"solid_multisplash": true,
"solid_reactive": true,
"solid_reactive_cross": true,
"solid_reactive_multicross": true,
"solid_reactive_multinexus": true,
"solid_reactive_multiwide": true,
"solid_reactive_nexus": true,
"solid_reactive_simple": true,
"solid_reactive_wide": true,
"solid_splash": true,
"splash": true,
"typing_heatmap": true
},
"driver": "ws2812",
"layout": [
{"x": 4, "y": 5, "flags": 2},
{"matrix": [0, 0], "x": 8, "y": 7, "flags": 1},
{"matrix": [0, 1], "x": 23, "y": 7, "flags": 4},
{"x": 30, "y": 7, "flags": 2},
{"matrix": [0, 2], "x": 37, "y": 7, "flags": 4},
{"x": 45, "y": 7, "flags": 2},
{"matrix": [0, 3], "x": 52, "y": 7, "flags": 4},
{"x": 60, "y": 7, "flags": 2},
{"matrix": [0, 4], "x": 67, "y": 7, "flags": 4},
{"x": 75, "y": 7, "flags": 2},
{"matrix": [0, 5], "x": 82, "y": 7, "flags": 4},
{"x": 90, "y": 7, "flags": 2},
{"matrix": [0, 6], "x": 97, "y": 7, "flags": 4},
{"x": 105, "y": 7, "flags": 2},
{"matrix": [0, 7], "x": 112, "y": 7, "flags": 4},
{"x": 120, "y": 7, "flags": 2},
{"matrix": [0, 8], "x": 127, "y": 7, "flags": 4},
{"x": 135, "y": 7, "flags": 2},
{"matrix": [0, 9], "x": 142, "y": 7, "flags": 4},
{"x": 149, "y": 7, "flags": 2},
{"matrix": [0, 10], "x": 157, "y": 7, "flags": 4},
{"x": 164, "y": 7, "flags": 2},
{"matrix": [0, 11], "x": 172, "y": 7, "flags": 4},
{"x": 179, "y": 7, "flags": 2},
{"matrix": [0, 12], "x": 187, "y": 7, "flags": 4},
{"x": 198, "y": 7, "flags": 2},
{"matrix": [0, 13], "x": 209, "y": 7, "flags": 1},
{"x": 220, "y": 7, "flags": 2},
{"x": 220, "y": 19, "flags": 2},
{"matrix": [1, 13], "x": 213, "y": 19, "flags": 1},
{"matrix": [1, 12], "x": 194, "y": 19, "flags": 4},
{"matrix": [1, 11], "x": 179, "y": 19, "flags": 4},
{"matrix": [1, 10], "x": 164, "y": 19, "flags": 4},
{"matrix": [1, 9], "x": 149, "y": 19, "flags": 4},
{"matrix": [1, 8], "x": 134, "y": 19, "flags": 4},
{"matrix": [1, 7], "x": 119, "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": 4},
{"matrix": [1, 0], "x": 11, "y": 19, "flags": 1},
{"x": 4, "y": 19, "flags": 2},
{"x": 4, "y": 32, "flags": 2},
{"matrix": [2, 0], "x": 13, "y": 32, "flags": 1},
{"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": 108, "y": 32, "flags": 4},
{"matrix": [2, 7], "x": 123, "y": 32, "flags": 4},
{"matrix": [2, 8], "x": 138, "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": 4},
{"matrix": [2, 13], "x": 207, "y": 32, "flags": 1},
{"x": 220, "y": 32, "flags": 2},
{"x": 220, "y": 45, "flags": 2},
{"matrix": [3, 13], "x": 203, "y": 45, "flags": 1},
{"matrix": [3, 10], "x": 175, "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": 135, "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": 4},
{"matrix": [3, 0], "x": 17, "y": 45, "flags": 1},
{"x": 4, "y": 45, "flags": 2},
{"x": 4, "y": 57, "flags": 2},
{"matrix": [4, 0], "x": 9, "y": 57, "flags": 1},
{"x": 15, "y": 57, "flags": 2},
{"x": 23, "y": 57, "flags": 2},
{"matrix": [4, 1], "x": 28, "y": 57, "flags": 1},
{"x": 34, "y": 57, "flags": 2},
{"x": 41, "y": 57, "flags": 2},
{"matrix": [4, 2], "x": 47, "y": 57, "flags": 1},
{"x": 53, "y": 57, "flags": 2},
{"x": 67, "y": 57, "flags": 2},
{"x": 71, "y": 57, "flags": 1},
{"x": 81, "y": 57, "flags": 2},
{"x": 95, "y": 57, "flags": 2},
{"matrix": [4, 5], "x": 103, "y": 57, "flags": 1},
{"x": 110, "y": 57, "flags": 2},
{"x": 125, "y": 57, "flags": 2},
{"x": 134, "y": 57, "flags": 1},
{"x": 139, "y": 57, "flags": 2},
{"x": 153, "y": 57, "flags": 2},
{"matrix": [4, 9], "x": 159, "y": 57, "flags": 1},
{"x": 165, "y": 57, "flags": 2},
{"x": 172, "y": 57, "flags": 2},
{"matrix": [4, 10], "x": 177, "y": 57, "flags": 1},
{"x": 183, "y": 57, "flags": 2},
{"x": 190, "y": 57, "flags": 2},
{"matrix": [4, 12], "x": 196, "y": 57, "flags": 1},
{"x": 202, "y": 57, "flags": 2},
{"x": 209, "y": 57, "flags": 2},
{"matrix": [4, 13], "x": 215, "y": 57, "flags": 1},
{"x": 220, "y": 57, "flags": 2}
]
},
"ws2812": {
"driver": "vendor",
"pin": "GP28"
},
"community_layouts" : ["60_ansi"],
"layouts": {
"LAYOUT_60_ansi": {
"layout": [
{"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "1", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "2", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "3", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "4", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "5", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "6", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "7", "matrix": [0, 7], "x": 7, "y": 0},
{"label": "8", "matrix": [0, 8], "x": 8, "y": 0},
{"label": "9", "matrix": [0, 9], "x": 9, "y": 0},
{"label": "0", "matrix": [0, 10], "x": 10, "y": 0},
{"label": "-", "matrix": [0, 11], "x": 11, "y": 0},
{"label": "=", "matrix": [0, 12], "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], "x": 1.5, "y": 1},
{"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1},
{"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1},
{"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1},
{"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1},
{"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1},
{"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1},
{"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1},
{"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1},
{"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1},
{"label": "]", "matrix": [1, 12], "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], "x": 1.75, "y": 2},
{"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2},
{"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2},
{"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2},
{"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2},
{"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2},
{"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2},
{"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2},
{"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2},
{"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2},
{"label": "'", "matrix": [2, 11], "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], "x": 2.25, "y": 3},
{"label": "X", "matrix": [3, 2], "x": 3.25, "y": 3},
{"label": "C", "matrix": [3, 3], "x": 4.25, "y": 3},
{"label": "V", "matrix": [3, 4], "x": 5.25, "y": 3},
{"label": "B", "matrix": [3, 5], "x": 6.25, "y": 3},
{"label": "N", "matrix": [3, 6], "x": 7.25, "y": 3},
{"label": "M", "matrix": [3, 7], "x": 8.25, "y": 3},
{"label": ",", "matrix": [3, 8], "x": 9.25, "y": 3},
{"label": ".", "matrix": [3, 9], "x": 10.25, "y": 3},
{"label": "/", "matrix": [3, 10], "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": [4, 5], "w": 6.25, "x": 3.75, "y": 4},
{"label": "RAlt", "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4},
{"label": "RGui", "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4},
{"label": "FN", "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4},
{"label": "RCtrl", "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4}
]
}
}
}

View File

@ -0,0 +1,28 @@
/* 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
)
};

View File

@ -0,0 +1,44 @@
/* 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_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_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
)
};

View File

@ -0,0 +1,2 @@
VIA_ENABLE = yes
LTO_ENABLE = yes

View File

@ -0,0 +1,24 @@
# 1up pi60 rgb v2
![1up pi60 rgb v2](https://i.imgur.com/H1tRGZh.png)
The pi60 RGB v2 is a 60% pcb from 1upkeyboards. This keyboard features an ANSI layout hot swap PCB with per-key in-switch RGB lighting as well as RGB underglow. The controller is a Raspberry Pi rp2040 microcontroller.
* Keyboard Maintainer: [ziptyze](https://github.com/ziptyze)
Make example for this keyboard (after setting up your build environment):
make 1upkeyboards/pi60_rgb_v2:default
Flashing example for this keyboard:
make 1upkeyboards/pi60_rgb_v2: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