diff options
Diffstat (limited to 'keyboards/1upkeyboards')
29 files changed, 203 insertions, 284 deletions
diff --git a/keyboards/1upkeyboards/1up60hse/1up60hse.c b/keyboards/1upkeyboards/1up60hse/1up60hse.c deleted file mode 100644 index fa62f52e64..0000000000 --- a/keyboards/1upkeyboards/1up60hse/1up60hse.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 MechMerlin - * - * 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 "1up60hse.h" diff --git a/keyboards/1upkeyboards/1up60hse/config.h b/keyboards/1upkeyboards/1up60hse/config.h index b58eef1085..7d0ad0b141 100644 --- a/keyboards/1upkeyboards/1up60hse/config.h +++ b/keyboards/1upkeyboards/1up60hse/config.h @@ -17,25 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * -*/ -#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 } -#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, E6, D1, D0, D2, D3, D5, D6, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -51,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_SLEEP -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/1upkeyboards/1up60hse/info.json b/keyboards/1upkeyboards/1up60hse/info.json index 07f35c7340..010a82cb5e 100644 --- a/keyboards/1upkeyboards/1up60hse/info.json +++ b/keyboards/1upkeyboards/1up60hse/info.json @@ -8,6 +8,11 @@ "pid": "0x6873", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "E6", "D1", "D0", "D2", "D3", "D5", "D6", "D7"], + "rows": ["B3", "B2", "B1", "B0", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, diff --git a/keyboards/1upkeyboards/1up60hte/1up60hte.c b/keyboards/1upkeyboards/1up60hte/1up60hte.c deleted file mode 100644 index 460e42a0e5..0000000000 --- a/keyboards/1upkeyboards/1up60hte/1up60hte.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2019 Bubnick - -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 "1up60hte.h" diff --git a/keyboards/1upkeyboards/1up60hte/config.h b/keyboards/1upkeyboards/1up60hte/config.h index ff5f010cbe..59e80d7fd0 100644 --- a/keyboards/1upkeyboards/1up60hte/config.h +++ b/keyboards/1upkeyboards/1up60hte/config.h @@ -18,14 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B2, B1, B0, D4 } -#define MATRIX_COL_PINS { F6, F5, F4, F1, E6, D0, D1, D2, D3, D5, D6, D7, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -33,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F0 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -48,4 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/1upkeyboards/1up60hte/info.json b/keyboards/1upkeyboards/1up60hte/info.json index 98a9082989..383c7f6525 100644 --- a/keyboards/1upkeyboards/1up60hte/info.json +++ b/keyboards/1upkeyboards/1up60hte/info.json @@ -8,6 +8,11 @@ "pid": "0x6874", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "F1", "E6", "D0", "D1", "D2", "D3", "D5", "D6", "D7", "B4", "B5"], + "rows": ["B3", "B2", "B1", "B0", "D4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, diff --git a/keyboards/1upkeyboards/1up60rgb/1up60rgb.c b/keyboards/1upkeyboards/1up60rgb/1up60rgb.c deleted file mode 100644 index 4ba631c797..0000000000 --- a/keyboards/1upkeyboards/1up60rgb/1up60rgb.c +++ /dev/null @@ -1 +0,0 @@ -#include "1up60rgb.h" diff --git a/keyboards/1upkeyboards/1up60rgb/config.h b/keyboards/1upkeyboards/1up60rgb/config.h index 806f23075f..6a83a74a89 100644 --- a/keyboards/1upkeyboards/1up60rgb/config.h +++ b/keyboards/1upkeyboards/1up60rgb/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -15,7 +7,6 @@ #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN E2 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -30,4 +21,3 @@ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/1upkeyboards/1up60rgb/info.json b/keyboards/1upkeyboards/1up60rgb/info.json index 57a0143544..b0ea1ed036 100644 --- a/keyboards/1upkeyboards/1up60rgb/info.json +++ b/keyboards/1upkeyboards/1up60rgb/info.json @@ -8,6 +8,11 @@ "pid": "0x7267", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B7", "D4", "B1", "B0", "B5", "B4", "D7", "D6", "B3", "F4"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 5 diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h index 5d3841ae85..ecc8d2611a 100644 --- a/keyboards/1upkeyboards/pi40/config.h +++ b/keyboards/1upkeyboards/pi40/config.h @@ -12,7 +12,7 @@ #define RGB_DI_PIN GP0 # define RGB_MATRIX_KEYPRESSES // reacts to keypresses -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS # define RGBLIGHT_LIMIT_VAL 150 #ifdef RGB_MATRIX_ENABLE # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json index b3c64f7dd4..2527688245 100644 --- a/keyboards/1upkeyboards/pi40/grid_v1_1/info.json +++ b/keyboards/1upkeyboards/pi40/grid_v1_1/info.json @@ -13,6 +13,9 @@ "dynamic_keymap": { "layer_count": 10 }, + "ws2812": { + "driver": "vendor" + }, "features": { "audio": false, "backlight": false, diff --git a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json index d476109f79..df437aae02 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_0/info.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_0/info.json @@ -13,6 +13,9 @@ "dynamic_keymap": { "layer_count": 10 }, + "ws2812": { + "driver": "vendor" + }, "features": { "audio": false, "backlight": false, diff --git a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json index 9e01928554..842564f561 100644 --- a/keyboards/1upkeyboards/pi40/mit_v1_1/info.json +++ b/keyboards/1upkeyboards/pi40/mit_v1_1/info.json @@ -13,6 +13,9 @@ "dynamic_keymap": { "layer_count": 10 }, + "ws2812": { + "driver": "vendor" + }, "features": { "audio": false, "backlight": false, diff --git a/keyboards/1upkeyboards/pi40/rules.mk b/keyboards/1upkeyboards/pi40/rules.mk index 75f06c3f2b..e858deae6a 100644 --- a/keyboards/1upkeyboards/pi40/rules.mk +++ b/keyboards/1upkeyboards/pi40/rules.mk @@ -1,5 +1,3 @@ -WS2812_DRIVER = vendor - OLED_ENABLE = yes OLED_DRIVER = SSD1306 diff --git a/keyboards/1upkeyboards/pi60/info.json b/keyboards/1upkeyboards/pi60/info.json index d8a63123cf..8330ac9205 100644 --- a/keyboards/1upkeyboards/pi60/info.json +++ b/keyboards/1upkeyboards/pi60/info.json @@ -24,6 +24,9 @@ "rgb_matrix": true, "rgblight": false }, + "ws2812": { + "driver": "vendor" + }, "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"] @@ -74,74 +77,74 @@ "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": "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], "x": 13, "y": 0 }, + { "label": "~", "matrix": [0, 14], "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": "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, 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": "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": "ISO'", "matrix": [2, 12], "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": "ISO<>", "matrix": [3, 1], "x": 1.25, "y": 3 }, + { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 }, + { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 }, + { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 }, + { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 }, + { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 }, + { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 }, + { "label": "M", "matrix": [3, 8], "x": 8.25, "y": 3 }, + { "label": ",", "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "label": ".", "matrix": [3, 10], "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": "RShift", "matrix": [3, 12], "x": 13, "y": 3 }, + { "label": "FN", "matrix": [3, 14], "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 } + { "label": "RAlt", "matrix": [4, 10], "x": 10, "y": 4 }, + { "label": "FN", "matrix": [4, 11], "x": 11, "y": 4 }, + { "label": "Mid1U", "matrix": [4, 12], "x": 12, "y": 4 }, + { "label": "Menu", "matrix": [4, 13], "x": 13, "y": 4 }, + { "label": "RCtrl", "matrix": [4, 14], "x": 14, "y": 4 } ] } } diff --git a/keyboards/1upkeyboards/pi60/rules.mk b/keyboards/1upkeyboards/pi60/rules.mk index 8e853e0af7..e69de29bb2 100644 --- a/keyboards/1upkeyboards/pi60/rules.mk +++ b/keyboards/1upkeyboards/pi60/rules.mk @@ -1 +0,0 @@ -WS2812_DRIVER = vendor
\ No newline at end of file diff --git a/keyboards/1upkeyboards/pi60_hse/info.json b/keyboards/1upkeyboards/pi60_hse/info.json index 2fb271382f..f2e60e34fd 100644 --- a/keyboards/1upkeyboards/pi60_hse/info.json +++ b/keyboards/1upkeyboards/pi60_hse/info.json @@ -23,6 +23,9 @@ "rgb_matrix": true, "rgblight": false }, + "ws2812": { + "driver": "vendor" + }, "matrix_pins": { "cols": ["GP9", "GP8", "GP6", "GP5", "GP14", "GP20", "GP13", "GP12", "GP11", "GP16", "GP17", "GP10", "GP19", "GP18"], "rows": ["GP4", "GP3", "GP2", "GP1", "GP0", "GP21"] @@ -54,61 +57,61 @@ "layouts": { "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 }, - { "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": "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], "x": 13, "y": 0 }, + { "label": "~", "matrix": [1, 13], "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": "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": [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": "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], "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": "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, 12], "w": 1.75, "x": 12.25, "y": 3 }, - { "label": "FN", "matrix": [3, 13], "w": 1, "x": 14, "y": 3 }, + { "label": "FN", "matrix": [3, 13], "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 }, diff --git a/keyboards/1upkeyboards/pi60_hse/rules.mk b/keyboards/1upkeyboards/pi60_hse/rules.mk index 997fce7e65..e69de29bb2 100644 --- a/keyboards/1upkeyboards/pi60_hse/rules.mk +++ b/keyboards/1upkeyboards/pi60_hse/rules.mk @@ -1 +0,0 @@ -WS2812_DRIVER = vendor diff --git a/keyboards/1upkeyboards/pi60_rgb/info.json b/keyboards/1upkeyboards/pi60_rgb/info.json index 22afdb58a0..235728ed2d 100644 --- a/keyboards/1upkeyboards/pi60_rgb/info.json +++ b/keyboards/1upkeyboards/pi60_rgb/info.json @@ -26,6 +26,9 @@ "rgb_matrix": true, "rgblight": false }, + "ws2812": { + "driver": "vendor" + }, "matrix_pins": { "cols": ["GP3", "GP4", "GP5", "GP20", "GP18", "GP13", "GP17", "GP16", "GP15", "GP12", "GP11", "GP14", "GP10", " |