summaryrefslogtreecommitdiff
path: root/keyboards/sneakbox
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/sneakbox')
-rw-r--r--keyboards/sneakbox/aliceclone/aliceclone.c2
-rw-r--r--keyboards/sneakbox/aliceclone/aliceclone.h60
-rw-r--r--keyboards/sneakbox/aliceclone/config.h25
-rw-r--r--keyboards/sneakbox/aliceclone/info.json184
-rw-r--r--keyboards/sneakbox/aliceclonergb/aliceclonergb.c32
-rw-r--r--keyboards/sneakbox/aliceclonergb/aliceclonergb.h60
-rw-r--r--keyboards/sneakbox/aliceclonergb/config.h8
-rw-r--r--keyboards/sneakbox/aliceclonergb/info.json190
-rw-r--r--keyboards/sneakbox/ava/ava.c2
-rw-r--r--keyboards/sneakbox/ava/ava.h57
-rw-r--r--keyboards/sneakbox/ava/config.h8
-rw-r--r--keyboards/sneakbox/ava/info.json195
-rw-r--r--keyboards/sneakbox/disarray/ortho/config.h24
-rw-r--r--keyboards/sneakbox/disarray/ortho/info.json105
-rw-r--r--keyboards/sneakbox/disarray/ortho/ortho.c18
-rw-r--r--keyboards/sneakbox/disarray/ortho/ortho.h36
-rw-r--r--keyboards/sneakbox/disarray/staggered/config.h24
-rw-r--r--keyboards/sneakbox/disarray/staggered/info.json97
-rw-r--r--keyboards/sneakbox/disarray/staggered/staggered.c19
-rw-r--r--keyboards/sneakbox/disarray/staggered/staggered.h35
20 files changed, 699 insertions, 482 deletions
diff --git a/keyboards/sneakbox/aliceclone/aliceclone.c b/keyboards/sneakbox/aliceclone/aliceclone.c
index 9cfb4e551d..9ddc198db8 100644
--- a/keyboards/sneakbox/aliceclone/aliceclone.c
+++ b/keyboards/sneakbox/aliceclone/aliceclone.c
@@ -15,7 +15,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 "aliceclone.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
setPinOutput(D7);
diff --git a/keyboards/sneakbox/aliceclone/aliceclone.h b/keyboards/sneakbox/aliceclone/aliceclone.h
deleted file mode 100644
index 49d227fdcf..0000000000
--- a/keyboards/sneakbox/aliceclone/aliceclone.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2020 Bryan Ong
-
-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"
-
-#define LAYOUT_all LAYOUT_alice_split_bs
-
-#define LAYOUT_alice_split_bs( \
- K020, K000, K001, K002, K003, K004, K005, K006, K010, K011, K012, K013, K014, K015, K016, K017, \
- K040, K021, K022, K023, K024, K025, K026, K030, K031, K032, K033, K034, K035, K036, K037, \
- K060, K041, K042, K043, K044, K045, K046, K050, K051, K052, K053, K054, K055, K056, \
- K061, K062, K063, K064, K065, K066, K070, K071, K072, K073, K074, K075, K076, K077, \
- K081, K083, K085, K086, K091, K093, K097 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, KC_NO }, \
- { K010, K011, K012, K013, K014, K015, K016, K017 }, \
- { K020, K021, K022, K023, K024, K025, K026, KC_NO }, \
- { K030, K031, K032, K033, K034, K035, K036, K037 }, \
- { K040, K041, K042, K043, K044, K045, K046, KC_NO }, \
- { K050, K051, K052, K053, K054, K055, K056, KC_NO }, \
- { K060, K061, K062, K063, K064, K065, K066, KC_NO }, \
- { K070, K071, K072, K073, K074, K075, K076, K077 }, \
- { KC_NO, K081, KC_NO, K083, KC_NO, K085, K086, KC_NO }, \
- { KC_NO, K091, KC_NO, K093, KC_NO, KC_NO, KC_NO, K097 } \
-}
-
-#define LAYOUT_alice( \
- K020, K000, K001, K002, K003, K004, K005, K006, K010, K011, K012, K013, K014, K015, K016, \
- K040, K021, K022, K023, K024, K025, K026, K030, K031, K032, K033, K034, K035, K036, K037, \
- K060, K041, K042, K043, K044, K045, K046, K050, K051, K052, K053, K054, K055, K056, \
- K061, K062, K063, K064, K065, K066, K070, K071, K072, K073, K074, K075, K076, K077, \
- K081, K083, K085, K086, K091, K093, K097 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, KC_NO }, \
- { K010, K011, K012, K013, K014, K015, K016, KC_NO }, \
- { K020, K021, K022, K023, K024, K025, K026, KC_NO }, \
- { K030, K031, K032, K033, K034, K035, K036, K037 }, \
- { K040, K041, K042, K043, K044, K045, K046, KC_NO }, \
- { K050, K051, K052, K053, K054, K055, K056, KC_NO }, \
- { K060, K061, K062, K063, K064, K065, K066, KC_NO }, \
- { K070, K071, K072, K073, K074, K075, K076, K077 }, \
- { KC_NO, K081, KC_NO, K083, KC_NO, K085, K086, KC_NO }, \
- { KC_NO, K091, KC_NO, K093, KC_NO, KC_NO, KC_NO, K097 } \
-}
diff --git a/keyboards/sneakbox/aliceclone/config.h b/keyboards/sneakbox/aliceclone/config.h
index cae120ac7e..7c7cad2390 100644
--- a/keyboards/sneakbox/aliceclone/config.h
+++ b/keyboards/sneakbox/aliceclone/config.h
@@ -17,33 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 }
-#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-
-/* 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
-
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sneakbox/aliceclone/info.json b/keyboards/sneakbox/aliceclone/info.json
index 6890765f7f..e53b80f14e 100644
--- a/keyboards/sneakbox/aliceclone/info.json
+++ b/keyboards/sneakbox/aliceclone/info.json
@@ -8,6 +8,11 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"],
+ "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D2", "resolution": 1}
@@ -19,24 +24,167 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["alice", "alice_split_bs"],
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
"layouts": {
- "LAYOUT_alice_split_bs": {
- "layout": [
- {"x":0, "y":0}, {"x":1.25, "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":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.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.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}, {"x":16.75, "y":1, "w":1.5},
- {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "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":2.25},
- {"x":1.25, "y":3, "w":2.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":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}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
- {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
- ]
- },
- "LAYOUT_alice": {
- "layout": [
- {"x":0, "y":0}, {"x":1.25, "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":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, "w":2},
- {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.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}, {"x":16.75, "y":1, "w":1.5},
- {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "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":2.25},
- {"x":1.25, "y":3, "w":2.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":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}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
- {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
- ]
- }
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [2, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [0, 3], "x": 4.25, "y": 0},
+ {"matrix": [0, 4], "x": 5.25, "y": 0},
+ {"matrix": [0, 5], "x": 6.25, "y": 0},
+ {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 10.25, "y": 0},
+ {"matrix": [1, 1], "x": 11.25, "y": 0},
+ {"matrix": [1, 2], "x": 12.25, "y": 0},
+ {"matrix": [1, 3], "x": 13.25, "y": 0},
+ {"matrix": [1, 4], "x": 14.25, "y": 0},
+ {"matrix": [1, 5], "x": 15.25, "y": 0},
+ {"matrix": [1, 6], "x": 16.25, "y": 0, "w": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 1},
+ {"matrix": [2, 3], "x": 3.75, "y": 1},
+ {"matrix": [2, 4], "x": 4.75, "y": 1},
+ {"matrix": [2, 5], "x": 5.75, "y": 1},
+ {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [3, 0], "x": 9.75, "y": 1},
+ {"matrix": [3, 1], "x": 10.75, "y": 1},
+ {"matrix": [3, 2], "x": 11.75, "y": 1},
+ {"matrix": [3, 3], "x": 12.75, "y": 1},
+ {"matrix": [3, 4], "x": 13.75, "y": 1},
+ {"matrix": [3, 5], "x": 14.75, "y": 1},
+ {"matrix": [3, 6], "x": 15.75, "y": 1},
+ {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 2},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [4, 2], "x": 3, "y": 2},
+ {"matrix": [4, 3], "x": 4, "y": 2},
+ {"matrix": [4, 4], "x": 5, "y": 2},
+ {"matrix": [4, 5], "x": 6, "y": 2},
+ {"matrix": [4, 6], "x": 7, "y": 2},
+
+ {"matrix": [5, 0], "x": 10, "y": 2},
+ {"matrix": [5, 1], "x": 11, "y": 2},
+ {"matrix": [5, 2], "x": 12, "y": 2},
+ {"matrix": [5, 3], "x": 13, "y": 2},
+ {"matrix": [5, 4], "x": 14, "y": 2},
+ {"matrix": [5, 5], "x": 15, "y": 2},
+ {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [6, 2], "x": 3.5, "y": 3},
+ {"matrix": [6, 3], "x": 4.5, "y": 3},
+ {"matrix": [6, 4], "x": 5.5, "y": 3},
+ {"matrix": [6, 5], "x": 6.5, "y": 3},
+ {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 3},
+ {"matrix": [7, 1], "x": 10.5, "y": 3},
+ {"matrix": [7, 2], "x": 11.5, "y": 3},
+ {"matrix": [7, 3], "x": 12.5, "y": 3},
+ {"matrix": [7, 4], "x": 13.5, "y": 3},
+ {"matrix": [7, 5], "x": 14.5, "y": 3},
+ {"matrix": [7, 6], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [7, 7], "x": 17.25, "y": 3},
+
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 1.5},
+ {"matrix": [8, 5], "x": 5.5, "y": 4, "w": 2.25},
+ {"matrix": [8, 6], "x": 7.75, "y": 4},
+ {"matrix": [9, 1], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 7], "x": 16.75, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [2, 0], "x": 0, "y": 0},
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [0, 3], "x": 4.25, "y": 0},
+ {"matrix": [0, 4], "x": 5.25, "y": 0},
+ {"matrix": [0, 5], "x": 6.25, "y": 0},
+ {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 10.25, "y": 0},
+ {"matrix": [1, 1], "x": 11.25, "y": 0},
+ {"matrix": [1, 2], "x": 12.25, "y": 0},
+ {"matrix": [1, 3], "x": 13.25, "y": 0},
+ {"matrix": [1, 4], "x": 14.25, "y": 0},
+ {"matrix": [1, 5], "x": 15.25, "y": 0},
+ {"matrix": [1, 6], "x": 16.25, "y": 0},
+ {"matrix": [1, 7], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+ {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 1},
+ {"matrix": [2, 3], "x": 3.75, "y": 1},
+ {"matrix": [2, 4], "x": 4.75, "y": 1},
+ {"matrix": [2, 5], "x": 5.75, "y": 1},
+ {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [3, 0], "x": 9.75, "y": 1},
+ {"matrix": [3, 1], "x": 10.75, "y": 1},
+ {"matrix": [3, 2], "x": 11.75, "y": 1},
+ {"matrix": [3, 3], "x": 12.75, "y": 1},
+ {"matrix": [3, 4], "x": 13.75, "y": 1},
+ {"matrix": [3, 5], "x": 14.75, "y": 1},
+ {"matrix": [3, 6], "x": 15.75, "y": 1},
+ {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 2},
+ {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [4, 2], "x": 3, "y": 2},
+ {"matrix": [4, 3], "x": 4, "y": 2},
+ {"matrix": [4, 4], "x": 5, "y": 2},
+ {"matrix": [4, 5], "x": 6, "y": 2},
+ {"matrix": [4, 6], "x": 7, "y": 2},
+
+ {"matrix": [5, 0], "x": 10, "y": 2},
+ {"matrix": [5, 1], "x": 11, "y": 2},
+ {"matrix": [5, 2], "x": 12, "y": 2},
+ {"matrix": [5, 3], "x": 13, "y": 2},
+ {"matrix": [5, 4], "x": 14, "y": 2},
+ {"matrix": [5, 5], "x": 15, "y": 2},
+ {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [6, 2], "x": 3.5, "y": 3},
+ {"matrix": [6, 3], "x": 4.5, "y": 3},
+ {"matrix": [6, 4], "x": 5.5, "y": 3},
+ {"matrix": [6, 5], "x": 6.5, "y": 3},
+ {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 3},
+ {"matrix": [7, 1], "x": 10.5, "y": 3},
+ {"matrix": [7, 2], "x": 11.5, "y": 3},
+ {"matrix": [7, 3], "x": 12.5, "y": 3},
+ {"matrix": [7, 4], "x": 13.5, "y": 3},
+ {"matrix": [7, 5], "x": 14.5, "y": 3},
+ {"matrix": [7, 6], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [7, 7], "x": 17.25, "y": 3},
+
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 1.5},
+ {"matrix": [8, 5], "x": 5.5, "y": 4, "w": 2.25},
+ {"matrix": [8, 6], "x": 7.75, "y": 4},
+ {"matrix": [9, 1], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 7], "x": 16.75, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/sneakbox/aliceclonergb/aliceclonergb.c b/keyboards/sneakbox/aliceclonergb/aliceclonergb.c
deleted file mode 100644
index e2136312d3..0000000000
--- a/keyboards/sneakbox/aliceclonergb/aliceclonergb.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-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 "aliceclonergb.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
- if (!encoder_update_user(index,clockwise)) { return false; }
- if (index == 0) { /* First encoder */
- if (clockwise) {
- tap_code(KC_DOWN);
- } else {
- tap_code(KC_UP);
- }
- }
- return true;
-}
-#endif
diff --git a/keyboards/sneakbox/aliceclonergb/aliceclonergb.h b/keyboards/sneakbox/aliceclonergb/aliceclonergb.h
deleted file mode 100644
index a946202ba4..0000000000
--- a/keyboards/sneakbox/aliceclonergb/aliceclonergb.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-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"
-
-#define LAYOUT_all LAYOUT_alice_split_bs
-
-#define LAYOUT_alice_split_bs( \
- K020, K000, K001, K002, K003, K004, K005, K006, K010, K011, K012, K013, K014, K015, K016, K017, \
- K040, K021, K022, K023, K024, K025, K026, K030, K031, K032, K033, K034, K035, K036, K037, \
- K060, K041, K042, K043, K044, K045, K046, K050, K051, K052, K053, K054, K055, K056, \
- K061, K062, K063, K064, K065, K066, K070, K071, K072, K073, K074, K075, K076, K077, \
- K081, K083, K085, K086, K091, K093, K097 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, KC_NO }, \
- { K010, K011, K012, K013, K014, K015, K016, K017 }, \
- { K020, K021, K022, K023, K024, K025, K026, KC_NO }, \
- { K030, K031, K032, K033, K034, K035, K036, K037 }, \
- { K040, K041, K042, K043, K044, K045, K046, KC_NO }, \
- { K050, K051, K052, K053, K054, K055, K056, KC_NO }, \
- { K060, K061, K062, K063, K064, K065, K066, KC_NO }, \
- { K070, K071, K072, K073, K074, K075, K076, K077 }, \
- { KC_NO, K081, KC_NO, K083, KC_NO, K085, K086, KC_NO }, \
- { KC_NO, K091, KC_NO, K093, KC_NO, KC_NO, KC_NO, K097 } \
-}
-
-#define LAYOUT_alice( \
- K020, K000, K001, K002, K003, K004, K005, K006, K010, K011, K012, K013, K014, K015, K016, \
- K040, K021, K022, K023, K024, K025, K026, K030, K031, K032, K033, K034, K035, K036, K037, \
- K060, K041, K042, K043, K044, K045, K046, K050, K051, K052, K053, K054, K055, K056, \
- K061, K062, K063, K064, K065, K066, K070, K071, K072, K073, K074, K075, K076, K077, \
- K081, K083, K085, K086, K091, K093, K097 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, KC_NO }, \
- { K010, K011, K012, K013, K014, K015, K016, KC_NO }, \
- { K020, K021, K022, K023, K024, K025, K026, KC_NO }, \
- { K030, K031, K032, K033, K034, K035, K036, K037 }, \
- { K040, K041, K042, K043, K044, K045, K046, KC_NO }, \
- { K050, K051, K052, K053, K054, K055, K056, KC_NO }, \
- { K060, K061, K062, K063, K064, K065, K066, KC_NO }, \
- { K070, K071, K072, K073, K074, K075, K076, K077 }, \
- { KC_NO, K081, KC_NO, K083, KC_NO, K085, K086, KC_NO }, \
- { KC_NO, K091, KC_NO, K093, KC_NO, KC_NO, KC_NO, K097 } \
-}
diff --git a/keyboards/sneakbox/aliceclonergb/config.h b/keyboards/sneakbox/aliceclonergb/config.h
index 26bddb382a..ceccc0915b 100644
--- a/keyboards/sneakbox/aliceclonergb/config.h
+++ b/keyboards/sneakbox/aliceclonergb/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, F7, B7 }
-#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D5
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/sneakbox/aliceclonergb/info.json b/keyboards/sneakbox/aliceclonergb/info.json
index cb7226ae81..e16645e735 100644
--- a/keyboards/sneakbox/aliceclonergb/info.json
+++ b/keyboards/sneakbox/aliceclonergb/info.json
@@ -8,6 +8,11 @@
"pid": "0x0006",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"],
+ "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "F7", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D2", "resolution": 1}
@@ -21,27 +26,176 @@
"bootmagic": {
"matrix": [2, 0]
},
+ "ws2812": {
+ "pin": "D5"
+ },
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"community_layouts": ["alice", "alice_split_bs"],
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_alice_split_bs"
+ },
"layouts": {
- "LAYOUT_alice_split_bs": {
- "layout": [
- {"x":0, "y":0}, {"x":1.25, "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":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.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.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}, {"x":16.75, "y":1, "w":1.5},
- {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "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":2.25},
- {"x":1.25, "y":3, "w":2.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":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}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
- {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
- ]
- },
- "LAYOUT_alice": {
- "layout": [
- {"x":0, "y":0}, {"x":1.25, "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":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, "w":2},
- {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.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}, {"x":16.75, "y":1, "w":1.5},
- {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "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":2.25},
- {"x":1.25, "y":3, "w":2.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":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}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
- {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
- ]
- }
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [2, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [0, 3], "x": 4.25, "y": 0},
+ {"matrix": [0, 4], "x": 5.25, "y": 0},
+ {"matrix": [0, 5], "x": 6.25, "y": 0},
+ {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 10.25, "y": 0},
+ {"matrix": [1, 1], "x": 11.25, "y": 0},
+ {"matrix": [1, 2], "x": 12.25, "y": 0},
+ {"matrix": [1, 3], "x": 13.25, "y": 0},
+ {"matrix": [1, 4], "x": 14.25, "y": 0},
+ {"matrix": [1, 5], "x": 15.25, "y": 0},
+ {"matrix": [1, 6], "x": 16.25, "y": 0},
+ {"matrix": [1, 7], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 1},
+ {"matrix": [2, 3], "x": 3.75, "y": 1},
+ {"matrix": [2, 4], "x": 4.75, "y": 1},
+ {"matrix": [2, 5], "x": 5.75, "y": 1},
+ {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [3, 0], "x": 9.75, "y": 1},
+ {"matrix": [3, 1], "x": 10.75, "y": 1},
+ {"matrix": [3, 2], "x": 11.75, "y": 1},
+ {"matrix": [3, 3], "x": 12.75, "y": 1},
+ {"matrix": [3, 4], "x": 13.75, "y": 1},
+ {"matrix": [3, 5], "x": 14.75, "y": 1},
+ {"matrix": [3, 6], "x": 15.75, "y": 1},
+ {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 2},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [4, 2], "x": 3, "y": 2},
+ {"matrix": [4, 3], "x": 4, "y": 2},
+ {"matrix": [4, 4], "x": 5, "y": 2},
+ {"matrix": [4, 5], "x": 6, "y": 2},
+ {"matrix": [4, 6], "x": 7, "y": 2},
+
+ {"matrix": [5, 0], "x": 10, "y": 2},
+ {"matrix": [5, 1], "x": 11, "y": 2},
+ {"matrix": [5, 2], "x": 12, "y": 2},
+ {"matrix": [5, 3], "x": 13, "y": 2},
+ {"matrix": [5, 4], "x": 14, "y": 2},
+ {"matrix": [5, 5], "x": 15, "y": 2},
+ {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [6, 2], "x": 3.5, "y": 3},
+ {"matrix": [6, 3], "x": 4.5, "y": 3},
+ {"matrix": [6, 4], "x": 5.5, "y": 3},
+ {"matrix": [6, 5], "x": 6.5, "y": 3},
+ {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 3},
+ {"matrix": [7, 1], "x": 10.5, "y": 3},
+ {"matrix": [7, 2], "x": 11.5, "y": 3},
+ {"matrix": [7, 3], "x": 12.5, "y": 3},
+ {"matrix": [7, 4], "x": 13.5, "y": 3},
+ {"matrix": [7, 5], "x": 14.5, "y": 3},
+ {"matrix": [7, 6], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [7, 7], "x": 17.25, "y": 3},
+
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 1.5},
+ {"matrix": [8, 5], "x": 5.5, "y": 4, "w": 2.25},
+ {"matrix": [8, 6], "x": 7.75, "y": 4},
+ {"matrix": [9, 1], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 7], "x": 16.75, "y": 4, "w": 1.5}
+ ]
+ },
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [2, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [0, 3], "x": 4.25, "y": 0},
+ {"matrix": [0, 4], "x": 5.25, "y": 0},
+ {"matrix": [0, 5], "x": 6.25, "y": 0},
+
+ {"matrix": [0, 6], "x": 7.25, "y": 0},
+ {"matrix": [1, 0], "x": 10.25, "y": 0},
+ {"matrix": [1, 1], "x": 11.25, "y": 0},
+ {"matrix": [1, 2], "x": 12.25, "y": 0},
+ {"matrix": [1, 3], "x": 13.25, "y": 0},
+ {"matrix": [1, 4], "x": 14.25, "y": 0},
+ {"matrix": [1, 5], "x": 15.25, "y": 0},
+ {"matrix": [1, 6], "x": 16.25, "y": 0, "w": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 1},
+ {"matrix": [2, 3], "x": 3.75, "y": 1},
+ {"matrix": [2, 4], "x": 4.75, "y": 1},
+ {"matrix": [2, 5], "x": 5.75, "y": 1},
+ {"matrix": [2, 6], "x": 6.75, "y": 1},
+ {"matrix": [3, 0], "x": 9.75, "y": 1},
+
+ {"matrix": [3, 1], "x": 10.75, "y": 1},
+ {"matrix": [3, 2], "x": 11.75, "y": 1},
+ {"matrix": [3, 3], "x": 12.75, "y": 1},
+ {"matrix": [3, 4], "x": 13.75, "y": 1},
+ {"matrix": [3, 5], "x": 14.75, "y": 1},
+ {"matrix": [3, 6], "x": 15.75, "y": 1},
+ {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 2},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [4, 2], "x": 3, "y": 2},
+ {"matrix": [4, 3], "x": 4, "y": 2},
+ {"matrix": [4, 4], "x": 5, "y": 2},
+ {"matrix": [4, 5], "x": 6, "y": 2},
+ {"matrix": [4, 6], "x": 7, "y": 2},
+
+ {"matrix": [5, 0], "x": 10, "y": 2},
+ {"matrix": [5, 1], "x": 11, "y": 2},
+ {"matrix": [5, 2], "x": 12, "y": 2},
+ {"matrix": [5, 3], "x": 13, "y": 2},
+ {"matrix": [5, 4], "x": 14, "y": 2},
+ {"matrix": [5, 5], "x": 15, "y": 2},
+ {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [6, 2], "x": 3.5, "y": 3},
+ {"matrix": [6, 3], "x": 4.5, "y": 3},
+ {"matrix": [6, 4], "x": 5.5, "y": 3},
+ {"matrix": [6, 5], "x": 6.5, "y": 3},
+ {"matrix": [6, 6], "x": 7.5, "y": 3},
+ {"matrix": [7, 0], "x": 9.5, "y": 3},
+
+ {"matrix": [7, 1], "x": 10.5, "y": 3},
+ {"matrix": [7, 2], "x": 11.5, "y": 3},
+ {"matrix": [7, 3], "x": 12.5, "y": 3},
+ {"matrix": [7, 4], "x": 13.5, "y": 3},
+ {"matrix": [7, 5], "x": 14.5, "y": 3},
+ {"matrix": [7, 6], "x": 15.5, "y": 3, "w": 1.75},
+ {"matrix": [7, 7], "x": 17.25, "y": 3},
+
+ {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [8, 3], "x": 4, "y": 4, "w": 1.5},
+ {"matrix": [8, 5], "x": 5.5, "y": 4, "w": 2.25},
+ {"matrix": [8, 6], "x": 7.75, "y": 4},
+ {"matrix": [9, 1], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [9, 3], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [9, 7], "x": 16.75, "y": 4, "w": 1.5}
+ ]
+ }
}
}
diff --git a/keyboards/sneakbox/ava/ava.c b/keyboards/sneakbox/ava/ava.c
index c1b7c76cda..807943c0e9 100644
--- a/keyboards/sneakbox/ava/ava.c
+++ b/keyboards/sneakbox/ava/ava.c
@@ -15,7 +15,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 "ava.h"
+#include "quantum.h"
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index,clockwise)) { return false; }
diff --git a/keyboards/sneakbox/ava/ava.h b/keyboards/sneakbox/ava/ava.h
deleted file mode 100644
index f3aae119d0..0000000000
--- a/keyboards/sneakbox/ava/ava.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-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"
-
-#define LAYOUT_alice_split_bs( \
- K020, K000, K001, K002, K003, K004, K005, K006, K010, K011, K012, K013, K014, K015, K016, K017, \
- K040, K021, K022, K023, K024, K025, K026, K030, K031, K032, K033, K034, K035, K036, K037, \
- K060, K041, K042, K043, K044, K045, K046, K050, K051, K052, K053, K054, K055, K056, \
- K007, K061, K062, K063, K064, K065, K066, K070, K071, K072, K073, K074, K075, K076, K077, \
- K027, K047, K057, K067, K081, K083, K085, K086, K087 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007 }, \
- { K010, K011, K012, K013, K014, K015, K016, K017 }, \
- { K020, K021, K022, K023, K024, K025, K026, K027 }, \
- { K030, K031, K032, K033, K034, K035, K036, K037 }, \
- { K040, K041, K042, K043, K044, K045, K046, K047 }, \
- { K050, K051, K052, K053, K054, K055, K056, K057 }, \
- { K060, K061, K062, K063, K064, K065, K066, K067 }, \
- { K070, K071, K072, K073, K074, K075, K076, K077 }, \
- { KC_NO, K081, KC_NO, K083, KC_NO, K085, K086, K087 } \
-}
-
-#define LAYOUT_alice( \
- K020, K000, K001, K002, K003, K004, K005, K006, K010, K011, K012, K013, K014, K015, K017, \
- K040, K021, K022, K023, K024, K025, K026, K030, K031, K032, K033, K034, K035, K036, K037, \
- K060, K041, K042, K043, K044, K045, K046, K050, K051, K052, K053, K054, K055, K056, \
- K007, K061, K062, K063, K064, K065, K066, K070, K071, K072, K073, K074, K075, K076, K077, \
- K027, K047, K057, K067, K081, K083, K085, K086, K087 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007 }, \
- { K010, K011, K012, K013, K014, K015, KC_NO, K017 }, \
- { K020, K021, K022, K023, K024, K025, K026, K027 }, \
- { K030, K031, K032, K033, K034, K035, K036, K037 }, \
- { K040, K041, K042, K043, K044, K045, K046, K047 }, \
- { K050, K051, K052, K053, K054, K055, K056, K057 }, \
- { K060, K061, K062, K063, K064, K065, K066, K067 }, \
- { K070, K071, K072, K073, K074, K075, K076, K077 }, \
- { KC_NO, K081, KC_NO, K083, KC_NO, K085, K086, K087 } \
-}
-
diff --git a/keyboards/sneakbox/ava/config.h b/keyboards/sneakbox/ava/config.h
index 23a0132305..a97d34f7f2 100644
--- a/keyboards/sneakbox/ava/config.h
+++ b/keyboards/sneakbox/ava/config.h
@@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { F1, E6, F4, B1, F5, B2, F6, B3, B7 }
-#define MATRIX_COL_PINS { F0, D0, C7, C6, B6, B5, B4, D1 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN F7
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/sneakbox/ava/info.json b/keyboards/sneakbox/ava/info.json
index 723fe70fb9..693794e031 100644
--- a/keyboards/sneakbox/ava/info.json
+++ b/keyboards/sneakbox/ava/info.json
@@ -8,6 +8,11 @@
"pid": "0x0004",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "D0", "C7", "C6", "B6", "B5", "B4", "D1"],
+ "rows": ["F1", "E6", "F4", "B1", "F5", "B2", "F6", "B3", "B7"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D3", "pin_b": "D2", "resolution": 1}
@@ -17,6 +22,9 @@
"caps_lock": "D6",
"num_lock": "D4"
},
+ "ws2812": {
+ "pin": "F7"
+ },
"bootmagic": {
"matrix": [2, 0]
},
@@ -28,23 +36,174 @@
"LAYOUT_ava": "LAYOUT_alice"
},
"layouts": {
- "LAYOUT_alice_split_bs": {
- "layout": [
- {"x":0, "y":0}, {"x":1.25, "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":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.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.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}, {"x":16.75, "y":1, "w":1.5},
- {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "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":2.25},
- {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.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":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}, {"x":15.65, "y":3.25}, {"x":16.75, "y":3, "w":1.5},
- {"x":1.25, "y":4, "w":1.5}, {"x":2.75, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25}
- ]
- },
- "LAYOUT_alice": {
- "layout": [
- {"x":0, "y":0}, {"x":1.25, "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":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, "w":2},
- {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.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}, {"x":16.75, "y":1, "w":1.5},
- {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "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":2.25},
- {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.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":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}, {"x":15.65, "y":3.25}, {"x":16.75, "y":3, "w":1.5},
- {"x":1.25, "y":4, "w":1.5}, {"x":2.75, "y":4}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":2.25}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25}
- ]
- }
+ "LAYOUT_alice_split_bs": {
+ "layout": [
+ {"matrix": [2, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [0, 3], "x": 4.25, "y": 0},
+ {"matrix": [0, 4], "x": 5.25, "y": 0},
+ {"matrix": [0, 5], "x": 6.25, "y": 0},
+ {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 10.25, "y": 0},
+ {"matrix": [1, 1], "x": 11.25, "y": 0},
+ {"matrix": [1, 2], "x": 12.25, "y": 0},
+ {"matrix": [1, 3], "x": 13.25, "y": 0},
+ {"matrix": [1, 4], "x": 14.25, "y": 0},
+ {"matrix": [1, 5], "x": 15.25, "y": 0},
+ {"matrix": [1, 6], "x": 16.25, "y": 0},
+ {"matrix": [1, 7], "x": 17.25, "y": 0},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 1},
+ {"matrix": [2, 3], "x": 3.75, "y": 1},
+ {"matrix": [2, 4], "x": 4.75, "y": 1},
+ {"matrix": [2, 5], "x": 5.75, "y": 1},
+ {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [3, 0], "x": 9.75, "y": 1},
+ {"matrix": [3, 1], "x": 10.75, "y": 1},
+ {"matrix": [3, 2], "x": 11.75, "y": 1},
+ {"matrix": [3, 3], "x": 12.75, "y": 1},
+ {"matrix": [3, 4], "x": 13.75, "y": 1},
+ {"matrix": [3, 5], "x": 14.75, "y": 1},
+ {"matrix": [3, 6], "x": 15.75, "y": 1},
+ {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 2},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [4, 2], "x": 3, "y": 2},
+ {"matrix": [4, 3], "x": 4, "y": 2},
+ {"matrix": [4, 4], "x": 5, "y": 2},
+ {"matrix": [4, 5], "x": 6, "y": 2},
+ {"matrix": [4, 6], "x": 7, "y": 2},
+
+ {"matrix": [5, 0], "x": 10, "y": 2},
+ {"matrix": [5, 1], "x": 11, "y": 2},
+ {"matrix": [5, 2], "x": 12, "y": 2},
+ {"matrix": [5, 3], "x": 13, "y": 2},
+ {"matrix": [5, 4], "x": 14, "y": 2},
+ {"matrix": [5, 5], "x": 15, "y": 2},
+ {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [0, 7], "x": 0, "y": 3},
+
+ {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [6, 2], "x": 3.5, "y": 3},
+ {"matrix": [6, 3], "x": 4.5, "y": 3},
+ {"matrix": [6, 4], "x": 5.5, "y": 3},
+ {"matrix": [6, 5], "x": 6.5, "y": 3},
+ {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 3},
+ {"matrix": [7, 1], "x": 10.5, "y": 3},
+ {"matrix": [7, 2], "x": 11.5, "y": 3},
+ {"matrix": [7, 3], "x": 12.5, "y": 3},
+ {"matrix": [7, 4], "x": 13.5, "y": 3},
+ {"matrix": [7, 5], "x": 14.5, "y": 3},
+ {"matrix": [7, 6], "x": 15.65, "y": 3.25},
+ {"matrix": [7, 7], "x": 16.75, "y": 3, "w": 1.5},
+
+ {"matrix": [2, 7], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 2.75, "y": 4},
+ {"matrix": [5, 7], "x": 5, "y": 4, "w": 1.5},
+ {"matrix": [6, 7], "x": 6.5, "y": 4, "w": 2.25},
+ {"matrix": [8, 1], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [8, 3], "x": 12.5, "y": 4},
+ {"matrix": [8, 5], "x": 14.65, "y": 4.25},
+ {"matrix": [8, 6], "x": 15.65, "y": 4.25},
+ {"matrix": [8, 7], "x": 16.65, "y": 4.25}
+ ]
+ },
+ "LAYOUT_alice": {
+ "layout": [
+ {"matrix": [2, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [0, 2], "x": 3.25, "y": 0},
+ {"matrix": [0, 3], "x": 4.25, "y": 0},
+ {"matrix": [0, 4], "x": 5.25, "y": 0},
+ {"matrix": [0, 5], "x": 6.25, "y": 0},
+ {"matrix": [0, 6], "x": 7.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 10.25, "y": 0},
+ {"matrix": [1, 1], "x": 11.25, "y": 0},
+ {"matrix": [1, 2], "x": 12.25, "y": 0},
+ {"matrix": [1, 3], "x": 13.25, "y": 0},
+ {"matrix": [1, 4], "x": 14.25, "y": 0},
+ {"matrix": [1, 5], "x": 15.25, "y": 0},
+ {"matrix": [1, 7], "x": 16.25, "y": 0, "w": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 1},
+
+ {"matrix": [2, 1], "x": 1.25, "y": 1, "w": 1.5},
+ {"matrix": [2, 2], "x": 2.75, "y": 1},
+ {"matrix": [2, 3], "x": 3.75, "y": 1},
+ {"matrix": [2, 4], "x": 4.75, "y": 1},
+ {"matrix": [2, 5], "x": 5.75, "y": 1},
+ {"matrix": [2, 6], "x": 6.75, "y": 1},
+
+ {"matrix": [3, 0], "x": 9.75, "y": 1},
+ {"matrix": [3, 1], "x": 10.75, "y": 1},
+ {"matrix": [3, 2], "x": 11.75, "y": 1},
+ {"matrix": [3, 3], "x": 12.75, "y": 1},
+ {"matrix": [3, 4], "x": 13.75, "y": 1},
+ {"matrix": [3, 5], "x": 14.75, "y": 1},
+ {"matrix": [3, 6], "x": 15.75, "y": 1},
+ {"matrix": [3, 7], "x": 16.75, "y": 1, "w": 1.5},
+
+ {"matrix": [6, 0], "x": 0, "y": 2},
+
+ {"matrix": [4, 1], "x": 1.25, "y": 2, "w": 1.75},
+ {"matrix": [4, 2], "x": 3, "y": 2},
+ {"matrix": [4, 3], "x": 4, "y": 2},
+ {"matrix": [4, 4], "x": 5, "y": 2},
+ {"matrix": [4, 5], "x": 6, "y": 2},
+ {"matrix": [4, 6], "x": 7, "y": 2},
+
+ {"matrix": [5, 0], "x": 10, "y": 2},
+ {"matrix": [5, 1], "x": 11, "y": 2},
+ {"matrix": [5, 2], "x": 12, "y": 2},
+ {"matrix": [5, 3], "x": 13, "y": 2},
+ {"matrix": [5, 4], "x": 14, "y": 2},
+ {"matrix": [5, 5], "x": 15, "y": 2},
+ {"matrix": [5, 6], "x": 16, "y": 2, "w": 2.25},
+
+ {"matrix": [0, 7], "x": 0, "y": 3},
+
+ {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.25},
+ {"matrix": [6, 2], "x": 3.5, "y": 3},
+ {"matrix": [6, 3], "x": 4.5, "y": 3},
+ {"matrix": [6, 4], "x": 5.5, "y": 3},
+ {"matrix": [6, 5], "x": 6.5, "y": 3},
+ {"matrix": [6, 6], "x": 7.5, "y": 3},
+
+ {"matrix": [7, 0], "x": 9.5, "y": 3},
+ {"matrix": [7, 1], "x": 10.5, "y": 3},
+ {"matrix": [7, 2], "x": 11.5, "y": 3},
+ {"matrix": [7, 3], "x": 12.5, "y": 3},
+ {"matrix": [7, 4], "x": 13.5, "y": 3},
+ {"matrix": [7, 5], "x": 14.5, "y": 3},
+ {"matrix": [7, 6], "x": 15.65, "y": 3.25},
+ {"matrix": [7, 7], "x": 16.75, "y": 3, "w": 1.5},
+
+ {"matrix": [2, 7], "x": 1.25, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 2.75, "y": 4},
+ {"matrix": [5, 7], "x": 5, "y": 4, "w": 1.5},
+ {"matrix": [6, 7], "x": 6.5, "y": 4, "w": 2.25},
+ {"matrix": [8, 1], "x": 9.75, "y": 4, "w": 2.75},
+ {"matrix": [8, 3], "x": 12.5, "y": 4},
+ {"matrix": [8, 5], "x": 14.65, "y": 4.25},
+ {"matrix": [8, 6], "x": 15.65, "y": 4.25},
+ {"matrix": [8, 7], "x": 16.65, "y": 4.25}
+ ]
+ }
}
}
diff --git a/keyboards/sneakbox/disarray/ortho/config.h b/keyboards/sneakbox/disarray/ortho/config.h
index 78b024604c..25382dd5f1 100644
--- a/keyboards/sneakbox/disarray/ortho/config.h
+++ b/keyboards/sneakbox/disarray/ortho/config.h
@@ -17,32 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3, B0}
-#define MATRIX_COL_PINS { D5, D4, D6, D7, B4, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0, E6}
-
-/* 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
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json
index 65c8ff41d1..40b2b0ed2f 100644
--- a/keyboards/sneakbox/disarray/ortho/info.json
+++ b/keyboards/sneakbox/disarray/ortho/info.json
@@ -8,6 +8,11 @@
"pid": "0x0003",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"],
+ "rows": ["B7", "D0", "D1", "D2", "D3", "B0"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B2", "resolution": 1}
@@ -22,15 +27,95 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT": {
- "layout": [
- {"y":0, "x":0},
- {"y":1, "x":0},{"y":1, "x":1},{"y":1, "x":2},{"y":1, "x":3},{"y":1, "x":4},{"y":1, "x":5},{"y":1, "x":6},{"y":1, "x":7},{"y":1, "x":8},{"y":1, "x":9},{"y":1, "x":10},{"y":1, "x":11},{"y":1, "x":12},{"y":1, "x":13},{"y":1, "x":14},{"y":1, "x":15},
- {"y":2, "x":0},{"y":2, "x":1},{"y":2, "x":2},{"y":2, "x":3},{"y":2, "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":3, "x":0},{"y":3, "x":1},{"y":3, "x":2},{"y":3, "x":3},{"y":3, "x":4},{"y":3, "x":5},{"y":3, "x":6},{"y":3, "x":7},{"y":3, "x":8},{"y":3, "x":9},{"y":3, "x":10},{"y":3, "x":11},{"y":3, "x":12},{"y":3, "x":13},{"y":3, "x":14},{"y":3, "x":15},
- {"y":4, "x":0},{"y":4, "x":1},{"y":4, "x":2},{"y":4, "x":3},{"y":4, "x":4},{"y":4, "x":5},{"y":4, "x":6},{"y":4, "x":7},{"y":4, "x":8},{"y":4, "x":9},{"y":4, "x":10},{"y":4, "x":11},{"y":4, "x":12},{"y":4, "x":13},{"y":4, "x":14},{"y":4, "x":15},
- {"y":5, "x":0},{"y":5, "x":1},{"y":5, "x":2},{"y":5, "x":3},{"y":5, "x":4},{"y":5, "x":5},{"y":5, "x":6},{"y":5, "x":7},{"y":5, "x":8},{"y":5, "x":9},{"y":5, "x":10},{"y":5, "x":11},{"y":5, "x":12},{"y":5, "x":13},{"y":5, "x":14},{"y":5, "x":15}
- ]
- }
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 8], "x": 8, "y": 1},
+ {"matrix": [0, 9], "x": 9, "y": 1},
+ {"matrix": [0, 10], "x": 10, "y": 1},
+ {"matrix": [0, 11], "x": 11, "y": 1},
+ {"matrix": [0, 12], "x": 12, "y": 1},
+ {"matrix": [0, 13], "x": 13, "y": 1},
+ {"matrix": [0, 14], "x": 14, "y": 1},
+ {"matrix": [0, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [1, 1], "x": 1, "y": 2},
+ {"matrix": [1, 2], "x": 2, "y": 2},
+ {"matrix": [1, 3], "x": 3, "y": 2},
+ {"matrix": [1, 4], "x": 4, "y": 2},
+ {"matrix": [1, 5], "x": 5, "y": 2},
+ {"matrix": [1, 6], "x": 6, "y": 2},
+ {"matrix": [1, 7], "x": 7, "y": 2},
+ {"matrix": [1, 8], "x": 8, "y": 2},
+ {"matrix": [1, 9], "x": 9, "y": 2},
+ {"matrix": [1, 10], "x": 10, "y": 2},
+ {"matrix": [1, 11], "x": 11, "y": 2},
+ {"matrix": [1, 12], "x": 12, "y": 2},
+ {"matrix": [1, 13], "x": 13, "y": 2},
+ {"matrix": [1, 14], "x": 14, "y": 2},
+ {"matrix": [1, 15], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [2, 1], "x": 1, "y": 3},
+ {"matrix": [2, 2], "x": 2, "y": 3},
+ {"matrix": [2, 3], "x": 3, "y": 3},
+ {"matrix": [2, 4], "x": 4, "y": 3},
+ {"matrix": [2, 5], "x": 5, "y": 3},
+ {"matrix": [2, 6], "x": 6, "y": 3},
+ {"matrix": [2, 7], "x": 7, "y": 3},
+ {"matrix": [2, 8], "x": 8, "y": 3},
+ {"matrix": [2, 9], "x": 9, "y": 3},
+ {"matrix": [2, 10], "x": 10, "y": 3},
+ {"matrix": [2, 11], "x": 11, "y": 3},
+ {"matrix": [2, 12], "x": 12, "y": 3},
+ {"matrix": [2, 13], "x": 13, "y": 3},
+ {"matrix": [2, 14], "x": 14, "y": 3},
+ {"matrix": [2, 15], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4},
+ {"matrix": [3, 1], "x": 1, "y": 4},
+ {"matrix": [3, 2], "x": 2, "y": 4},
+ {"matrix": [3, 3], "x": 3, "y": 4},
+ {"matrix": [3, 4], "x": 4, "y": 4},
+ {"matrix": [3, 5], "x": 5, "y": 4},
+ {"matrix": [3, 6], "x": 6, "y": 4},
+ {"matrix": [3, 7], "x": 7, "y": 4},
+ {"matrix": [3, 8], "x": 8, "y": 4},
+ {"matrix": [3, 9], "x": 9, "y": 4},
+ {"matrix": [3, 10], "x": 10, "y": 4},
+ {"matrix": [3, 11], "x": 11, "y": 4},
+ {"matrix": [3, 12], "x": 12, "y": 4},
+ {"matrix": [3, 13], "x": 13, "y": 4},
+ {"matrix": [3, 14], "x": 14, "y": 4},
+ {"matrix": [3, 15], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5},
+ {"matrix": [4, 1], "x": 1, "y": 5},
+ {"matrix": [4, 2], "x": 2, "y": 5},
+ {"matrix": [4, 3], "x": 3, "y": 5},
+ {"matrix": [4, 4], "x": 4, "y": 5},
+ {"matrix": [4, 5], "x": 5, "y": 5},
+ {"matrix": [4, 6], "x": 6, "y": 5},
+ {"matrix": [4, 7], "x": 7, "y": 5},
+ {"matrix": [4, 8], "x": 8, "y": 5},
+ {"matrix": [4, 9], "x": 9, "y": 5},
+ {"matrix": [4, 10], "x": 10, "y": 5},
+ {"matrix": [4, 11], "x": 11, "y": 5},
+ {"matrix": [4, 12], "x": 12, "y": 5},
+ {"matrix": [4, 13], "x": 13, "y": 5},
+ {"matrix": [4, 14], "x": 14, "y": 5},
+ {"matrix": [4, 15], "x": 15, "y": 5}
+ ]
+ }
}
}
diff --git a/keyboards/sneakbox/disarray/ortho/ortho.c b/keyboards/sneakbox/disarray/ortho/ortho.c
deleted file mode 100644
index d11c36b74c..0000000000
--- a/keyboards/sneakbox/disarray/ortho/ortho.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright 2020 Bryan Ong
-
-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 "ortho.h"
diff --git a/keyboards/sneakbox/disarray/ortho/ortho.h b/keyboards/sneakbox/disarray/ortho/ortho.h
deleted file mode 100644
index 1954d4ffb3..0000000000
--- a/keyboards/sneakbox/disarray/ortho/ortho.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-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"
-
-#define LAYOUT( \
- K000, \
- K100, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
- K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
- K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
- K400, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
- K500, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015}, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115}, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215}, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315}, \
- { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415}, \
- { K500 } \
-}
diff --git a/keyboards/sneakbox/disarray/staggered/config.h b/keyboards/sneakbox/disarray/staggered/config.h
index 486442bcf1..25382dd5f1 100644
--- a/keyboards/sneakbox/disarray/staggered/config.h
+++ b/keyboards/sneakbox/disarray/staggered/config.h
@@ -17,32 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-/* key matrix pins */
-#define MATRIX_ROW_PINS { B7, D0, D1, D2, D3}
-#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6}
-
-/* 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
-
-#ifdef RGB_DI_PIN
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLED_NUM 0
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#endif
diff --git a/keyboards/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/info.json
index 1a788b77ec..ff79e2ada5 100644
--- a/keyboards/sneakbox/disarray/staggered/info.json
+++ b/keyboards/sneakbox/disarray/staggered/info.json
@@ -8,6 +8,11 @@
"pid": "0x0002",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6"],
+ "rows": ["B7", "D0", "D1", "D2", "D3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B3", "pin_b": "B2", "resolution": 1}
@@ -22,15 +27,87 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
- "LAYOUT": {
- "layout": [
- {"y":0, "x":0},
- {"y":1, "x":0},{"y":1, "x":1},{"y":1, "x":2},{"y":1, "x":3},{"y":1, "x":4},{"y":1, "x":5},{"y":1, "x":6},{"y":1, "x":7},{"y":1, "x":8},{"y":1, "x":9},{"y":1, "x":10},{"y":1, "x":11},{"y":1, "x":12},{"y":1, "x":13},{"y":1, "x":14},{"y":1, "x":15},
- {"y":2, "x":0, "w":1.5},{"y":2, "x":1.5},{"y":2, "x":2.5},{"y":2, "x":3.5},{"y":2, "x":4.5},{"y":2, "x":5.5},{"y":2, "x":6.5},{"y":2, "x":7.5},{"y":2, "x":8.5},{"y":2, "x":9.5},{"y":2, "x":10.5},{"y":2, "x":11.5},{"y":2, "x":12.5},{"y":2, "x":13.5, "w":1.5},{"y":2, "x":15},
- {"y":3, "x":0, "w":1.75},{"y":3, "x":1.75},{"y":3, "x":2.75},{"y":3, "x":3.75},{"y":3, "x":4.75},{"y":3, "x":5.75},{"y":3, "x":6.75},{"y":3, "x":7.75},{"y":3, "x":8.75},{"y":3, "x":9.75},{"y":3, "x":10.75},{"y":3, "x":11.75},{"y":3, "x":12.75, "w":2.25},{"y":3, "x":15},
- {"y":4, "x":0,"w":1.25},{"y":4, "x":1.25},{"y":4, "x":2.25},{"y":4, "x":3.25},{"y":4, "x":4.25},{"y":4, "x":5.25},{"y":4, "x":6.25},{"y":4, "x":7.25},{"y":4, "x":8.25},{"y":4, "x":9.25},{"y":4, "x":10.25},{"y":4, "x":11.25},{"y":4, "x":12.25, "w":1.75},{"y":4, "x":14},{"y":4, "x":15},
- {"y":5, "x":0,"w":1.25},{"y":5, "x":1.25,"w":1.25},{"y":5, "x":2.5,"w":1.25},{"y":5, "x":3.75,"w":1.25},{"y":5, "x":5,"w":2.25},{"y":5, "x":7.25,"w":2.75},{"y":5, "x":10},{"y":5, "x":11},{"y":5, "x":12},{"y":5, "x":13},{"y":5, "x":14},{"y":5, "x":15}
- ]
- }
+ "LAYOUT": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [0, 1], "x": 1, "y": 1},
+ {"matrix": [0, 2], "x": 2, "y": 1},
+ {"matrix": [0, 3], "x": 3, "y": 1},
+ {"matrix": [0, 4], "x": 4, "y": 1},
+ {"matrix": [0, 5], "x": 5, "y": 1},
+ {"matrix": [0, 6], "x": 6, "y": 1},
+ {"matrix": [0, 7], "x": 7, "y": 1},
+ {"matrix": [0, 8], "x": 8, "y": 1},
+ {"matrix": [0, 9], "x": 9, "y": 1},
+ {"matrix": [0, 10], "x": 10, "y": 1},
+ {"matrix": [0, 11], "x": 11, "y": 1},
+ {"matrix": [0, 12], "x": 12, "y": 1},
+ {"matrix": [0, 13], "x": 13, "y": 1},
+ {"matrix": [0, 14], "x": 14, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 2},
+ {"matrix": [1, 2], "x": 2.5, "y": 2},
+ {"matrix": [1, 3], "x": 3.5, "y": 2},
+ {"matrix": [1, 4], "x": 4.5, "y": 2},
+ {"matrix": [1, 5], "x": 5.5, "y": 2},
+ {"matrix": [1, 6], "x": 6.5, "y": 2},
+ {"matrix": [1, 7], "x": 7.5, "y": 2},
+ {"matrix": [1, 8], "x": 8.5, "y": 2},
+ {"matrix": [1, 9], "x": 9.5, "y": 2},
+ {"matrix": [1, 10], "x": 10.5, "y": 2},
+ {"matrix": [1, 11], "x": 11.5, "y": 2},
+ {"matrix": [1, 12], "x": 12.5, "y": 2},
+ {"matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [2, 1], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 3},
+ {"matrix": [2, 3], "x": 2.75, "y": 3},
+ {"matrix": [2, 4], "x": 3.75, "y": 3},
+ {"matrix": [2, 5], "x": 4.75, "y": 3},
+ {"matrix": [2, 6], "x": 5.75, "y": 3},
+ {"matrix": [2, 7], "x": 6.75, "y": 3},
+ {"matrix": [2, 8], "x": 7.75, "y": 3},
+ {"matrix": [2, 9], "x": 8.75, "y": 3},
+ {"matrix": [2, 10], "x": 9.75, "y": 3},
+ {"matrix": [2, 11], "x": 10.75, "y": 3},
+ {"matrix": [2, 12], "x": 11.75, "y": 3},
+ {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+
+ {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 4},
+ {"matrix": [3, 2], "x": 2.25, "y": 4},
+ {"matrix": [3, 3], "x": 3.25, "y": 4},
+ {"matrix": [3, 4], "x": 4.25, "y": 4},
+ {"matrix": [3, 5], "x": 5.25, "y": 4},
+ {"matrix": [3, 6], "x": 6.25, "y": 4},
+ {"matrix": [3, 7], "x": 7.25, "y": 4},
+ {"matrix": [3, 8], "x": 8.25, "y": 4},
+ {"matrix": [3, 9], "x": 9.25, "y": 4},
+ {"matrix": [3, 10], "x": 10.25, "y": 4},
+ {"matrix": [3, 11], "x": 11.25, "y": 4},
+ {"matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [4, 1], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [4, 2], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [4, 3], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [4, 4], "x": 3.75, "y": 5, "w": 1.25},
+ {"matrix": [4, 5], "x": 5, "y": 5, "w": 2.25},
+ {"matrix": [4, 6], "x": 7.25, "y": 5, "w": 2.75},
+ {"matrix": [4, 8], "x": 10, "y": 5},
+ {"matrix": [4, 9], "x": 11, "y": 5},
+ {"matrix": [4, 10], "x": 12, "y": 5},
+ {"matrix": [4, 11], "x": 13, "y": 5},
+ {"matrix": [4, 12], "x": 14, "y": 5},
+ {"matrix": [4, 13], "x": 15, "y": 5}
+ ]
+ }
}
}
diff --git a/keyboards/sneakbox/disarray/staggered/staggered.c b/keyboards/sneakbox/disarray/staggered/staggered.c
deleted file mode 100644
index 247fc6eb5e..0000000000
--- a/keyboards/sneakbox/disarray/staggered/staggered.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-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 "staggered.h"
-
diff --git a/keyboards/sneakbox/disarray/staggered/staggered.h b/keyboards/sneakbox/disarray/staggered/staggered.h
deleted file mode 100644
index 58b7431d51..0000000000
--- a/keyboards/sneakbox/disarray/staggered/staggered.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright 2021 Bryan Ong
-
-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"
-
-#define LAYOUT( \
- K000, \
- K100, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K114, \
- K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K214, \
- K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K314, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K414, \
- K401, K402, K403, K404, K405, K406, K408, K409, K410, K411, K412, K413 \
-) { \
- { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
- { KC_NO, K401, K402, K403, K404, K405, K406, KC_NO, K408, K409, K410, K411, K412, K413, K414 } \
-}