diff --git a/keyboards/klor/2040/config.h b/keyboards/klor/2040/config.h
index c3c566e1..14741421 100644
--- a/keyboards/klor/2040/config.h
+++ b/keyboards/klor/2040/config.h
@@ -3,7 +3,6 @@
// here you find only RP2040 specific configurations
#pragma once
-#include "config_common.h"
// ┌─────────────────────────────────────────────────┐
// │ a u d i o │
diff --git a/keyboards/klor/2040/rules.mk b/keyboards/klor/2040/rules.mk
index b8e75935..ad72f7ca 100644
--- a/keyboards/klor/2040/rules.mk
+++ b/keyboards/klor/2040/rules.mk
@@ -1,5 +1,6 @@
# PIO serial/WS2812 drivers must be used on RP2040
SERIAL_DRIVER = vendor
+WS2812_DRIVER = vendor
# CONVERTER - if you use a listed MCU comment the first line and uncomment the appropiate line
CONVERT_TO = promicro_rp2040
diff --git a/keyboards/klor/config.h b/keyboards/klor/config.h
index 4f826db9..d67cf801 100644
--- a/keyboards/klor/config.h
+++ b/keyboards/klor/config.h
@@ -16,7 +16,6 @@ along with this program. If not, see .
*/
#pragma once
-#include "config_common.h"
// Most configuration will be found in info.json
@@ -33,6 +32,7 @@ along with this program. If not, see .
// │ a u d i o │
// └─────────────────────────────────────────────────┘
+#define AUDIO_PIN B5
#define AUDIO_DAC_SAMPLE_MAX 4095U
#define AUDIO_VOICE_DEFAULT butts_fader
diff --git a/keyboards/klor/info.json b/keyboards/klor/info.json
index f1f4c7ff..24e9b17d 100644
--- a/keyboards/klor/info.json
+++ b/keyboards/klor/info.json
@@ -8,27 +8,46 @@
"device_version": "1.3.0"
},
"processor": "atmega32u4",
- "bootloader": "caterina",
+ "bootloader": "atmel-dfu",
"matrix_pins": {
"cols": [ "F6", "F7", "B1", "B3", "B2", "B6" ],
"rows": [ "C6", "D7", "E6", "B4" ]
},
"diode_direction": "COL2ROW",
"build": {
- "lto": true
+ "lto": false
},
+ "features": {
+ "audio": false,
+ "backlight": false,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": false,
+ "grave_esc": false,
+ "magic": false,
+ "mousekey": false,
+ "music": false,
+ "oled": true,
+ "rgb_matrix": false,
+ "rgblight": false,
+ "space_cadet": false,
+ "swap_hands": true
+ },
+ "mouse_key": {
+ "enabled": false
+ },
"encoder": {
"rotary": [
{
- "pin_a": "F4",
- "pin_b": "F5",
+ "pin_a": "F5",
+ "pin_b": "F4",
"resolution": 2
}
]
},
"split": {
"enabled": true,
- "soft_serial_pin": "D2",
"encoder": {
"right": {
"rotary": [
@@ -40,7 +59,9 @@
]
}
},
+ "soft_serial_pin": "D2",
"transport": {
+ "protocol": "serial",
"sync": {
"matrix_state": true,
"oled": true,
@@ -49,7 +70,6 @@
}
},
"rgblight": {
- "driver": "ws2812",
"led_count": 42,
"split_count": [21, 21]
},
@@ -61,35 +81,240 @@
"sleep": true,
"default": {
"hue": 35
- }
+ },
+ "layout": [
+ {"matrix": [3, 4], "x": 102, "y": 63, "flags": 1},
+ {"matrix": [3, 3], "x": 89, "y": 54, "flags": 1},
+ {"matrix": [3, 2], "x": 74, "y": 49, "flags": 1},
+ {"matrix": [2, 5], "x": 75, "y": 34, "flags": 4},
+ {"matrix": [1, 5], "x": 75, "y": 21, "flags": 4},
+ {"matrix": [0, 5], "x": 75, "y": 8, "flags": 4},
+ {"matrix": [0, 4], "x": 60, "y": 6, "flags": 4},
+ {"matrix": [1, 4], "x": 60, "y": 19, "flags": 4},
+ {"matrix": [2, 4], "x": 60, "y": 32, "flags": 4},
+ {"matrix": [3, 1], "x": 58, "y": 48, "flags": 1},
+ {"matrix": [2, 3], "x": 46, "y": 25, "flags": 4},
+ {"matrix": [1, 3], "x": 46, "y": 12, "flags": 4},
+ {"matrix": [0, 3], "x": 46, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 29, "y": 7, "flags": 4},
+ {"matrix": [1, 2], "x": 30, "y": 20, "flags": 4},
+ {"matrix": [2, 2], "x": 31, "y": 33, "flags": 4},
+ {"matrix": [2, 1], "x": 17, "y": 42, "flags": 4},
+ {"matrix": [1, 1], "x": 15, "y": 30, "flags": 4},
+ {"matrix": [0, 1], "x": 13, "y": 17, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 28, "flags": 1},
+ {"matrix": [2, 0], "x": 3, "y": 41, "flags": 1},
+ {"matrix": [7, 4], "x": 122, "y": 63, "flags": 1},
+ {"matrix": [7, 3], "x": 135, "y": 54, "flags": 1},
+ {"matrix": [7, 2], "x": 150, "y": 49, "flags": 1},
+ {"matrix": [6, 5], "x": 149, "y": 34, "flags": 4},
+ {"matrix": [5, 5], "x": 149, "y": 21, "flags": 4},
+ {"matrix": [4, 5], "x": 149, "y": 8, "flags": 4},
+ {"matrix": [4, 4], "x": 163, "y": 6, "flags": 4},
+ {"matrix": [5, 4], "x": 163, "y": 19, "flags": 4},
+ {"matrix": [6, 4], "x": 163, "y": 32, "flags": 4},
+ {"matrix": [7, 1], "x": 166, "y": 48, "flags": 1},
+ {"matrix": [6, 3], "x": 178, "y": 25, "flags": 4},
+ {"matrix": [5, 3], "x": 178, "y": 12, "flags": 4},
+ {"matrix": [4, 3], "x": 178, "y": 0, "flags": 4},
+ {"matrix": [4, 2], "x": 195, "y": 7, "flags": 4},
+ {"matrix": [5, 2], "x": 194, "y": 20, "flags": 4},
+ {"matrix": [6, 2], "x": 193, "y": 33, "flags": 4},
+ {"matrix": [4, 1], "x": 206, "y": 42, "flags": 4},
+ {"matrix": [5, 1], "x": 209, "y": 30, "flags": 4},
+ {"matrix": [6, 1], "x": 211, "y": 17, "flags": 4},
+ {"matrix": [5, 0], "x": 224, "y": 28, "flags": 1},
+ {"matrix": [6, 0], "x": 221, "y": 41, "flags": 1}
+ ]
},
"ws2812": {
- "pin": "D3",
- "driver": "vendor"
+ "pin": "D3"
},
"audio": {
- "pins": [ "B5" ],
"voices": true
},
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_polydactyl"
+ },
"layouts": {
+ "LAYOUT_konrad": {
+ "layout": [
+ {"label": "L01", "matrix": [0, 1], "x": 3, "y": 0.25},
+ {"label": "L02", "matrix": [0, 2], "x": 13, "y": 0.25},
+ {"label": "L03", "matrix": [0, 3], "x": 4, "y": 0.75},
+ {"label": "L04", "matrix": [0, 4], "x": 12, "y": 0.75},
+ {"label": "L05", "matrix": [0, 5], "x": 5, "y": 1},
+ {"label": "R00", "matrix": [4, 5], "x": 11, "y": 1},
+ {"label": "R01", "matrix": [4, 4], "x": 3, "y": 1.25},
+ {"label": "R02", "matrix": [4, 3], "x": 13, "y": 1.25},
+ {"label": "R03", "matrix": [4, 2], "x": 4, "y": 1.75},
+ {"label": "R04", "matrix": [4, 1], "x": 12, "y": 1.75},
+ {"label": "L10", "matrix": [1, 0], "x": 5, "y": 2},
+ {"label": "L11", "matrix": [1, 1], "x": 11, "y": 2},
+ {"label": "L12", "matrix": [1, 2], "x": 3, "y": 2.25},
+ {"label": "L13", "matrix": [1, 3], "x": 13, "y": 2.25},
+ {"label": "L14", "matrix": [1, 4], "x": 4, "y": 2.75},
+ {"label": "L15", "matrix": [1, 5], "x": 12, "y": 2.75},
+ {"label": "R10", "matrix": [5, 5], "x": 5, "y": 3},
+ {"label": "R11", "matrix": [5, 4], "x": 11, "y": 3},
+ {"label": "R12", "matrix": [5, 3], "x": 6.25, "y": 3.25},
+ {"label": "R13", "matrix": [5, 2], "x": 9.75, "y": 3.25},
+ {"label": "R14", "matrix": [5, 1], "x": -0.5, "y": -0.4499999999999993},
+ {"label": "R15", "matrix": [5, 0], "x": -0.5, "y": -4.149999999999999},
+ {"label": "L20", "matrix": [2, 0], "x": -0.5, "y": -6.149999999999999},
+ {"label": "L21", "matrix": [2, 1], "x": -0.5, "y": -5.149999999999999},
+ {"label": "L22", "matrix": [2, 2], "x": -0.5, "y": -4.149999999999999},
+ {"label": "L23", "matrix": [2, 3], "x": -0.25, "y": -5.499999999999999},
+ {"label": "L24", "matrix": [2, 4], "x": 0.75, "y": -4.699999999999998},
+ {"label": "L25", "matrix": [2, 5], "x": -0.25, "y": -4.499999999999999},
+ {"label": "L35", "matrix": [3, 5], "x": 0.75, "y": -3.6999999999999984},
+ {"label": "R30", "matrix": [7, 5], "x": -0.25, "y": -3.4999999999999987},
+ {"label": "R20", "matrix": [6, 5], "x": -0.5, "y": -7.199999999999998},
+ {"label": "R21", "matrix": [6, 4], "x": -0.5, "y": -7.199999999999998},
+ {"label": "R22", "matrix": [6, 3], "x": -0.5, "y": -10.899999999999999},
+ {"label": "R23", "matrix": [6, 2], "x": -0.5, "y": -10.899999999999999},
+ {"label": "R24", "matrix": [6, 1], "x": -1, "y": -12.249999999999998},
+ {"label": "R25", "matrix": [6, 0], "x": -2, "y": -11.449999999999998},
+ {"label": "L31", "matrix": [3, 1], "x": -1, "y": -11.249999999999998},
+ {"label": "L32", "matrix": [3, 2], "x": -2, "y": -10.449999999999998},
+ {"label": "L33", "matrix": [3, 3], "x": -1, "y": -10.249999999999998},
+ {"label": "R32", "matrix": [7, 3], "x": -0.75, "y": -12.249999999999998},
+ {"label": "R33", "matrix": [7, 2], "x": -0.75, "y": -11.249999999999998},
+ {"label": "R34", "matrix": [7, 1], "x": -0.75, "y": -10.249999999999998}
+ ]
+ },
"LAYOUT_polydactyl": {
"layout": [
- {"x":3, "y":0.25}, {"x":13, "y":0.25}, {"x":4, "y":0.75}, {"x":12, "y":0.75}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":3, "y":1.25}, {"x":13, "y":1.25}, {"x":4, "y":1.75}, {"x":12, "y":1.75}, {"x":5, "y":2}, {"x":11, "y":2}, {"x":3, "y":2.25}, {"x":13, "y":2.25}, {"x":4, "y":2.75}, {"x":12, "y":2.75}, {"x":5, "y":3}, {"x":11, "y":3}, {"x":6.25, "y":3.25}, {"x":9.75, "y":3.25}, {"x":-0.5, "y":-0.4500000000000002}, {"x":-0.5, "y":-4.15}, {"x":-0.5, "y":-6.15}, {"x":-0.5, "y":-5.15}, {"x":-0.5, "y":-4.15}, {"x":-0.25, "y":-5.5}, {"x":0.75, "y":-4.7}, {"x":-0.25, "y":-4.500000000000001}, {"x":0.75, "y":-3.7000000000000006}, {"x":-0.25, "y":-3.5000000000000004}, {"x":-0.5, "y":-7.200000000000001}, {"x":-0.5, "y":-7.200000000000001}, {"x":-0.5, "y":-7.200000000000001}, {"x":-0.5, "y":-10.9}, {"x":-0.5, "y":-10.9}, {"x":-0.5, "y":-10.9}, {"x":-1.0, "y":-12.250000000000002}, {"x":-2, "y":-11.450000000000001}, {"x":-1.0, "y":-11.250000000000002}, {"x":-2, "y":-10.450000000000001}, {"x":-1.0, "y":-10.250000000000002}, {"x":-0.75, "y":-12.250000000000002}, {"x":-0.75, "y":-11.250000000000002}, {"x":-0.75, "y":-10.250000000000002}
+ {"label": "L01", "matrix": [0, 1], "x": 3, "y": 0.25},
+ {"label": "L02", "matrix": [0, 2], "x": 13, "y": 0.25},
+ {"label": "L03", "matrix": [0, 3], "x": 4, "y": 0.75},
+ {"label": "L04", "matrix": [0, 4], "x": 12, "y": 0.75},
+ {"label": "L05", "matrix": [0, 5], "x": 5, "y": 1},
+ {"label": "R00", "matrix": [4, 5], "x": 11, "y": 1},
+ {"label": "R01", "matrix": [4, 4], "x": 3, "y": 1.25},
+ {"label": "R02", "matrix": [4, 3], "x": 13, "y": 1.25},
+ {"label": "R03", "matrix": [4, 2], "x": 4, "y": 1.75},
+ {"label": "R04", "matrix": [4, 1], "x": 12, "y": 1.75},
+ {"label": "L10", "matrix": [1, 0], "x": 5, "y": 2},
+ {"label": "L11", "matrix": [1, 1], "x": 11, "y": 2},
+ {"label": "L12", "matrix": [1, 2], "x": 3, "y": 2.25},
+ {"label": "L13", "matrix": [1, 3], "x": 13, "y": 2.25},
+ {"label": "L14", "matrix": [1, 4], "x": 4, "y": 2.75},
+ {"label": "L15", "matrix": [1, 5], "x": 12, "y": 2.75},
+ {"label": "R10", "matrix": [5, 5], "x": 5, "y": 3},
+ {"label": "R11", "matrix": [5, 4], "x": 11, "y": 3},
+ {"label": "R12", "matrix": [5, 3], "x": 6.25, "y": 3.25},
+ {"label": "R13", "matrix": [5, 2], "x": 9.75, "y": 3.25},
+ {"label": "R14", "matrix": [5, 1], "x": -0.5, "y": -0.4500000000000002},
+ {"label": "R15", "matrix": [5, 0], "x": -0.5, "y": -4.15},
+ {"label": "L20", "matrix": [2, 0], "x": -0.5, "y": -6.15},
+ {"label": "L21", "matrix": [2, 1], "x": -0.5, "y": -5.15},
+ {"label": "L22", "matrix": [2, 2], "x": -0.5, "y": -4.15},
+ {"label": "L23", "matrix": [2, 3], "x": -0.25, "y": -5.5},
+ {"label": "L24", "matrix": [2, 4], "x": 0.75, "y": -4.7},
+ {"label": "L25", "matrix": [2, 5], "x": -0.25, "y": -4.500000000000001},
+ {"label": "L35", "matrix": [3, 5], "x": 0.75, "y": -3.7000000000000006},
+ {"label": "R30", "matrix": [7, 5], "x": -0.25, "y": -3.5000000000000004},
+ {"label": "R20", "matrix": [6, 5], "x": -0.5, "y": -7.200000000000001},
+ {"label": "R21", "matrix": [6, 4], "x": -0.5, "y": -7.200000000000001},
+ {"label": "R22", "matrix": [6, 3], "x": -0.5, "y": -7.200000000000001},
+ {"label": "R23", "matrix": [6, 2], "x": -0.5, "y": -10.9},
+ {"label": "R24", "matrix": [6, 1], "x": -0.5, "y": -10.9},
+ {"label": "R25", "matrix": [6, 0], "x": -0.5, "y": -10.9},
+ {"label": "L31", "matrix": [3, 1], "x": -1, "y": -12.250000000000002},
+ {"label": "L32", "matrix": [3, 2], "x": -2, "y": -11.450000000000001},
+ {"label": "L33", "matrix": [3, 3], "x": -1, "y": -11.250000000000002},
+ {"label": "L34", "matrix": [3, 4], "x": -2, "y": -10.450000000000001},
+ {"label": "R31", "matrix": [7, 4], "x": -1, "y": -10.250000000000002},
+ {"label": "R32", "matrix": [7, 3], "x": -0.75, "y": -12.250000000000002},
+ {"label": "R33", "matrix": [7, 2], "x": -0.75, "y": -11.250000000000002},
+ {"label": "R34", "matrix": [7, 1], "x": -0.75, "y": -10.250000000000002}
]
},
- "LAYOUT_konrad": {
+ "LAYOUT_saegewerk": {
"layout": [
- {"x":3, "y":0.25}, {"x":13, "y":0.25}, {"x":4, "y":0.75}, {"x":12, "y":0.75}, {"x":5, "y":1}, {"x":11, "y":1}, {"x":3, "y":1.25}, {"x":13, "y":1.25}, {"x":4, "y":1.75}, {"x":12, "y":1.75}, {"x":5, "y":2}, {"x":11, "y":2}, {"x":3, "y":2.25}, {"x":13, "y":2.25}, {"x":4, "y":2.75}, {"x":12, "y":2.75}, {"x":5, "y":3}, {"x":11, "y":3}, {"x":6.25, "y":3.25}, {"x":9.75, "y":3.25}, {"x":-0.5, "y":-0.4499999999999993}, {"x":-0.5, "y":-4.149999999999999}, {"x":-0.5, "y":-6.149999999999999}, {"x":-0.5, "y":-5.149999999999999}, {"x":-0.5, "y":-4.149999999999999}, {"x":-0.25, "y":-5.499999999999999}, {"x":0.75, "y":-4.699999999999998}, {"x":-0.25, "y":-4.499999999999999}, {"x":0.75, "y":-3.6999999999999984}, {"x":-0.25, "y":-3.4999999999999987}, {"x":-0.5, "y":-7.199999999999998}, {"x":-0.5, "y":-7.199999999999998}, {"x":-0.5, "y":-10.899999999999999}, {"x":-0.5, "y":-10.899999999999999}, {"x":-1.0, "y":-12.249999999999998}, {"x":-2, "y":-11.449999999999998}, {"x":-1.0, "y":-11.249999999999998}, {"x":-2, "y":-10.449999999999998}, {"x":-1.0, "y":-10.249999999999998}, {"x":-0.75, "y":-12.249999999999998}, {"x":-0.75, "y":-11.249999999999998}, {"x":-0.75, "y":-10.249999999999998}
+ {"label": "L01", "matrix": [0, 1], "x": 2.25, "y": 0.25},
+ {"label": "L02", "matrix": [0, 2], "x": 12.25, "y": 0.25},
+ {"label": "L03", "matrix": [0, 3], "x": 3.25, "y": 0.75},
+ {"label": "L04", "matrix": [0, 4], "x": 11.25, "y": 0.75},
+ {"label": "L05", "matrix": [0, 5], "x": 4.25, "y": 1},
+ {"label": "R00", "matrix": [4, 5], "x": 10.25, "y": 1},
+ {"label": "R01", "matrix": [4, 4], "x": 2.25, "y": 1.25},
+ {"label": "R02", "matrix": [4, 3], "x": 12.25, "y": 1.25},
+ {"label": "R03", "matrix": [4, 2], "x": 3.25, "y": 1.75},
+ {"label": "R04", "matrix": [4, 1], "x": 11.25, "y": 1.75},
+ {"label": "L11", "matrix": [1, 1], "x": 4.25, "y": 2},
+ {"label": "L12", "matrix": [1, 2], "x": 10.25, "y": 2},
+ {"label": "L13", "matrix": [1, 3], "x": 2.25, "y": 2.25},
+ {"label": "L14", "matrix": [1, 4], "x": 12.25, "y": 2.25},
+ {"label": "L15", "matrix": [1, 5], "x": 3.25, "y": 2.75},
+ {"label": "R10", "matrix": [5, 5], "x": 11.25, "y": 2.75},
+ {"label": "R11", "matrix": [5, 4], "x": 4.25, "y": 3},
+ {"label": "R12", "matrix": [5, 3], "x": 10.25, "y": 3},
+ {"label": "R13", "matrix": [5, 2], "x": 5.5, "y": 3.25},
+ {"label": "R14", "matrix": [5, 1], "x": 9, "y": 3.25},
+ {"label": "L21", "matrix": [2, 1], "x": -0.5, "y": -0.4499999999999993},
+ {"label": "L22", "matrix": [2, 2], "x": -0.5, "y": -4.149999999999999},
+ {"label": "L23", "matrix": [2, 3], "x": -1.25, "y": -6.149999999999999},
+ {"label": "L24", "matrix": [2, 4], "x": -1.25, "y": -5.149999999999999},
+ {"label": "L25", "matrix": [2, 5], "x": -1.25, "y": -4.149999999999999},
+ {"label": "L35", "matrix": [3, 5], "x": -1, "y": -5.499999999999999},
+ {"label": "R30", "matrix": [7, 5], "x": -1, "y": -4.499999999999999},
+ {"label": "R20", "matrix": [6, 5], "x": -1, "y": -3.4999999999999987},
+ {"label": "R21", "matrix": [6, 4], "x": -0.5, "y": -7.199999999999998},
+ {"label": "R22", "matrix": [6, 3], "x": -0.5, "y": -7.199999999999998},
+ {"label": "R23", "matrix": [6, 2], "x": -0.5, "y": -10.899999999999999},
+ {"label": "R24", "matrix": [6, 1], "x": -0.5, "y": -10.899999999999999},
+ {"label": "L31", "matrix": [3, 1], "x": -1.75, "y": -12.249999999999998},
+ {"label": "L32", "matrix": [3, 2], "x": -1.75, "y": -11.249999999999998},
+ {"label": "L33", "matrix": [3, 3], "x": -1.75, "y": -10.249999999999998},
+ {"label": "R32", "matrix": [7, 3], "x": -1.5, "y": -12.249999999999998},
+ {"label": "R33", "matrix": [7, 2], "x": -1.5, "y": -11.249999999999998},
+ {"label": "R34", "matrix": [7, 1], "x": -1.5, "y": -10.249999999999998}
]
},
- "LAYOUT_yubitsume": {
+ "LAYOUT_yubitsume": {
"layout": [
- {"x":2.25, "y":0.25}, {"x":12.25, "y":0.25}, {"x":3.25, "y":0.75}, {"x":11.25, "y":0.75}, {"x":4.25, "y":1}, {"x":10.25, "y":1}, {"x":2.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":3.25, "y":1.75}, {"x":11.25, "y":1.75}, {"x":4.25, "y":2}, {"x":10.25, "y":2}, {"x":2.25, "y":2.25}, {"x":12.25, "y":2.25}, {"x":3.25, "y":2.75}, {"x":11.25, "y":2.75}, {"x":4.25, "y":3}, {"x":10.25, "y":3}, {"x":5.5, "y":3.25}, {"x":9, "y":3.25}, {"x":-0.5, "y":-0.4499999999999993}, {"x":-0.5, "y":-4.149999999999999}, {"x":-1.25, "y":-6.149999999999999}, {"x":-1.25, "y":-5.149999999999999}, {"x":-1.25, "y":-4.149999999999999}, {"x":-1.0, "y":-5.499999999999999}, {"x":-1.0, "y":-4.499999999999999}, {"x":-1.0, "y":-3.4999999999999987}, {"x":-0.5, "y":-7.199999999999998}, {"x":-0.5, "y":-7.199999999999998}, {"x":-0.5, "y":-7.199999999999999}, {"x":-0.5, "y":-10.899999999999999}, {"x":-0.5, "y":-10.899999999999999}, {"x":-0.5, "y":-10.899999999999999}, {"x":-1.75, "y":-12.25}, {"x":-1.75, "y":-11.25}, {"x":-1.75, "y":-10.25}, {"x":-1.5, "y":-12.25}, {"x":-1.5, "y":-11.25}, {"x":-1.5, "y":-10.25}
- ]
- },
- "LAYOUT_saegewerk": {
- "layout": [
- {"x":2.25, "y":0.25}, {"x":12.25, "y":0.25}, {"x":3.25, "y":0.75}, {"x":11.25, "y":0.75}, {"x":4.25, "y":1}, {"x":10.25, "y":1}, {"x":2.25, "y":1.25}, {"x":12.25, "y":1.25}, {"x":3.25, "y":1.75}, {"x":11.25, "y":1.75}, {"x":4.25, "y":2}, {"x":10.25, "y":2}, {"x":2.25, "y":2.25}, {"x":12.25, "y":2.25}, {"x":3.25, "y":2.75}, {"x":11.25, "y":2.75}, {"x":4.25, "y":3}, {"x":10.25, "y":3}, {"x":5.5, "y":3.25}, {"x":9, "y":3.25}, {"x":-0.5, "y":-0.4499999999999993}, {"x":-0.5, "y":-4.149999999999999}, {"x":-1.25, "y":-6.149999999999999}, {"x":-1.25, "y":-5.149999999999999}, {"x":-1.25, "y":-4.149999999999999}, {"x":-1.0, "y":-5.499999999999999}, {"x":-1.0, "y":-4.499999999999999}, {"x":-1.0, "y":-3.4999999999999987}, {"x":-0.5, "y":-7.199999999999998}, {"x":-0.5, "y":-7.199999999999998}, {"x":-0.5, "y":-10.899999999999999}, {"x":-0.5, "y":-10.899999999999999}, {"x":-1.75, "y":-12.249999999999998}, {"x":-1.75, "y":-11.249999999999998}, {"x":-1.75, "y":-10.249999999999998}, {"x":-1.5, "y":-12.249999999999998}, {"x":-1.5, "y":-11.249999999999998}, {"x":-1.5, "y":-10.249999999999998}
+ {"label": "L01", "matrix": [0, 1], "x": 2.25, "y": 0.25},
+ {"label": "L02", "matrix": [0, 2], "x": 12.25, "y": 0.25},
+ {"label": "L03", "matrix": [0, 3], "x": 3.25, "y": 0.75},
+ {"label": "L04", "matrix": [0, 4], "x": 11.25, "y": 0.75},
+ {"label": "L05", "matrix": [0, 5], "x": 4.25, "y": 1},
+ {"label": "R00", "matrix": [4, 5], "x": 10.25, "y": 1},
+ {"label": "R01", "matrix": [4, 4], "x": 2.25, "y": 1.25},
+ {"label": "R02", "matrix": [4, 3], "x": 12.25, "y": 1.25},
+ {"label": "R03", "matrix": [4, 2], "x": 3.25, "y": 1.75},
+ {"label": "R04", "matrix": [4, 1], "x": 11.25, "y": 1.75},
+ {"label": "L11", "matrix": [1, 1], "x": 4.25, "y": 2},
+ {"label": "L12", "matrix": [1, 2], "x": 10.25, "y": 2},
+ {"label": "L13", "matrix": [1, 3], "x": 2.25, "y": 2.25},
+ {"label": "L14", "matrix": [1, 4], "x": 12.25, "y": 2.25},
+ {"label": "L15", "matrix": [1, 5], "x": 3.25, "y": 2.75},
+ {"label": "R10", "matrix": [5, 5], "x": 11.25, "y": 2.75},
+ {"label": "R11", "matrix": [5, 4], "x": 4.25, "y": 3},
+ {"label": "R12", "matrix": [5, 3], "x": 10.25, "y": 3},
+ {"label": "R13", "matrix": [5, 2], "x": 5.5, "y": 3.25},
+ {"label": "R14", "matrix": [5, 1], "x": 9, "y": 3.25},
+ {"label": "L21", "matrix": [2, 1], "x": -0.5, "y": -0.4499999999999993},
+ {"label": "L22", "matrix": [2, 2], "x": -0.5, "y": -4.149999999999999},
+ {"label": "L23", "matrix": [2, 3], "x": -1.25, "y": -6.149999999999999},
+ {"label": "L24", "matrix": [2, 4], "x": -1.25, "y": -5.149999999999999},
+ {"label": "L25", "matrix": [2, 5], "x": -1.25, "y": -4.149999999999999},
+ {"label": "L35", "matrix": [3, 5], "x": -1, "y": -5.499999999999999},
+ {"label": "R30", "matrix": [7, 5], "x": -1, "y": -4.499999999999999},
+ {"label": "R20", "matrix": [6, 5], "x": -1, "y": -3.4999999999999987},
+ {"label": "R21", "matrix": [6, 4], "x": -0.5, "y": -7.199999999999998},
+ {"label": "R22", "matrix": [6, 3], "x": -0.5, "y": -7.199999999999998},
+ {"label": "R23", "matrix": [6, 2], "x": -0.5, "y": -7.199999999999999},
+ {"label": "R24", "matrix": [6, 1], "x": -0.5, "y": -10.899999999999999},
+ {"label": "L31", "matrix": [3, 1], "x": -0.5, "y": -10.899999999999999},
+ {"label": "L32", "matrix": [3, 2], "x": -0.5, "y": -10.899999999999999},
+ {"label": "L33", "matrix": [3, 3], "x": -1.75, "y": -12.25},
+ {"label": "L34", "matrix": [3, 4], "x": -1.75, "y": -11.25},
+ {"label": "R31", "matrix": [7, 4], "x": -1.75, "y": -10.25},
+ {"label": "R32", "matrix": [7, 3], "x": -1.5, "y": -12.25},
+ {"label": "R33", "matrix": [7, 2], "x": -1.5, "y": -11.25},
+ {"label": "R34", "matrix": [7, 1], "x": -1.5, "y": -10.25}
]
}
}
diff --git a/keyboards/klor/keymaps/default/config.h b/keyboards/klor/keymaps/default/config.h
index 95ce1828..a9de238b 100644
--- a/keyboards/klor/keymaps/default/config.h
+++ b/keyboards/klor/keymaps/default/config.h
@@ -23,7 +23,7 @@ for more options.
//#define NO_ACTION_TAPPING
//#define NO_MUSIC_MODE
-#define COMBO_COUNT 1
+//#define COMBO_COUNT 1
// RGB matrix support
diff --git a/keyboards/klor/keymaps/default/rules.mk b/keyboards/klor/keymaps/default/rules.mk
index b838d215..e0f81bf4 100644
--- a/keyboards/klor/keymaps/default/rules.mk
+++ b/keyboards/klor/keymaps/default/rules.mk
@@ -5,7 +5,4 @@ COMBO_ENABLE = no
KEY_OVERRIDE_ENABLE = no
#HAPTIC FEEBACK
-HAPTIC_ENABLE = no
-
-#PER KEY RGB
-RGB_MATRIX_ENABLE = no
\ No newline at end of file
+HAPTIC_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/klor/klor.c b/keyboards/klor/klor.c
index ebfc7652..def4d16d 100644
--- a/keyboards/klor/klor.c
+++ b/keyboards/klor/klor.c
@@ -172,7 +172,7 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] =
// POLYDACTYL / YUBITSUME
// use this matrix if you use the polydactyl or yubitsume layout ────────────────────────────────────┐
-
+/*
led_config_t g_led_config = { {
//COL 00 01 02 03 04 05 ROW
{ NO_LED, 18, 13, 12, 6, 5 },//00
@@ -209,7 +209,7 @@ led_config_t g_led_config = { {
4, 4, 4, 4, 4, 1, 1
} };
// ────────────────────────────────────────────────────────────────────────────────────────────────────┘
-
+*/
/*
// KONRAD
diff --git a/keyboards/klor/rules.mk b/keyboards/klor/rules.mk
index 75752de2..22ee7738 100644
--- a/keyboards/klor/rules.mk
+++ b/keyboards/klor/rules.mk
@@ -3,26 +3,26 @@
# Build Options
# change yes to no to disable
#
-SWAP_HANDS_ENABLE = yes
+#SWAP_HANDS_ENABLE = yes
-OLED_ENABLE = yes
+#OLED_ENABLE = yes
# HAPTIC FEEDBACK
HAPTIC_DRIVER = drv2605l
# PER KEY RGB
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
+#BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+#RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+#RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE)
# SPACE SAVING
-EXTRAKEY_ENABLE = no
-AUDIO_ENABLE = no
-MUSIC_ENABLE = no
-LTO_ENABLE = no
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-MOUSEKEY_ENABLE = no
-SPACE_CADET_ENABLE = no
-GRAVE_ESC_ENABLE = no
-MAGIC_ENABLE = no
+# EXTRAKEY_ENABLE = no
+# AUDIO_ENABLE = no
+# MUSIC_ENABLE = no
+# LTO_ENABLE = no
+# CONSOLE_ENABLE = no
+# COMMAND_ENABLE = no
+# MOUSEKEY_ENABLE = no
+# SPACE_CADET_ENABLE = no
+# GRAVE_ESC_ENABLE = no
+# MAGIC_ENABLE = no