diff options
Diffstat (limited to 'keyboards/keebio/levinson')
-rw-r--r-- | keyboards/keebio/levinson/info.json | 7 | ||||
-rw-r--r-- | keyboards/keebio/levinson/levinson.c | 2 | ||||
-rw-r--r-- | keyboards/keebio/levinson/levinson.h | 11 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev1/config.h | 6 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev1/info.json | 10 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev1/rev1.c | 1 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev1/rev1.h | 10 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev2/config.h | 6 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev2/info.json | 10 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev2/rev2.c | 2 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev2/rev2.h | 10 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev3/config.h | 7 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev3/info.json | 77 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev3/rev3.c | 2 | ||||
-rw-r--r-- | keyboards/keebio/levinson/rev3/rev3.h | 32 |
15 files changed, 100 insertions, 93 deletions
diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json index 2bf92724bb..d7cbab9f45 100644 --- a/keyboards/keebio/levinson/info.json +++ b/keyboards/keebio/levinson/info.json @@ -8,10 +8,5 @@ }, "processor": "atmega32u4", "bootloader": "caterina", - "community_layouts": ["ortho_4x12"], - "layouts": { - "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"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":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] - } - } + "community_layouts": ["ortho_4x12"] } diff --git a/keyboards/keebio/levinson/levinson.c b/keyboards/keebio/levinson/levinson.c index b361640bcf..6f1a050e80 100644 --- a/keyboards/keebio/levinson/levinson.c +++ b/keyboards/keebio/levinson/levinson.c @@ -1,4 +1,4 @@ -#include "levinson.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/keebio/levinson/levinson.h b/keyboards/keebio/levinson/levinson.h deleted file mode 100644 index fd022ab518..0000000000 --- a/keyboards/keebio/levinson/levinson.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_keebio_levinson_rev1 - #include "rev1.h" -#elif KEYBOARD_keebio_levinson_rev2 - #include "rev2.h" -#elif KEYBOARD_keebio_levinson_rev3 - #include "rev3.h" -#endif diff --git a/keyboards/keebio/levinson/rev1/config.h b/keyboards/keebio/levinson/rev1/config.h index c64d1a9e9e..9efacf6599 100644 --- a/keyboards/keebio/levinson/rev1/config.h +++ b/keyboards/keebio/levinson/rev1/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - -#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 */ diff --git a/keyboards/keebio/levinson/rev1/info.json b/keyboards/keebio/levinson/rev1/info.json index 05416bd138..faad88b20e 100644 --- a/keyboards/keebio/levinson/rev1/info.json +++ b/keyboards/keebio/levinson/rev1/info.json @@ -7,8 +7,18 @@ "pid": "0x1146", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "C6", "levels": 7 + }, + "layouts": { + "LAYOUT": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"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":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] } + } } diff --git a/keyboards/keebio/levinson/rev1/rev1.c b/keyboards/keebio/levinson/rev1/rev1.c deleted file mode 100644 index 72df88710a..0000000000 --- a/keyboards/keebio/levinson/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "levinson.h" diff --git a/keyboards/keebio/levinson/rev1/rev1.h b/keyboards/keebio/levinson/rev1/rev1.h index 1c555b6775..14db8b445b 100644 --- a/keyboards/keebio/levinson/rev1/rev1.h +++ b/keyboards/keebio/levinson/rev1/rev1.h @@ -1,17 +1,7 @@ #pragma once -#include "levinson.h" - #include "quantum.h" -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/interrupt.h> -#endif -#endif - #ifndef FLIP_HALF // Standard Keymap // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) diff --git a/keyboards/keebio/levinson/rev2/config.h b/keyboards/keebio/levinson/rev2/config.h index 88c38bc9ab..9efacf6599 100644 --- a/keyboards/keebio/levinson/rev2/config.h +++ b/keyboards/keebio/levinson/rev2/config.h @@ -19,12 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, D7, E6, B4 } -#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 } - -#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 */ diff --git a/keyboards/keebio/levinson/rev2/info.json b/keyboards/keebio/levinson/rev2/info.json index dbd0901737..984b06c946 100644 --- a/keyboards/keebio/levinson/rev2/info.json +++ b/keyboards/keebio/levinson/rev2/info.json @@ -7,8 +7,18 @@ "pid": "0x2146", "device_version": "2.0.0" }, + "matrix_pins": { + "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "levels": 7 + }, + "layouts": { + "LAYOUT": { + "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"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":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"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":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"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":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] } + } } diff --git a/keyboards/keebio/levinson/rev2/rev2.c b/keyboards/keebio/levinson/rev2/rev2.c index b569fbd9fb..8fb49f97b3 100644 --- a/keyboards/keebio/levinson/rev2/rev2.c +++ b/keyboards/keebio/levinson/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "levinson.h" +#include "rev2.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/levinson/rev2/rev2.h b/keyboards/keebio/levinson/rev2/rev2.h index 1c555b6775..14db8b445b 100644 --- a/keyboards/keebio/levinson/rev2/rev2.h +++ b/keyboards/keebio/levinson/rev2/rev2.h @@ -1,17 +1,7 @@ #pragma once -#include "levinson.h" - #include "quantum.h" -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/interrupt.h> -#endif -#endif - #ifndef FLIP_HALF // Standard Keymap // (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) diff --git a/keyboards/keebio/levinson/rev3/config.h b/keyboards/keebio/levinson/rev3/config.h index be2be855d0..d8a0366f14 100644 --- a/keyboards/keebio/levinson/rev3/config.h +++ b/keyboards/keebio/levinson/rev3/config.h @@ -19,15 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_ROW_PINS { D4, E6, B4, B5 } -#define MATRIX_COL_PINS { D3, F4, F7, B1, B3, B2 } -#define MATRIX_ROW_PINS_RIGHT { D4, B2, B3, B1 } -#define MATRIX_COL_PINS_RIGHT { F4, F7, D3, B5, B4, E6 } #define SPLIT_HAND_PIN D2 -#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 */ diff --git a/keyboards/keebio/levinson/rev3/info.json b/keyboards/keebio/levinson/rev3/info.json index 8cc3fa9fb9..b31f71533d 100644 --- a/keyboards/keebio/levinson/rev3/info.json +++ b/keyboards/keebio/levinson/rev3/info.json @@ -1,14 +1,89 @@ { "keyboard_name": "Levinson Rev. 3", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["F4", "F7", "D3", "B5", "B4", "E6"], + "rows": ["D4", "B2", "B3", "B1"] + } + } }, "usb": { "pid": "0x3146", "device_version": "3.0.0" }, + "matrix_pins": { + "cols": ["D3", "F4", "F7", "B1", "B3", "B2"], + "rows": ["D4", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 7 + }, + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, + "layouts": { + "LAYOUT_ortho_4x12": { + "layout": [ + {"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": [4, 5], "x": 7, "y": 0}, + {"matrix": [4, 4], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0}, + {"matrix": [4, 0], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [5, 5], "x": 7, "y": 1}, + {"matrix": [5, 4], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1}, + {"matrix": [5, 0], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [6, 5], "x": 7, "y": 2}, + {"matrix": [6, 4], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [7, 5], "x": 7, "y": 3}, + {"matrix": [7, 4], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 2], "x": 10, "y": 3}, + {"matrix": [7, 1], "x": 11, "y": 3}, + {"matrix": [7, 0], "x": 12, "y": 3} + ] + } } } diff --git a/keyboards/keebio/levinson/rev3/rev3.c b/keyboards/keebio/levinson/rev3/rev3.c index b569fbd9fb..76fb136c03 100644 --- a/keyboards/keebio/levinson/rev3/rev3.c +++ b/keyboards/keebio/levinson/rev3/rev3.c @@ -1,4 +1,4 @@ -#include "levinson.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/levinson/rev3/rev3.h b/keyboards/keebio/levinson/rev3/rev3.h deleted file mode 100644 index da7349d2e7..0000000000 --- a/keyboards/keebio/levinson/rev3/rev3.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -#include "levinson.h" - -#include "quantum.h" - -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/interrupt.h> -#endif -#endif - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 } \ - } - -#define LAYOUT_ortho_4x12 LAYOUT |