diff options
author | zvecr <git@zvecr.com> | 2022-11-22 02:48:11 +0000 |
---|---|---|
committer | zvecr <git@zvecr.com> | 2022-11-22 02:48:11 +0000 |
commit | ab17d34dbd4358537435bdb4c6954b0af2040d36 (patch) | |
tree | a42673a53e2151be180ce21c51644eda5267350d /keyboards/bastardkb/tbkmini | |
parent | 08805cada0b935cafffeb4e402c8ee24b1a946fa (diff) | |
parent | 06a3801a27881d7a409ea1749002393d765294f9 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/bastardkb/tbkmini')
-rw-r--r-- | keyboards/bastardkb/tbkmini/blackpill/info.json | 4 | ||||
-rw-r--r-- | keyboards/bastardkb/tbkmini/info.json | 86 | ||||
-rw-r--r-- | keyboards/bastardkb/tbkmini/tbkmini.c | 4 | ||||
-rw-r--r-- | keyboards/bastardkb/tbkmini/v1/elitec/info.json | 4 | ||||
-rw-r--r-- | keyboards/bastardkb/tbkmini/v2/elitec/info.json | 4 | ||||
-rw-r--r-- | keyboards/bastardkb/tbkmini/v2/splinky/config.h | 8 | ||||
-rw-r--r-- | keyboards/bastardkb/tbkmini/v2/splinky/info.json | 4 | ||||
-rw-r--r-- | keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h | 8 | ||||
-rw-r--r-- | keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h | 8 | ||||
-rw-r--r-- | keyboards/bastardkb/tbkmini/v2/stemcell/info.json | 2 |
10 files changed, 71 insertions, 61 deletions
diff --git a/keyboards/bastardkb/tbkmini/blackpill/info.json b/keyboards/bastardkb/tbkmini/blackpill/info.json index d4f15e44f1..24664f13ef 100644 --- a/keyboards/bastardkb/tbkmini/blackpill/info.json +++ b/keyboards/bastardkb/tbkmini/blackpill/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "TBK Mini Blackpill", "usb": { - "device_version": "1.0.0", - }, + "device_version": "1.0.0" + } } diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json index 4233599432..cb4d3378bc 100644 --- a/keyboards/bastardkb/tbkmini/info.json +++ b/keyboards/bastardkb/tbkmini/info.json @@ -1,53 +1,53 @@ { "url": "https://www.bastardkb.com/tbk-mini", "usb": { - "pid": "0x1828", + "pid": "0x1828" }, "layouts": { "LAYOUT_split_3x6_3": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"R00", "x":11, "y":0}, - {"label":"R01", "x":12, "y":0}, - {"label":"R02", "x":13, "y":0}, - {"label":"R03", "x":14, "y":0}, - {"label":"R04", "x":15, "y":0}, - {"label":"R05", "x":16, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"R10", "x":11, "y":1}, - {"label":"R11", "x":12, "y":1}, - {"label":"R12", "x":13, "y":1}, - {"label":"R13", "x":14, "y":1}, - {"label":"R14", "x":15, "y":1}, - {"label":"R15", "x":16, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"R20", "x":11, "y":2}, - {"label":"R21", "x":12, "y":2}, - {"label":"R22", "x":13, "y":2}, - {"label":"R23", "x":14, "y":2}, - {"label":"R24", "x":15, "y":2}, - {"label":"R25", "x":16, "y":2}, - {"label":"L33", "x":5, "y":3}, - {"label":"L34", "x":6, "y":3}, - {"label":"L31", "x":7, "y":3}, - {"label":"R33", "x":9, "y":3}, - {"label":"R34", "x":10, "y":3}, - {"label":"R31", "x":11, "y":3} + { "label": "L00", "x": 0, "y": 0 }, + { "label": "L01", "x": 1, "y": 0 }, + { "label": "L02", "x": 2, "y": 0 }, + { "label": "L03", "x": 3, "y": 0 }, + { "label": "L04", "x": 4, "y": 0 }, + { "label": "L05", "x": 5, "y": 0 }, + { "label": "R00", "x": 11, "y": 0 }, + { "label": "R01", "x": 12, "y": 0 }, + { "label": "R02", "x": 13, "y": 0 }, + { "label": "R03", "x": 14, "y": 0 }, + { "label": "R04", "x": 15, "y": 0 }, + { "label": "R05", "x": 16, "y": 0 }, + { "label": "L10", "x": 0, "y": 1 }, + { "label": "L11", "x": 1, "y": 1 }, + { "label": "L12", "x": 2, "y": 1 }, + { "label": "L13", "x": 3, "y": 1 }, + { "label": "L14", "x": 4, "y": 1 }, + { "label": "L15", "x": 5, "y": 1 }, + { "label": "R10", "x": 11, "y": 1 }, + { "label": "R11", "x": 12, "y": 1 }, + { "label": "R12", "x": 13, "y": 1 }, + { "label": "R13", "x": 14, "y": 1 }, + { "label": "R14", "x": 15, "y": 1 }, + { "label": "R15", "x": 16, "y": 1 }, + { "label": "L20", "x": 0, "y": 2 }, + { "label": "L21", "x": 1, "y": 2 }, + { "label": "L22", "x": 2, "y": 2 }, + { "label": "L23", "x": 3, "y": 2 }, + { "label": "L24", "x": 4, "y": 2 }, + { "label": "L25", "x": 5, "y": 2 }, + { "label": "R20", "x": 11, "y": 2 }, + { "label": "R21", "x": 12, "y": 2 }, + { "label": "R22", "x": 13, "y": 2 }, + { "label": "R23", "x": 14, "y": 2 }, + { "label": "R24", "x": 15, "y": 2 }, + { "label": "R25", "x": 16, "y": 2 }, + { "label": "L33", "x": 5, "y": 3 }, + { "label": "L34", "x": 6, "y": 3 }, + { "label": "L31", "x": 7, "y": 3 }, + { "label": "R33", "x": 9, "y": 3 }, + { "label": "R34", "x": 10, "y": 3 }, + { "label": "R31", "x": 11, "y": 3 } ] } } diff --git a/keyboards/bastardkb/tbkmini/tbkmini.c b/keyboards/bastardkb/tbkmini/tbkmini.c index 7bbd374c01..34b42951a0 100644 --- a/keyboards/bastardkb/tbkmini/tbkmini.c +++ b/keyboards/bastardkb/tbkmini/tbkmini.c @@ -1,4 +1,4 @@ -/* +/** * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com> * * This program is free software: you can redistribute it and/or modify @@ -17,6 +17,7 @@ #include "tbkmini.h" +// clang-format off #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { // left @@ -57,3 +58,4 @@ led_config_t g_led_config = { { 2, 2, 2 } }; #endif +// clang-format on diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/info.json b/keyboards/bastardkb/tbkmini/v1/elitec/info.json index 83a9e799e1..f9ebb18069 100644 --- a/keyboards/bastardkb/tbkmini/v1/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v1/elitec/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "TBK Mini Elite-C", "usb": { - "device_version": "1.0.0", - }, + "device_version": "1.0.0" + } } diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/info.json b/keyboards/bastardkb/tbkmini/v2/elitec/info.json index 50cfe860dd..a0ef2767f9 100644 --- a/keyboards/bastardkb/tbkmini/v2/elitec/info.json +++ b/keyboards/bastardkb/tbkmini/v2/elitec/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "TBK Mini Elite-C", "usb": { - "device_version": "2.0.0", - }, + "device_version": "2.0.0" + } } diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/config.h index c4e5b3ff90..b5539989b4 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky/config.h @@ -21,14 +21,6 @@ #define MATRIX_ROW_PINS \ { GP26, GP5, GP4, GP9 } -/* Handedness. */ -#define MASTER_RIGHT - -// To use the handedness pin, resistors need to be installed on the adapter PCB. -// If so, uncomment the following code, and undefine MASTER_RIGHT above. -// #define SPLIT_HAND_PIN GP13 -// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. - /* serial.c configuration (for split keyboard). */ #define SOFT_SERIAL_PIN GP1 diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/info.json b/keyboards/bastardkb/tbkmini/v2/splinky/info.json index ca66bceeff..b0b05fba8a 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky/info.json +++ b/keyboards/bastardkb/tbkmini/v2/splinky/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "TBK Mini Splinky", "usb": { - "device_version": "2.0.0", - }, + "device_version": "2.0.0" + } } diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h index be0e2fb959..8397b931c5 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky/v2/config.h @@ -20,3 +20,11 @@ /* Key matrix configuration. */ #define MATRIX_COL_PINS \ { GP27, GP28, GP15, GP6, GP7, GP8 } + +/* Handedness. */ +#define MASTER_RIGHT + +// To use the handedness pin, resistors need to be installed on the adapter PCB. +// If so, uncomment the following code, and undefine MASTER_RIGHT above. +// #define SPLIT_HAND_PIN GP13 +// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. diff --git a/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h index 72f5c0ffa8..36b25dffff 100644 --- a/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h +++ b/keyboards/bastardkb/tbkmini/v2/splinky/v3/config.h @@ -20,3 +20,11 @@ /* Key matrix configuration. */ #define MATRIX_COL_PINS \ { GP27, GP28, GP21, GP6, GP7, GP8 } + +/* Handedness. */ +#define MASTER_RIGHT + +// To use the handedness pin, resistors need to be installed on the adapter PCB. +// If so, uncomment the following code, and undefine MASTER_RIGHT above. +// #define SPLIT_HAND_PIN GP15 +// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left. diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json index b56c455ae3..7595dab436 100644 --- a/keyboards/bastardkb/tbkmini/v2/stemcell/info.json +++ b/keyboards/bastardkb/tbkmini/v2/stemcell/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "TBK Mini STeMCell", "usb": { - "device_version": "2.0.0" + "device_version": "2.0.0" } } |