diff options
Diffstat (limited to 'keyboards/soda')
| -rw-r--r-- | keyboards/soda/cherish/config.h | 4 | ||||
| -rw-r--r-- | keyboards/soda/cherish/info.json | 5 | ||||
| -rw-r--r-- | keyboards/soda/pocket/config.h | 5 | ||||
| -rw-r--r-- | keyboards/soda/pocket/info.json | 222 |
4 files changed, 54 insertions, 182 deletions
diff --git a/keyboards/soda/cherish/config.h b/keyboards/soda/cherish/config.h index 95d332cf95..fdcd9d801b 100644 --- a/keyboards/soda/cherish/config.h +++ b/keyboards/soda/cherish/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A9, A10, A14, A15, B3, B4, B5, B6, B7, B8} -#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 } -#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/soda/cherish/info.json b/keyboards/soda/cherish/info.json index 713356f944..446fda090b 100644 --- a/keyboards/soda/cherish/info.json +++ b/keyboards/soda/cherish/info.json @@ -8,6 +8,11 @@ "pid": "0xEB52", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "A10", "A14", "A15", "B3", "B4", "B5", "B6", "B7", "B8"], + "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layout_aliases": { diff --git a/keyboards/soda/pocket/config.h b/keyboards/soda/pocket/config.h index 4b6ff7b4ab..89571c505f 100644 --- a/keyboards/soda/pocket/config.h +++ b/keyboards/soda/pocket/config.h @@ -15,11 +15,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_COL_PINS { A2, A1, B14, B4, B5, B6, B7} -#define MATRIX_ROW_PINS { A7, B0, B1, B2, B10, B11 } -#define DIODE_DIRECTION ROW2COL - #define LED_NUM_LOCK_PIN B15 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json index b91f795b04..16374bc9d8 100644 --- a/keyboards/soda/pocket/info.json +++ b/keyboards/soda/pocket/info.json @@ -8,184 +8,60 @@ "pid": "0x4F51", "device_version": "1.0.2" }, + "matrix_pins": { + "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"], + "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ - { - "label": "PrtSc", - "x": 0, - "y": 0.25 - }, - { - "label": "Scroll Lock", - "x": 1, - "y": 0.25 - }, - { - "label": "Pause", - "x": 2, - "y": 0.25 - }, - { - "label": "Num Lock", - "x": 3.25, - "y": 0.25 - }, - { - "label": "/", - "x": 4.25, - "y": 0.25 - }, - { - "label": "*", - "x": 5.25, - "y": 0.25 - }, - { - "label": "-", - "x": 6.25, - "y": 0.25 - }, - { - "label": "Insert", - "x": 0, - "y": 1.5 - }, - { - "label": "Home", - "x": 1, - "y": 1.5 - }, - { - "label": "PgUp", - "x": 2, - "y": 1.5 - }, - { - "label": "Num Lock", - "x": 3.25, - "y": 1.5 - }, - { - "label": "/", - "x": 4.25, - "y": 1.5 - }, - { - "label": "*", - "x": 5.25, - "y": 1.5 - }, - { - "label": "-", - "x": 6.25, - "y": 1.5 - }, - { - "label": "Delete", - "x": 0, - "y": 2.5 - }, - { - "label": "End", - "x": 1, - "y": 2.5 - }, - { - "label": "PgDn", - "x": 2, - "y": 2.5 - }, - { - "label": "7", - "x": 3.25, - "y": 2.5 - }, - { - "label": "8", - "x": 4.25, - "y": 2.5 - }, - { - "label": "9", - "x": 5.25, - "y": 2.5 - }, - { - "label": "+", - "x": 6.25, - "y": 2.5, - "h": 2 - }, - { - "label": "4", - "x": 3.25, - "y": 3.5 - }, - { - "label": "5", - "x": 4.25, - "y": 3.5 - }, - { - "label": "6", - "x": 5.25, - "y": 3.5 - }, - { - "label": "\u2191", - "x": 1, - "y": 4.5 - }, - { - "label": "1", - "x": 3.25, - "y": 4.5 - }, - { - "label": "2", - "x": 4.25, - "y": 4.5 - }, - { - "label": "3", - "x": 5.25, - "y": 4.5 - }, - { - "label": "Enter", - "x": 6.25, - "y": 4.5, - "h": 2 - }, - { - "label": "\u2190", - "x": 0, - "y": 5.5 - }, - { - "label": "\u2193", - "x": 1, - "y": 5.5 - }, - { - "label": "\u2192", - "x": 2, - "y": 5.5 - }, - { - "label": "0", - "x": 3.25, - "y": 5.5, - "w": 2 - }, - { - "label": ".", - "x": 5.25, - "y": 5.5 - } + {"x": 0, "y": 0}, + {"x": 1, "y": 0}, + {"x": 2, "y": 0}, + + {"x": 3.25, "y": 0}, + {"x": 4.25, "y": 0}, + {"x": 5.25, "y": 0}, + {"x": 6.25, "y": 0}, + + {"x": 0, "y": 1.25}, + {"x": 1, "y": 1.25}, + {"x": 2, "y": 1.25}, + + {"x": 3.25, "y": 1.25}, + {"x": 4.25, "y": 1.25}, + {"x": 5.25, "y": 1.25}, + {"x": 6.25, "y": 1.25}, + + {"x": 0, "y": 2.25}, + {"x": 1, "y": 2.25}, + {"x": 2, "y": 2.25}, + + {"x": 3.25, "y": 2.25}, + {"x": 4.25, "y": 2.25}, + {"x": 5.25, "y": 2.25}, + {"x": 6.25, "y": 2.25, "h": 2}, + + {"x": 3.25, "y": 3.25}, + {"x": 4.25, "y": 3.25}, + {"x": 5.25, "y": 3.25}, + + {"x": 1, "y": 4.25}, + + {"x": 3.25, "y": 4.25}, + {"x": 4.25, "y": 4.25}, + {"x": 5.25, "y": 4.25}, + {"x": 6.25, "y": 4.25, "h": 2}, + + {"x": 0, "y": 5.25}, + {"x": 1, "y": 5.25}, + {"x": 2, "y": 5.25}, + + {"x": 3.25, "y": 5.25, "w": 2}, + {"x": 5.25, "y": 5.25} ] } } |