diff options
Diffstat (limited to 'keyboards/handwired/colorlice')
| -rw-r--r-- | keyboards/handwired/colorlice/colorlice.c | 3 | ||||
| -rw-r--r-- | keyboards/handwired/colorlice/colorlice.h | 43 | ||||
| -rw-r--r-- | keyboards/handwired/colorlice/config.h | 9 | ||||
| -rw-r--r-- | keyboards/handwired/colorlice/info.json | 159 | ||||
| -rw-r--r-- | keyboards/handwired/colorlice/rules.mk | 1 |
5 files changed, 94 insertions, 121 deletions
diff --git a/keyboards/handwired/colorlice/colorlice.c b/keyboards/handwired/colorlice/colorlice.c index 1fd5fddd11..736db8d465 100644 --- a/keyboards/handwired/colorlice/colorlice.c +++ b/keyboards/handwired/colorlice/colorlice.c @@ -13,7 +13,8 @@ * 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 "colorlice.h" + +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/handwired/colorlice/colorlice.h b/keyboards/handwired/colorlice/colorlice.h deleted file mode 100644 index dbf31f5680..0000000000 --- a/keyboards/handwired/colorlice/colorlice.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2019 marhalloweenvt - * - * 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/>. - */ -#pragma once - - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_alice_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, K2e, \ - k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ - k40, k42, k43, k44, k47, k4a, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO, K2e, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, KC_NO }, \ - { k40, KC_NO, k42, k43, k44, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, KC_NO,KC_NO, KC_NO, k4e, KC_NO }, \ -} - -#define LAYOUT LAYOUT_alice_split_bs diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h index 4e981b4428..5c52df9ffa 100644 --- a/keyboards/handwired/colorlice/config.h +++ b/keyboards/handwired/colorlice/config.h @@ -17,21 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B6, B5, B4, D7, D6, D4, E6, B0, B3 } - -/* 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 /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE /* RGB LEDs */ -#define RGB_DI_PIN B1 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json index 9a884c6718..0cba448703 100644 --- a/keyboards/handwired/colorlice/info.json +++ b/keyboards/handwired/colorlice/info.json @@ -8,79 +8,104 @@ "pid": "0x0302", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice_split_bs"], + "layout_aliases": { + "LAYOUT": "LAYOUT_alice_split_bs" + }, "layouts": { "LAYOUT_alice_split_bs": { "layout": [ - {"label":"K63", "x":0, "y":0}, - {"label":"K00", "x":1.25, "y":0}, - {"label":"K01", "x":2.25, "y":0}, - {"label":"K02", "x":3.25, "y":0}, - {"label":"K03", "x":4.25, "y":0}, - {"label":"K04", "x":5.25, "y":0}, - {"label":"K05", "x":6.25, "y":0}, - {"label":"K06", "x":7.25, "y":0}, - {"label":"K07", "x":10.25, "y":0}, - {"label":"K08", "x":11.25, "y":0}, - {"label":"K09", "x":12.25, "y":0}, - {"label":"K10", "x":13.25, "y":0}, - {"label":"K11", "x":14.25, "y":0}, - {"label":"K12", "x":15.25, "y":0}, - {"label":"K13", "x":16.25, "y":0}, - {"label":"K14", "x":17.25, "y":0}, - {"label":"K64", "x":0, "y":1}, - {"label":"K15", "x":1.25, "y":1, "w":1.5}, - {"label":"K16", "x":2.75, "y":1}, - {"label":"K17", "x":3.75, "y":1}, - {"label":"K18", "x":4.75, "y":1}, - {"label":"K19", "x":5.75, "y":1}, - {"label":"K20", "x":6.75, "y":1}, - {"label":"K21", "x":9.75, "y":1}, - {"label":"K22", "x":10.75, "y":1}, - {"label":"K23", "x":11.75, "y":1}, - {"label":"K24", "x":12.75, "y":1}, - {"label":"K25", "x":13.75, "y":1}, - {"label":"K26", "x":14.75, "y":1}, - {"label":"K27", "x":15.75, "y":1}, - {"label":"K28", "x":16.75, "y":1, "w":1.5}, - {"label":"K65", "x":0, "y":2}, - {"label":"K29", "x":1.25, "y":2, "w":1.75}, - {"label":"K30", "x":3, "y":2}, - {"label":"K31", "x":4, "y":2}, - {"label":"K32", "x":5, "y":2}, - {"label":"K33", "x":6, "y":2}, - {"label":"K34", "x":7, "y":2}, - {"label":"K35", "x":10, "y":2}, - {"label":"K36", "x":11, "y":2}, - {"label":"K37", "x":12, "y":2}, - {"label":"K38", "x":13, "y":2}, - {"label":"K39", "x":14, "y":2}, - {"label":"K40", "x":15, "y":2}, - {"label":"K41", "x":16, "y":2, "w":2.25}, - {"label":"K42", "x":1.25, "y":3, "w":2.25}, - {"label":"K43", "x":3.5, "y":3}, - {"label":"K44", "x":4.5, "y":3}, - {"label":"K45", "x":5.5, "y":3}, - {"label":"K46", "x":6.5, "y":3}, - {"label":"K47", "x":7.5, "y":3}, - {"label":"K48", "x":9.5, "y":3}, - {"label":"K49", "x":10.5, "y":3}, - {"label":"K50", "x":11.5, "y":3}, - {"label":"K51", "x":12.5, "y":3}, - {"label":"K52", "x":13.5, "y":3}, - {"label":"K53", "x":14.5, "y":3}, - {"label":"K54", "x":15.5, "y":3, "w":1.75}, - {"label":"K55", "x":17.25, "y":3}, - {"label":"K56", "x":1.25, "y":4, "w":1.5}, - {"label":"K57", "x":4.25, "y":4, "w":1.5}, - {"label":"K58", "x":5.75, "y":4, "w":2}, - {"label":"K59", "x":7.75, "y":4, "w":1.25}, - {"label":"K60", "x":9.5, "y":4, "w":2.75}, - {"label":"K61", "x":12.25, "y":4, "w":1.5}, - {"label":"K62", "x":16.75, "y":4, "w":1.5} + {"label": "K63", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "K00", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "K01", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "K02", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "K03", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "K04", "matrix": [0, 5], "x": 5.25, "y": 0}, + {"label": "K05", "matrix": [0, 6], "x": 6.25, "y": 0}, + {"label": "K06", "matrix": [0, 7], "x": 7.25, "y": 0}, + + {"label": "K07", "matrix": [0, 8], "x": 10.25, "y": 0}, + {"label": "K08", "matrix": [0, 9], "x": 11.25, "y": 0}, + {"label": "K09", "matrix": [0, 10], "x": 12.25, "y": 0}, + {"label": "K10", "matrix": [0, 11], "x": 13.25, "y": 0}, + {"label": "K11", "matrix": [0, 12], "x": 14.25, "y": 0}, + {"label": "K12", "matrix": [0, 13], "x": 15.25, "y": 0}, + {"label": "K13", "matrix": [0, 14], "x": 16.25, "y": 0}, + {"label": "K14", "matrix": [0, 15], "x": 17.25, "y": 0}, + + {"label": "K64", "matrix": [1, 0], "x": 0, "y": 1}, + + {"label": "K15", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"label": "K16", "matrix": [1, 2], "x": 2.75, "y": 1}, + {"label": "K17", "matrix": [1, 3], "x": 3.75, "y": 1}, + {"label": "K18", "matrix": [1, 4], "x": 4.75, "y": 1}, + {"label": "K19", "matrix": [1, 5], "x": 5.75, "y": 1}, + {"label": "K20", "matrix": [1, 6], "x": 6.75, "y": 1}, + + {"label": "K21", "matrix": [1, 7], "x": 9.75, "y": 1}, + {"label": "K22", "matrix": [1, 8], "x": 10.75, "y": 1}, + {"label": "K23", "matrix": [1, 9], "x": 11.75, "y": 1}, + {"label": "K24", "matrix": [1, 10], "x": 12.75, "y": 1}, + {"label": "K25", "matrix": [1, 11], "x": 13.75, "y": 1}, + {"label": "K26", "matrix": [1, 12], "x": 14.75, "y": 1}, + {"label": "K27", "matrix": [1, 13], "x": 15.75, "y": 1}, + {"label": "K28", "matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5}, + + {"label": "K65", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "K29", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"label": "K30", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "K31", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "K32", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "K33", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "K34", "matrix": [2, 6], "x": 7, "y": 2}, + + {"label": "K35", "matrix": [2, 7], "x": 10, "y": 2}, + {"label": "K36", "matrix": [2, 8], "x": 11, "y": 2}, + {"label": "K37", "matrix": [2, 9], "x": 12, "y": 2}, + {"label": "K38", "matrix": [2, 10], "x": 13, "y": 2}, + {"label": "K39", "matrix": [2, 11], "x": 14, "y": 2}, + {"label": "K40", "matrix": [2, 12], "x": 15, "y": 2}, + {"label": "K41", "matrix": [2, 14], "x": 16, "y": 2, "w": 2.25}, + + {"label": "K42", "matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25}, + {"label": "K43", "matrix": [3, 1], "x": 3.5, "y": 3}, + {"label": "K44", "matrix": [3, 2], "x": 4.5, "y": 3}, + {"label": "K45", "matrix": [3, 3], "x": 5.5, "y": 3}, + {"label": "K46", "matrix": [3, 4], "x": 6.5, "y": 3}, + {"label": "K47", "matrix": [3, 5], "x": 7.5, "y": 3}, + + {"label": "K48", "matrix": [3, 7], "x": 9.5, "y": 3}, + {"label": "K49", "matrix": [3, 8], "x": 10.5, "y": 3}, + {"label": "K50", "matrix": [3, 9], "x": 11.5, "y": 3}, + {"label": "K51", "matrix": [3, 10], "x": 12.5, "y": 3}, + {"label": "K52", "matrix": [3, 11], "x": 13.5, "y": 3}, + {"label": "K53", "matrix": [3, 12], "x": 14.5, "y": 3}, + {"label": "K54", "matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75}, + {"label": "K55", "matrix": [3, 14], "x": 17.25, "y": 3}, + + {"label": "K56", "matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.5}, + {"label": "K57", "matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5}, + {"label": "K58", "matrix": [4, 3], "x": 5.75, "y": 4, "w": 2}, + {"label": "K59", "matrix": [4, 4], "x": 7.75, "y": 4, "w": 1.25}, + {"label": "K60", "matrix": [4, 7], "x": 9.5, "y": 4, "w": 2.75}, + {"label": "K61", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5}, + {"label": "K62", "matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5} ] } } - } +} diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk index 972181a4b4..16e007dd34 100644 --- a/keyboards/handwired/colorlice/rules.mk +++ b/keyboards/handwired/colorlice/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Use link time optimization RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |