summaryrefslogtreecommitdiff
path: root/keyboards/salicylic_acid3/7skb
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/salicylic_acid3/7skb')
-rw-r--r--keyboards/salicylic_acid3/7skb/7skb.c1
-rw-r--r--keyboards/salicylic_acid3/7skb/7skb.h7
-rw-r--r--keyboards/salicylic_acid3/7skb/rev1/config.h9
-rw-r--r--keyboards/salicylic_acid3/7skb/rev1/info.json143
-rw-r--r--keyboards/salicylic_acid3/7skb/rev1/rev1.c1
-rw-r--r--keyboards/salicylic_acid3/7skb/rev1/rev1.h42
6 files changed, 80 insertions, 123 deletions
diff --git a/keyboards/salicylic_acid3/7skb/7skb.c b/keyboards/salicylic_acid3/7skb/7skb.c
deleted file mode 100644
index 3044e02233..0000000000
--- a/keyboards/salicylic_acid3/7skb/7skb.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "7skb.h"
diff --git a/keyboards/salicylic_acid3/7skb/7skb.h b/keyboards/salicylic_acid3/7skb/7skb.h
deleted file mode 100644
index 5043a46747..0000000000
--- a/keyboards/salicylic_acid3/7skb/7skb.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#ifdef KEYBOARD_salicylic_acid3_7skb_rev1
- #include "rev1.h"
-#endif
diff --git a/keyboards/salicylic_acid3/7skb/rev1/config.h b/keyboards/salicylic_acid3/7skb/rev1/config.h
index b85eee3da2..573efb81c7 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/config.h
+++ b/keyboards/salicylic_acid3/7skb/rev1/config.h
@@ -18,12 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-// wiring of each half
-#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B5 }
-
-#define DIODE_DIRECTION COL2ROW
-
#define SPLIT_HAND_PIN B6
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -31,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
-/* ws2812 RGB LED */
-#define RGB_DI_PIN D3
-
#ifndef RGBLED_NUM
#define RGBLED_NUM 12
#define RGBLIGHT_SPLIT
diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json
index 242135b16c..da6acd3a3a 100644
--- a/keyboards/salicylic_acid3/7skb/rev1/info.json
+++ b/keyboards/salicylic_acid3/7skb/rev1/info.json
@@ -8,77 +8,94 @@
"pid": "0xEB5F",
"device_version": "0.0.7"
},
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B5"],
+ "rows": ["D4", "C6", "D7", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"split": {
"soft_serial_pin": "D2"
},
+ "ws2812": {
+ "pin": "D3"
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"1", "x":1, "y":0},
- {"label":"2", "x":2, "y":0},
- {"label":"3", "x":3, "y":0},
- {"label":"4", "x":4, "y":0},
- {"label":"5", "x":5, "y":0},
- {"label":"6", "x":7, "y":0},
- {"label":"7", "x":8, "y":0},
- {"label":"8", "x":9, "y":0},
- {"label":"9", "x":10, "y":0},
- {"label":"0", "x":11, "y":0},
- {"label":"-", "x":12, "y":0},
- {"label":"=", "x":13, "y":0},
- {"label":"\\", "x":14, "y":0},
- {"label":"`", "x":15, "y":0},
- {"label":"Tab", "x":0, "y":1, "w":1.5},
- {"label":"Q", "x":1.5, "y":1},
- {"label":"W", "x":2.5, "y":1},
- {"label":"E", "x":3.5, "y":1},
- {"label":"R", "x":4.5, "y":1},
- {"label":"T", "x":5.5, "y":1},
- {"label":"Y", "x":7.5, "y":1},
- {"label":"U", "x":8.5, "y":1},
- {"label":"I", "x":9.5, "y":1},
- {"label":"O", "x":10.5, "y":1},
- {"label":"P", "x":11.5, "y":1},
- {"label":"[", "x":12.5, "y":1},
- {"label":"]", "x":13.5, "y":1},
- {"label":"Delete", "x":14.5, "y":1, "w":1.5},
- {"label":"Control", "x":0, "y":2, "w":1.75},
- {"label":"A", "x":1.75, "y":2},
- {"label":"S", "x":2.75, "y":2},
- {"label":"D", "x":3.75, "y":2},
- {"label":"F", "x":4.75, "y":2},
- {"label":"G", "x":5.75, "y":2},
- {"label":"H", "x":7.75, "y":2},
- {"label":"J", "x":8.75, "y":2},
- {"label":"K", "x":9.75, "y":2},
- {"label":"L", "x":10.75, "y":2},
- {"label":";", "x":11.75, "y":2},
- {"label":"'", "x":12.75, "y":2},
- {"label":"Enter", "x":13.75, "y":2, "w":2.25},
- {"label":"Shift", "x":0, "y":3, "w":2.25},
- {"label":"Z", "x":2.25, "y":3},
- {"label":"X", "x":3.25, "y":3},
- {"label":"C", "x":4.25, "y":3},
- {"label":"V", "x":5.25, "y":3},
- {"label":"B", "x":6.25, "y":3},
- {"label":"N", "x":8.25, "y":3},
- {"label":"M", "x":9.25, "y":3},
- {"label":",", "x":10.25, "y":3},
- {"label":".", "x":11.25, "y":3},
- {"label":"/", "x":12.25, "y":3},
- {"label":"Shift", "x":13.25, "y":3, "w":1.75},
- {"label":"Fn", "x":15, "y":3},
- {"label":"Alt", "x":1.5, "y":4},
- {"label":"GUI", "x":2.5, "y":4, "w":1.5},
- {"x":4, "y":4, "w":1.5},
- {"x":5.5, "y":4, "w":1.25},
- {"x":7.75, "y":4, "w":1.25},
- {"x":9, "y":4, "w":2},
- {"label":"GUI", "x":11, "y":4, "w":1.5},
- {"label":"Alt", "x":12.5, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+
+ {"matrix": [5, 0], "x": 7, "y": 0},
+ {"matrix": [5, 1], "x": 8, "y": 0},
+ {"matrix": [5, 2], "x": 9, "y": 0},
+ {"matrix": [5, 3], "x": 10, "y": 0},
+ {"matrix": [5, 4], "x": 11, "y": 0},
+ {"matrix": [5, 5], "x": 12, "y": 0},
+ {"matrix": [5, 6], "x": 13, "y": 0},
+ {"matrix": [5, 7], "x": 14, "y": 0},
+ {"matrix": [6, 7], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [6, 0], "x": 7.5, "y": 1},
+ {"matrix": [6, 1], "x": 8.5, "y": 1},
+ {"matrix": [6, 2], "x": 9.5, "y": 1},
+ {"matrix": [6, 3], "x": 10.5, "y": 1},
+ {"matrix": [6, 4], "x": 11.5, "y": 1},
+ {"matrix": [6, 5], "x": 12.5, "y": 1},
+ {"matrix": [6, 6], "x": 13.5, "y": 1},
+ {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [7, 0], "x": 7.75, "y": 2},
+ {"matrix": [7, 1], "x": 8.75, "y": 2},
+ {"matrix": [7, 2], "x": 9.75, "y": 2},
+ {"matrix": [7, 3], "x": 10.75, "y": 2},
+ {"matrix": [7, 4], "x": 11.75, "y": 2},
+ {"matrix": [7, 5], "x": 12.75, "y": 2},
+ {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [8, 0], "x": 8.25, "y": 3},
+ {"matrix": [8, 1], "x": 9.25, "y": 3},
+ {"matrix": [8, 2], "x": 10.25, "y": 3},
+ {"matrix": [8, 3], "x": 11.25, "y": 3},
+ {"matrix": [8, 4], "x": 12.25, "y": 3},
+ {"matrix": [8, 5], "x": 13.25, "y": 3, "w": 1.75},
+ {"matrix": [8, 6], "x": 15, "y": 3},
+
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5},
+ {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25},
+
+ {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25},
+ {"matrix": [9, 1], "x": 9, "y": 4, "w": 2},
+ {"matrix": [9, 3], "x": 11, "y": 4, "w": 1.5},
+ {"matrix": [9, 4], "x": 12.5, "y": 4}
]
}
}
diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.c b/keyboards/salicylic_acid3/7skb/rev1/rev1.c
deleted file mode 100644
index 520a869e57..0000000000
--- a/keyboards/salicylic_acid3/7skb/rev1/rev1.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "rev1.h"
diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.h b/keyboards/salicylic_acid3/7skb/rev1/rev1.h
deleted file mode 100644
index 8ab845240d..0000000000
--- a/keyboards/salicylic_acid3/7skb/rev1/rev1.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#pragma once
-
-#include "7skb.h"
-
-#include "quantum.h"
-
-//////////////////////////////////////////////////////////////////////////////
-// When only use 7skb.
-//////////////////////////////////////////////////////////////////////////////
-/*
- * ,------------------------------------ ------------------------------------------------------.
- * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R17 |
- * |---------------------------------------------------------------------------------------------+
- * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R27 |
- * |---------------------------------------- ---------------------------------------------------+
- * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 |
- * |---------------------------------------------------------------------------------------------+
- * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 |
- * |------------------------------------------- -----------------------------------------------'
- * | L41 | L42 | L43 | L44 | | R40 | R41 | R43 | R44 |
- * |------------------------------ ---------------------------------'
- */
-
-#define LAYOUT( \
- L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R17, \
- L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R27, \
- L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, \
- L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, \
- L41, L42, L43, L44, R40, R41, R43, R44 \
- ) \
- { \
- { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \
- { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \
- { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \
- { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \
- {KC_NO, L41, L42, L43, L44, KC_NO, KC_NO, KC_NO }, \
- { R00, R01, R02, R03, R04, R05, R06, R07 }, \
- { R10, R11, R12, R13, R14, R15, R16, R17 }, \
- { R20, R21, R22, R23, R24, R25, R26, R27 }, \
- { R30, R31, R32, R33, R34, R35, R36, KC_NO }, \
- { R40, R41, KC_NO, R43, R44, KC_NO, KC_NO, KC_NO } \
- }