Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

first pi60rgb_v2 commit #22156

Merged
merged 20 commits into from
Jan 13, 2024
Merged

first pi60rgb_v2 commit #22156

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
aca1e51
first pi60rgb_v2 commit
ziptyze Sep 14, 2023
29f6156
Update readme.md
ziptyze Sep 28, 2023
d49ff42
Apply suggestions from code review
ziptyze Sep 29, 2023
d5da578
Update keyboards/1upkeyboards/1up_pi60_rgb_v2/info.json
ziptyze Sep 30, 2023
3d9f28d
Apply suggestions from code review
ziptyze Oct 4, 2023
f88ff12
Update info.json
ziptyze Oct 6, 2023
ad564a7
Update keyboards/1upkeyboards/1up_pi60_rgb_v2/info.json
ziptyze Oct 6, 2023
51e9de8
Update keyboards/1upkeyboards/1up_pi60_rgb_v2/readme.md
ziptyze Oct 6, 2023
0a488f2
Update readme.md
ziptyze Oct 7, 2023
0b40c01
Update readme.md
ziptyze Oct 7, 2023
e1f9bbe
Update readme.md
ziptyze Oct 7, 2023
aca8e42
Update readme.md
ziptyze Oct 7, 2023
9cf353b
Merge branch 'qmk:master' into 1up_pi60_rgb
ziptyze Dec 13, 2023
4ccfd57
change file names as requested
ziptyze Dec 13, 2023
b29fec3
Update keyboards/1upkeyboards/pi60_rgb_v2/config.h
ziptyze Dec 15, 2023
86f67f2
Merge branch 'master' into 1up_pi60_rgb
ziptyze Dec 15, 2023
bff1d8c
Merge branch 'master' into 1up_pi60_rgb
ziptyze Dec 17, 2023
37ef5cf
Apply suggestions from code review
ziptyze Dec 26, 2023
0338892
Merge branch 'master' into 1up_pi60_rgb
ziptyze Dec 26, 2023
c163d90
Delete config.h
ziptyze Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Co-authored-by: jack <0x6a73@protonmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
  • Loading branch information
@ziptyze @waffle87 @drashna
3 people authored Sep 29, 2023
commit d49ff420da5edcfd8fb6ba35b9931d262c220152
1 change: 0 additions & 1 deletion keyboards/1upkeyboards/1up_pi60_rgb_v2/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
#pragma once

#define RGB_MATRIX_LED_COUNT 104
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 125
#define RGB_MATRIX_KEYPRESSES // reacts to keypresses
#define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
Expand Down
55 changes: 1 addition & 54 deletions keyboards/1upkeyboards/1up_pi60_rgb_v2/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,17 @@
"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": ["GP25", "GP1", "GP15", "GP4", "GP5", "GP14", "GP6", "GP7", "GP8", "GP13", "GP12", "GP9", "GP11", "GP10"],
"rows": ["GP29", "GP27", "GP26", "GP17", "GP16"]
},
"rgb_matrix": {
ziptyze marked this conversation as resolved.
Show resolved Hide resolved
"max_brightness": 125,
"animations": {
"alphas_mods": true,
"band_pinwheel_sat": true,
Expand Down Expand Up @@ -77,61 +72,34 @@
"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},
Expand All @@ -146,10 +114,8 @@
{"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},
Expand All @@ -163,10 +129,8 @@
{"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},
Expand All @@ -179,53 +143,36 @@
{"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}
]
},
Expand Down
10 changes: 1 addition & 9 deletions keyboards/1upkeyboards/1up_pi60_rgb_v2/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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
),
)
};
56 changes: 0 additions & 56 deletions keyboards/1upkeyboards/1up_pi60_rgb_v2/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,61 +40,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
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
)
};