diff --git a/keyboards/alko/cornedeon/cornedeon.c b/keyboards/alko/cornedeon/cornedeon.c deleted file mode 100644 index ce51c90968..0000000000 --- a/keyboards/alko/cornedeon/cornedeon.c +++ /dev/null @@ -1,28 +0,0 @@ -#include "quantum.h" - -#ifdef RGB_MATRIX_ENABLE - -led_config_t g_led_config = { { - // Key Matrix to LED Index - // WS2812 LED strings are addressed from 0 (1st) to RGB_MATRIX_LED_COUNT-1 (last) - { 0, 1, 2, 3, 4, 5 }, - { 6, 7, 8, 9, 10, 11 }, - { 12, 13, 14, 15, 16, 17 }, - { 18, 19, 20, 21, 22, 23 } -}, { - // LED Index to Physical Position - // **NB**: Reversed order - {224,64 }, {204,64 }, {184,64 }, {144,64 }, {124,64 }, {104,64 }, - {224,44 }, {204,44 }, {184,44 }, {144,44 }, {124,44 }, {104,44 }, - {224,24 }, {204,24 }, {184,24 }, {144,24 }, {124,24 }, {104,24 }, - {224,0 }, {204,0 }, {184,0 }, {144,0 }, {124,0 }, {104,0 } -}, { - // LED Index to Flag - // **NB**: Reversed order - 4, 4, 4, 4, 4, 4, - 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1 -} }; - -#endif // RGB_MATRIX_ENABLE diff --git a/keyboards/alko/cornedeon/info.json b/keyboards/alko/cornedeon/info.json index 318d071952..cab4e69338 100644 --- a/keyboards/alko/cornedeon/info.json +++ b/keyboards/alko/cornedeon/info.json @@ -87,6 +87,71 @@ "rgb_matrix": { "driver": "ws2812", "max_brightness": 120 + "led_count": 60, + "split": true, + "split_count": [30, 30], + "layout": [ + {"x": 85, "y": 16, "flags": 2}, + {"x": 50, "y": 13, "flags": 2}, + {"x": 16, "y": 20, "flags": 2}, + {"x": 16, "y": 38, "flags": 2}, + {"x": 50, "y": 48, "flags": 2}, + {"x": 85, "y": 52, "flags": 2}, + {"matrix": [3, 5], "x": 95, "y": 63, "flags": 1}, + {"matrix": [2, 5], "x": 85, "y": 39, "flags": 4}, + {"matrix": [1, 5], "x": 85, "y": 21, "flags": 4}, + {"matrix": [0, 5], "x": 85, "y": 4, "flags": 4}, + {"matrix": [0, 4], "x": 68, "y": 2, "flags": 4}, + {"matrix": [1, 4], "x": 68, "y": 19, "flags": 4}, + {"matrix": [2, 4], "x": 68, "y": 37, "flags": 4}, + {"matrix": [3, 4], "x": 80, "y": 58, "flags": 1}, + {"matrix": [3, 3], "x": 60, "y": 55, "flags": 1}, + {"matrix": [2, 3], "x": 50, "y": 35, "flags": 4}, + {"matrix": [1, 3], "x": 50, "y": 13, "flags": 4}, + {"matrix": [0, 3], "x": 50, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 33, "y": 3, "flags": 4}, + {"matrix": [1, 2], "x": 33, "y": 20, "flags": 4}, + {"matrix": [2, 2], "x": 33, "y": 37, "flags": 4}, + {"matrix": [2, 1], "x": 16, "y": 42, "flags": 4}, + {"matrix": [1, 1], "x": 16, "y": 24, "flags": 4}, + {"matrix": [0, 1], "x": 16, "y": 7, "flags": 4}, + {"matrix": [0, 0], "x": 0, "y": 7, "flags": 1}, + {"matrix": [1, 0], "x": 0, "y": 24, "flags": 1}, + {"matrix": [2, 0], "x": 0, "y": 41, "flags": 1}, + {"matrix": [3, 0], "x": 0, "y": 63, "flags": 1}, + {"matrix": [3, 1], "x": 16, "y": 63, "flags": 1}, + {"matrix": [3, 2], "x": 33, "y": 63, "flags": 1}, + {"x": 139, "y": 16, "flags": 2}, + {"x": 174, "y": 13, "flags": 2}, + {"x": 208, "y": 20, "flags": 2}, + {"x": 208, "y": 38, "flags": 2}, + {"x": 174, "y": 48, "flags": 2}, + {"x": 139, "y": 52, "flags": 2}, + {"matrix": [7, 5], "x": 129, "y": 63, "flags": 1}, + {"matrix": [6, 5], "x": 139, "y": 39, "flags": 4}, + {"matrix": [5, 5], "x": 139, "y": 21, "flags": 4}, + {"matrix": [4, 5], "x": 139, "y": 4, "flags": 4}, + {"matrix": [4, 4], "x": 156, "y": 2, "flags": 4}, + {"matrix": [5, 4], "x": 156, "y": 19, "flags": 4}, + {"matrix": [6, 4], "x": 156, "y": 37, "flags": 4}, + {"matrix": [7, 4], "x": 144, "y": 58, "flags": 1}, + {"matrix": [7, 3], "x": 164, "y": 55, "flags": 1}, + {"matrix": [6, 3], "x": 174, "y": 35, "flags": 4}, + {"matrix": [5, 3], "x": 174, "y": 13, "flags": 4}, + {"matrix": [4, 3], "x": 174, "y": 0, "flags": 4}, + {"matrix": [4, 2], "x": 191, "y": 3, "flags": 4}, + {"matrix": [5, 2], "x": 191, "y": 20, "flags": 4}, + {"matrix": [6, 2], "x": 191, "y": 37, "flags": 4}, + {"matrix": [6, 1], "x": 208, "y": 42, "flags": 4}, + {"matrix": [5, 1], "x": 208, "y": 24, "flags": 4}, + {"matrix": [4, 1], "x": 208, "y": 7, "flags": 4}, + {"matrix": [4, 0], "x": 224, "y": 7, "flags": 1}, + {"matrix": [5, 0], "x": 224, "y": 24, "flags": 1}, + {"matrix": [6, 0], "x": 224, "y": 41, "flags": 1}, + {"matrix": [7, 0], "x": 224, "y": 63, "flags": 1}, + {"matrix": [7, 1], "x": 208, "y": 63, "flags": 1}, + {"matrix": [7, 2], "x": 191, "y": 63, "flags": 1} + ], }, "rgblight": { "max_brightness": 120 diff --git a/keyboards/alko/cornedeon/keymaps/vial/rules.mk b/keyboards/alko/cornedeon/keymaps/vial/rules.mk index 277d5a1b01..90a728391e 100644 --- a/keyboards/alko/cornedeon/keymaps/vial/rules.mk +++ b/keyboards/alko/cornedeon/keymaps/vial/rules.mk @@ -4,6 +4,7 @@ LTO_ENABLE = no RGBLIGHT_ENABLE = no RGB_MATRIX_ENABLE = yes # Can't have RGBLIGHT and RGB_MATRIX at the same time. +VIALRGB_ENABLE = yes MOUSEKEY_ENABLE = yes OLED_ENABLE = no OLED_DRIVER = SSD1306 diff --git a/keyboards/alko/cornedeon/keymaps/vial/vial.json b/keyboards/alko/cornedeon/keymaps/vial/vial.json index 20dff70668..de2e6f7b1f 100644 --- a/keyboards/alko/cornedeon/keymaps/vial/vial.json +++ b/keyboards/alko/cornedeon/keymaps/vial/vial.json @@ -1,7 +1,5 @@ { - "lighting": { - "extends": "qmk_rgblight" - }, + "lighting": "vialrgb", "matrix": { "rows": 8, "cols": 6 }, "layouts": { "keymap": [ diff --git a/keyboards/alko/cornedeon/rev2/config.h b/keyboards/alko/cornedeon/rev2/config.h index 556e53d774..0bffc24381 100644 --- a/keyboards/alko/cornedeon/rev2/config.h +++ b/keyboards/alko/cornedeon/rev2/config.h @@ -3,13 +3,14 @@ #pragma once -#define SERIAL_USART_FULL_DUPLEX +//#define SERIAL_USART_FULL_DUPLEX +//#define SERIAL_USART_RX_PIN GP2 #define SERIAL_USART_TX_PIN GP1 -#define SERIAL_USART_RX_PIN GP2 +//#define SOFT_SERIAL_PIN GP1 /* RP2040- and hardware-specific config */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 -#define SPLIT_HAND_PIN GP8 +//#define SPLIT_HAND_PIN GP8 diff --git a/keyboards/alko/cornedeon/rev2/keyboard.json b/keyboards/alko/cornedeon/rev2/keyboard.json index 7f1772f287..1a830d24ed 100644 --- a/keyboards/alko/cornedeon/rev2/keyboard.json +++ b/keyboards/alko/cornedeon/rev2/keyboard.json @@ -33,9 +33,12 @@ "enabled": true, "bootmagic": { "matrix": [4, 1] - } + }, + "handedness": { + "pin": "GP8" + }, "serial": { - "driver": "vendor" + "driver": "vendor" }, "transport": { "sync": { @@ -128,10 +131,6 @@ } }, "rgb_matrix": { - "driver": "ws2812", - "led_count": 60, - "split_count": [30, 30], - "max_brightness": 120, "animations": { "alphas_mods": true, "gradient_up_down": true,