summaryrefslogtreecommitdiff
path: root/keyboards/keebio/convolution
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keebio/convolution')
-rw-r--r--keyboards/keebio/convolution/convolution.c2
-rw-r--r--keyboards/keebio/convolution/convolution.h22
-rw-r--r--keyboards/keebio/convolution/info.json262
-rw-r--r--keyboards/keebio/convolution/keymaps/default/keymap.c2
-rw-r--r--keyboards/keebio/convolution/keymaps/via/keymap.c2
-rw-r--r--keyboards/keebio/convolution/rev1/config.h1
-rw-r--r--keyboards/keebio/convolution/rev1/info.json295
-rw-r--r--keyboards/keebio/convolution/rev1/rev1.h80
-rw-r--r--keyboards/keebio/convolution/rev1/rules.mk1
9 files changed, 297 insertions, 370 deletions
diff --git a/keyboards/keebio/convolution/convolution.c b/keyboards/keebio/convolution/convolution.c
index 884f3e7e5b..fc726e277a 100644
--- a/keyboards/keebio/convolution/convolution.c
+++ b/keyboards/keebio/convolution/convolution.c
@@ -14,7 +14,7 @@ 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 "convolution.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/keebio/convolution/convolution.h b/keyboards/keebio/convolution/convolution.h
deleted file mode 100644
index fcf299b815..0000000000
--- a/keyboards/keebio/convolution/convolution.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 Danny Nguyen <danny@keeb.io>
-
-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"
-
-#ifdef KEYBOARD_keebio_convolution_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/keebio/convolution/info.json b/keyboards/keebio/convolution/info.json
index 64e78bdc02..5e05d70ace 100644
--- a/keyboards/keebio/convolution/info.json
+++ b/keyboards/keebio/convolution/info.json
@@ -14,265 +14,5 @@
"unicode": false,
"backlight": false
},
- "layout_aliases": {"LAYOUT": "LAYOUT_all"},
- "layouts": {
- "LAYOUT_65xt": {
- "layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2.25, "y": 0},
- {"x": 3.25, "y": 0},
- {"x": 4.25, "y": 0},
- {"x": 5.25, "y": 0},
- {"x": 6.25, "y": 0},
- {"x": 7.25, "y": 0},
- {"x": 8.25, "y": 0},
- {"x": 9.25, "y": 0},
- {"x": 10.25, "y": 0},
- {"x": 11.25, "y": 0},
- {"x": 12.25, "y": 0},
- {"x": 13.25, "y": 0},
- {"x": 14.25, "y": 0},
- {"x": 15.25, "y": 0},
- {"x": 16.25, "y": 0},
- {"x": 17.25, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2.25, "y": 1, "w": 1.5},
- {"x": 3.75, "y": 1},
- {"x": 4.75, "y": 1},
- {"x": 5.75, "y": 1},
- {"x": 6.75, "y": 1},
- {"x": 7.75, "y": 1},
- {"x": 8.75, "y": 1},
- {"x": 9.75, "y": 1},
- {"x": 10.75, "y": 1},
- {"x": 11.75, "y": 1},
- {"x": 12.75, "y": 1},
- {"x": 13.75, "y": 1},
- {"x": 14.75, "y": 1},
- {"x": 15.75, "y": 1, "w": 1.5},
- {"x": 17.25, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2.25, "y": 2, "w": 1.75},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
- {"x": 6, "y": 2},
- {"x": 7, "y": 2},
- {"x": 8, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2, "w": 2.25},
- {"x": 17.25, "y": 2},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2.25, "y": 3, "w": 2.25},
- {"x": 4.5, "y": 3},
- {"x": 5.5, "y": 3},
- {"x": 6.5, "y": 3},
- {"x": 7.5, "y": 3},
- {"x": 8.5, "y": 3},
- {"x": 9.5, "y": 3},
- {"x": 10.5, "y": 3},
- {"x": 11.5, "y": 3},
- {"x": 12.5, "y": 3},
- {"x": 13.5, "y": 3},
- {"x": 14.5, "y": 3, "w": 1.75},
- {"x": 16.25, "y": 3},
- {"x": 17.25, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2.25, "y": 4, "w": 1.25},
- {"x": 3.5, "y": 4, "w": 1.25},
- {"x": 4.75, "y": 4, "w": 1.25},
- {"x": 6, "y": 4, "w": 1.25},
- {"x": 7.25, "y": 4, "w": 2.25},
- {"x": 9.5, "y": 4, "w": 2.75},
- {"x": 12.25, "y": 4},
- {"x": 13.25, "y": 4},
- {"x": 14.25, "y": 4},
- {"x": 15.25, "y": 4},
- {"x": 16.25, "y": 4},
- {"x": 17.25, "y": 4}
- ]
- },
- "LAYOUT_65xt_iso": {
- "layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2.25, "y": 0},
- {"x": 3.25, "y": 0},
- {"x": 4.25, "y": 0},
- {"x": 5.25, "y": 0},
- {"x": 6.25, "y": 0},
- {"x": 7.25, "y": 0},
- {"x": 8.25, "y": 0},
- {"x": 9.25, "y": 0},
- {"x": 10.25, "y": 0},
- {"x": 11.25, "y": 0},
- {"x": 12.25, "y": 0},
- {"x": 13.25, "y": 0},
- {"x": 14.25, "y": 0},
- {"x": 15.25, "y": 0},
- {"x": 16.25, "y": 0},
- {"x": 17.25, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2.25, "y": 1, "w": 1.5},
- {"x": 3.75, "y": 1},
- {"x": 4.75, "y": 1},
- {"x": 5.75, "y": 1},
- {"x": 6.75, "y": 1},
- {"x": 7.75, "y": 1},
- {"x": 8.75, "y": 1},
- {"x": 9.75, "y": 1},
- {"x": 10.75, "y": 1},
- {"x": 11.75, "y": 1},
- {"x": 12.75, "y": 1},
- {"x": 13.75, "y": 1},
- {"x": 14.75, "y": 1},
- {"x": 17.25, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2.25, "y": 2, "w": 1.75},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
- {"x": 6, "y": 2},
- {"x": 7, "y": 2},
- {"x": 8, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
- {"x": 16, "y": 1, "w": 1.25, "h": 2},
- {"x": 17.25, "y": 2},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2.25, "y": 3, "w": 1.25},
- {"x": 3.5, "y": 3},
- {"x": 4.5, "y": 3},
- {"x": 5.5, "y": 3},
- {"x": 6.5, "y": 3},
- {"x": 7.5, "y": 3},
- {"x": 8.5, "y": 3},
- {"x": 9.5, "y": 3},
- {"x": 10.5, "y": 3},
- {"x": 11.5, "y": 3},
- {"x": 12.5, "y": 3},
- {"x": 13.5, "y": 3},
- {"x": 14.5, "y": 3, "w": 1.75},
- {"x": 16.25, "y": 3},
- {"x": 17.25, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2.25, "y": 4, "w": 1.25},
- {"x": 3.5, "y": 4, "w": 1.25},
- {"x": 4.75, "y": 4, "w": 1.25},
- {"x": 6, "y": 4, "w": 1.25},
- {"x": 7.25, "y": 4, "w": 2.25},
- {"x": 9.5, "y": 4, "w": 2.75},
- {"x": 12.25, "y": 4},
- {"x": 13.25, "y": 4},
- {"x": 14.25, "y": 4},
- {"x": 15.25, "y": 4},
- {"x": 16.25, "y": 4},
- {"x": 17.25, "y": 4}
- ]
- },
- "LAYOUT_all": {
- "layout": [
- {"x": 0, "y": 0},
- {"x": 1, "y": 0},
- {"x": 2.25, "y": 0},
- {"x": 3.25, "y": 0},
- {"x": 4.25, "y": 0},
- {"x": 5.25, "y": 0},
- {"x": 6.25, "y": 0},
- {"x": 7.25, "y": 0},
- {"x": 8.25, "y": 0},
- {"x": 9.25, "y": 0},
- {"x": 10.25, "y": 0},
- {"x": 11.25, "y": 0},
- {"x": 12.25, "y": 0},
- {"x": 13.25, "y": 0},
- {"x": 14.25, "y": 0},
- {"x": 15.25, "y": 0},
- {"x": 16.25, "y": 0},
- {"x": 17.25, "y": 0},
- {"x": 0, "y": 1},
- {"x": 1, "y": 1},
- {"x": 2.25, "y": 1, "w": 1.5},
- {"x": 3.75, "y": 1},
- {"x": 4.75, "y": 1},
- {"x": 5.75, "y": 1},
- {"x": 6.75, "y": 1},
- {"x": 7.75, "y": 1},
- {"x": 8.75, "y": 1},
- {"x": 9.75, "y": 1},
- {"x": 10.75, "y": 1},
- {"x": 11.75, "y": 1},
- {"x": 12.75, "y": 1},
- {"x": 13.75, "y": 1},
- {"x": 14.75, "y": 1},
- {"x": 15.75, "y": 1, "w": 1.5},
- {"x": 17.25, "y": 1},
- {"x": 0, "y": 2},
- {"x": 1, "y": 2},
- {"x": 2.25, "y": 2, "w": 1.75},
- {"x": 4, "y": 2},
- {"x": 5, "y": 2},
- {"x": 6, "y": 2},
- {"x": 7, "y": 2},
- {"x": 8, "y": 2},
- {"x": 9, "y": 2},
- {"x": 10, "y": 2},
- {"x": 11, "y": 2},
- {"x": 12, "y": 2},
- {"x": 13, "y": 2},
- {"x": 14, "y": 2},
- {"x": 15, "y": 2},
- {"x": 16, "y": 2, "w": 1.25},
- {"x": 17.25, "y": 2},
- {"x": 0, "y": 3},
- {"x": 1, "y": 3},
- {"x": 2.25, "y": 3, "w": 1.25},
- {"x": 3.5, "y": 3},
- {"x": 4.5, "y": 3},
- {"x": 5.5, "y": 3},
- {"x": 6.5, "y": 3},
- {"x": 7.5, "y": 3},
- {"x": 8.5, "y": 3},
- {"x": 9.5, "y": 3},
- {"x": 10.5, "y": 3},
- {"x": 11.5, "y": 3},
- {"x": 12.5, "y": 3},
- {"x": 13.5, "y": 3},
- {"x": 14.5, "y": 3, "w": 1.75},
- {"x": 16.25, "y": 3},
- {"x": 17.25, "y": 3},
- {"x": 0, "y": 4},
- {"x": 1, "y": 4},
- {"x": 2.25, "y": 4, "w": 1.25},
- {"x": 3.5, "y": 4, "w": 1.25},
- {"x": 4.75, "y": 4, "w": 1.25},
- {"x": 6, "y": 4, "w": 1.25},
- {"x": 7.25, "y": 4, "w": 2.25},
- {"x": 9.5, "y": 4, "w": 2.75},
- {"x": 12.25, "y": 4},
- {"x": 13.25, "y": 4},
- {"x": 14.25, "y": 4},
- {"x": 15.25, "y": 4},
- {"x": 16.25, "y": 4},
- {"x": 17.25, "y": 4}
- ]
- }
- }
+ "layout_aliases": {"LAYOUT": "LAYOUT_all"}
}
diff --git a/keyboards/keebio/convolution/keymaps/default/keymap.c b/keyboards/keebio/convolution/keymaps/default/keymap.c
index c72c03705c..e9e8d88344 100644
--- a/keyboards/keebio/convolution/keymaps/default/keymap.c
+++ b/keyboards/keebio/convolution/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
[1] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
};
diff --git a/keyboards/keebio/convolution/keymaps/via/keymap.c b/keyboards/keebio/convolution/keymaps/via/keymap.c
index f6f546fd22..1ba6cde836 100644
--- a/keyboards/keebio/convolution/keymaps/via/keymap.c
+++ b/keyboards/keebio/convolution/keymaps/via/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
#ifdef ENCODER_MAP_ENABLE
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD), ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
[1] = { ENCODER_CCW_CW(RGB_MOD, RGB_RMOD), ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
[2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/keebio/convolution/rev1/config.h b/keyboards/keebio/convolution/rev1/config.h
index 35a7d5b00d..b46ba583d7 100644
--- a/keyboards/keebio/convolution/rev1/config.h
+++ b/keyboards/keebio/convolution/rev1/config.h
@@ -17,7 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// RGB Matrix
-#define RGB_DI_PIN GP26
#define RGB_MATRIX_LED_COUNT 16
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/keebio/convolution/rev1/info.json b/keyboards/keebio/convolution/rev1/info.json
index f68dc39158..9280c76288 100644
--- a/keyboards/keebio/convolution/rev1/info.json
+++ b/keyboards/keebio/convolution/rev1/info.json
@@ -20,10 +20,14 @@
"encoder": {
"enabled": true,
"rotary": [
- {"pin_a": "GP19", "pin_b": "GP18" },
- {"pin_a": "GP14", "pin_b": "GP15" }
+ {"pin_a": "GP19", "pin_b": "GP18"},
+ {"pin_a": "GP14", "pin_b": "GP15"}
]
},
+ "ws2812": {
+ "pin": "GP26",
+ "driver": "vendor"
+ },
"rgb_matrix": {
"driver": "WS2812",
"layout": [
@@ -44,5 +48,292 @@
{ "flags": 2, "x": 43, "y": 51 },
{ "flags": 2, "x": 12, "y": 51 }
]
+ },
+ "layouts": {
+ "LAYOUT_65xt": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [5, 8], "x": 9.25, "y": 0},
+ {"matrix": [5, 7], "x": 10.25, "y": 0},
+ {"matrix": [5, 6], "x": 11.25, "y": 0},
+ {"matrix": [5, 5], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 3], "x": 14.25, "y": 0},
+ {"matrix": [5, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 1], "x": 16.25, "y": 0},
+ {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [6, 8], "x": 9.75, "y": 1},
+ {"matrix": [6, 7], "x": 10.75, "y": 1},
+ {"matrix": [6, 6], "x": 11.75, "y": 1},
+ {"matrix": [6, 5], "x": 12.75, "y": 1},
+ {"matrix": [6, 4], "x": 13.75, "y": 1},
+ {"matrix": [6, 3], "x": 14.75, "y": 1},
+ {"matrix": [6, 2], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [6, 0], "x": 17.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [7, 8], "x": 10, "y": 2},
+ {"matrix": [7, 7], "x": 11, "y": 2},
+ {"matrix": [7, 6], "x": 12, "y": 2},
+ {"matrix": [7, 5], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+ {"matrix": [7, 2], "x": 15, "y": 2, "w": 2.25},
+ {"matrix": [7, 0], "x": 17.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [8, 8], "x": 9.5, "y": 3},
+ {"matrix": [8, 7], "x": 10.5, "y": 3},
+ {"matrix": [8, 6], "x": 11.5, "y": 3},
+ {"matrix": [8, 5], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 3], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [8, 2], "x": 16.25, "y": 3},
+ {"matrix": [8, 0], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.25},
+ {"matrix": [9, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 6], "x": 12.25, "y": 4},
+ {"matrix": [9, 5], "x": 13.25, "y": 4},
+ {"matrix": [9, 4], "x": 14.25, "y": 4},
+ {"matrix": [9, 3], "x": 15.25, "y": 4},
+ {"matrix": [9, 2], "x": 16.25, "y": 4},
+ {"matrix": [9, 0], "x": 17.25, "y": 4}
+ ]
+ },
+ "LAYOUT_65xt_iso": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [5, 8], "x": 9.25, "y": 0},
+ {"matrix": [5, 7], "x": 10.25, "y": 0},
+ {"matrix": [5, 6], "x": 11.25, "y": 0},
+ {"matrix": [5, 5], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 3], "x": 14.25, "y": 0},
+ {"matrix": [5, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 1], "x": 16.25, "y": 0},
+ {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [6, 8], "x": 9.75, "y": 1},
+ {"matrix": [6, 7], "x": 10.75, "y": 1},
+ {"matrix": [6, 6], "x": 11.75, "y": 1},
+ {"matrix": [6, 5], "x": 12.75, "y": 1},
+ {"matrix": [6, 4], "x": 13.75, "y": 1},
+ {"matrix": [6, 3], "x": 14.75, "y": 1},
+ {"matrix": [6, 0], "x": 17.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [7, 8], "x": 10, "y": 2},
+ {"matrix": [7, 7], "x": 11, "y": 2},
+ {"matrix": [7, 6], "x": 12, "y": 2},
+ {"matrix": [7, 5], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+ {"matrix": [7, 3], "x": 15, "y": 2},
+ {"matrix": [7, 2], "x": 16, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [7, 0], "x": 17.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [8, 8], "x": 9.5, "y": 3},
+ {"matrix": [8, 7], "x": 10.5, "y": 3},
+ {"matrix": [8, 6], "x": 11.5, "y": 3},
+ {"matrix": [8, 5], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 3], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [8, 2], "x": 16.25, "y": 3},
+ {"matrix": [8, 0], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.25},
+ {"matrix": [9, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 6], "x": 12.25, "y": 4},
+ {"matrix": [9, 5], "x": 13.25, "y": 4},
+ {"matrix": [9, 4], "x": 14.25, "y": 4},
+ {"matrix": [9, 3], "x": 15.25, "y": 4},
+ {"matrix": [9, 2], "x": 16.25, "y": 4},
+ {"matrix": [9, 0], "x": 17.25, "y": 4}
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+
+ {"matrix": [0, 2], "x": 2.25, "y": 0},
+ {"matrix": [0, 3], "x": 3.25, "y": 0},
+ {"matrix": [0, 4], "x": 4.25, "y": 0},
+ {"matrix": [0, 5], "x": 5.25, "y": 0},
+ {"matrix": [0, 6], "x": 6.25, "y": 0},
+ {"matrix": [0, 7], "x": 7.25, "y": 0},
+ {"matrix": [0, 8], "x": 8.25, "y": 0},
+ {"matrix": [5, 8], "x": 9.25, "y": 0},
+ {"matrix": [5, 7], "x": 10.25, "y": 0},
+ {"matrix": [5, 6], "x": 11.25, "y": 0},
+ {"matrix": [5, 5], "x": 12.25, "y": 0},
+ {"matrix": [5, 4], "x": 13.25, "y": 0},
+ {"matrix": [5, 3], "x": 14.25, "y": 0},
+ {"matrix": [5, 2], "x": 15.25, "y": 0},
+ {"matrix": [5, 1], "x": 16.25, "y": 0},
+ {"matrix": [5, 0], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+
+ {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5},
+ {"matrix": [1, 3], "x": 3.75, "y": 1},
+ {"matrix": [1, 4], "x": 4.75, "y": 1},
+ {"matrix": [1, 5], "x": 5.75, "y": 1},
+ {"matrix": [1, 6], "x": 6.75, "y": 1},
+ {"matrix": [1, 7], "x": 7.75, "y": 1},
+ {"matrix": [1, 8], "x": 8.75, "y": 1},
+ {"matrix": [6, 8], "x": 9.75, "y": 1},
+ {"matrix": [6, 7], "x": 10.75, "y": 1},
+ {"matrix": [6, 6], "x": 11.75, "y": 1},
+ {"matrix": [6, 5], "x": 12.75, "y": 1},
+ {"matrix": [6, 4], "x": 13.75, "y": 1},
+ {"matrix": [6, 3], "x": 14.75, "y": 1},
+ {"matrix": [6, 2], "x": 15.75, "y": 1, "w": 1.5},
+ {"matrix": [6, 0], "x": 17.25, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+
+ {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75},
+ {"matrix": [2, 3], "x": 4, "y": 2},
+ {"matrix": [2, 4], "x": 5, "y": 2},
+ {"matrix": [2, 5], "x": 6, "y": 2},
+ {"matrix": [2, 6], "x": 7, "y": 2},
+ {"matrix": [2, 7], "x": 8, "y": 2},
+ {"matrix": [2, 8], "x": 9, "y": 2},
+ {"matrix": [7, 8], "x": 10, "y": 2},
+ {"matrix": [7, 7], "x": 11, "y": 2},
+ {"matrix": [7, 6], "x": 12, "y": 2},
+ {"matrix": [7, 5], "x": 13, "y": 2},
+ {"matrix": [7, 4], "x": 14, "y": 2},
+ {"matrix": [7, 3], "x": 15, "y": 2},
+ {"matrix": [7, 2], "x": 16, "y": 2, "w": 1.25},
+ {"matrix": [7, 0], "x": 17.25, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+
+ {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25},
+ {"matrix": [3, 3], "x": 3.5, "y": 3},
+ {"matrix": [3, 4], "x": 4.5, "y": 3},
+ {"matrix": [3, 5], "x": 5.5, "y": 3},
+ {"matrix": [3, 6], "x": 6.5, "y": 3},
+ {"matrix": [3, 7], "x": 7.5, "y": 3},
+ {"matrix": [3, 8], "x": 8.5, "y": 3},
+ {"matrix": [8, 8], "x": 9.5, "y": 3},
+ {"matrix": [8, 7], "x": 10.5, "y": 3},
+ {"matrix": [8, 6], "x": 11.5, "y": 3},
+ {"matrix": [8, 5], "x": 12.5, "y": 3},
+ {"matrix": [8, 4], "x": 13.5, "y": 3},
+ {"matrix": [8, 3], "x": 14.5, "y": 3, "w": 1.75},
+ {"matrix": [8, 2], "x": 16.25, "y": 3},
+ {"matrix": [8, 0], "x": 17.25, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [4, 1], "x": 1, "y": 4},
+
+ {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25},
+ {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25},
+ {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.25},
+ {"matrix": [9, 8], "x": 9.5, "y": 4, "w": 2.75},
+ {"matrix": [9, 6], "x": 12.25, "y": 4},
+ {"matrix": [9, 5], "x": 13.25, "y": 4},
+ {"matrix": [9, 4], "x": 14.25, "y": 4},
+ {"matrix": [9, 3], "x": 15.25, "y": 4},
+ {"matrix": [9, 2], "x": 16.25, "y": 4},
+ {"matrix": [9, 0], "x": 17.25, "y": 4}
+ ]
+ }
}
}
diff --git a/keyboards/keebio/convolution/rev1/rev1.h b/keyboards/keebio/convolution/rev1/rev1.h
deleted file mode 100644
index c50074c3f3..0000000000
--- a/keyboards/keebio/convolution/rev1/rev1.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/* Copyright 2022 Danny Nguyen <danny@keeb.io>
-
-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 "convolution.h"
-#include "quantum.h"
-
-#define LAYOUT_65xt( \
- LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9, RA9, RA8, RA7, RA6, RA5, RA4, RA3, RA2, RA1, \
- LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9, RB9, RB8, RB7, RB6, RB5, RB4, RB3, RB1, \
- LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9, RC9, RC8, RC7, RC6, RC5, RC3, RC1, \
- LD1, LD2, LD3, LD5, LD6, LD7, LD8, LD9, RD9, RD8, RD7, RD6, RD5, RD4, RD3, RD1, \
- LE1, LE2, LE3, LE4, LE5, LE6, LE9, RE9, RE7, RE6, RE5, RE4, RE3, RE1 \
- ) \
- { \
- { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9 }, \
- { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9 }, \
- { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
- { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, KC_NO, LE9 }, \
- { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
- { RB1, KC_NO, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
- { RC1, KC_NO, RC3, KC_NO, RC5, RC6, RC7, RC8, RC9 }, \
- { RD1, KC_NO, RD3, RD4, RD5, RD6, RD7, RD8, RD9 }, \
- { RE1, KC_NO, RE3, RE4, RE5, RE6, RE7, KC_NO, RE9 } \
- }
-
-#define LAYOUT_65xt_iso( \
- LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9, RA9, RA8, RA7, RA6, RA5, RA4, RA3, RA2, RA1, \
- LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9, RB9, RB8, RB7, RB6, RB5, RB4, RB1, \
- LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9, RC9, RC8, RC7, RC6, RC5, RC4, RC3, RC1, \
- LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD9, RD8, RD7, RD6, RD5, RD4, RD3, RD1, \
- LE1, LE2, LE3, LE4, LE5, LE6, LE9, RE9, RE7, RE6, RE5, RE4, RE3, RE1 \
- ) \
- { \
- { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9 }, \
- { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9 }, \
- { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
- { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, KC_NO, LE9 }, \
- { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
- { RB1, KC_NO, KC_NO, RB4, RB5, RB6, RB7, RB8, RB9 }, \
- { RC1, KC_NO, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
- { RD1, KC_NO, RD3, RD4, RD5, RD6, RD7, RD8, RD9 }, \
- { RE1, KC_NO, RE3, RE4, RE5, RE6, RE7, KC_NO, RE9 } \
- }
-
-#define LAYOUT_all( \
- LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9, RA9, RA8, RA7, RA6, RA5, RA4, RA3, RA2, RA1, \
- LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9, RB9, RB8, RB7, RB6, RB5, RB4, RB3, RB1, \
- LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9, RC9, RC8, RC7, RC6, RC5, RC4, RC3, RC1, \
- LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD9, RD8, RD7, RD6, RD5, RD4, RD3, RD1, \
- LE1, LE2, LE3, LE4, LE5, LE6, LE9, RE9, RE7, RE6, RE5, RE4, RE3, RE1 \
- ) \
- { \
- { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
- { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, LB9 }, \
- { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, LC9 }, \
- { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
- { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, KC_NO, LE9 }, \
- { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
- { RB1, KC_NO, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
- { RC1, KC_NO, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
- { RD1, KC_NO, RD3, RD4, RD5, RD6, RD7, RD8, RD9 }, \
- { RE1, KC_NO, RE3, RE4, RE5, RE6, RE7, KC_NO, RE9 } \
- }
diff --git a/keyboards/keebio/convolution/rev1/rules.mk b/keyboards/keebio/convolution/rev1/rules.mk
index 997fce7e65..e69de29bb2 100644
--- a/keyboards/keebio/convolution/rev1/rules.mk
+++ b/keyboards/keebio/convolution/rev1/rules.mk
@@ -1 +0,0 @@
-WS2812_DRIVER = vendor
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 01:33:10 +0000