diff --git a/keyboards/cyboard/config.h b/keyboards/cyboard/config.h index 58d7bc3a3ca..eb1e9756882 100644 --- a/keyboards/cyboard/config.h +++ b/keyboards/cyboard/config.h @@ -5,7 +5,11 @@ #pragma once /* Split keyboard settings */ + +#ifndef SERIAL_USART_TX_PIN #define SERIAL_USART_TX_PIN GP28 +#endif + #define SPLIT_HAND_PIN GP0 /* RGB settings */ @@ -27,7 +31,9 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U +#ifndef USB_VBUS_PIN #define USB_VBUS_PIN GP27 +#endif /* Vial set up */ #define VIAL_KEYBOARD_UID {0xC4, 0xCC, 0xB4, 0x76, 0x30, 0x16, 0xFC, 0x70} diff --git a/keyboards/cyboard/dactyl/manuform_function_row/rj12/config.h b/keyboards/cyboard/dactyl/manuform_function_row/rj12/config.h new file mode 100644 index 00000000000..4cd4a2595f3 --- /dev/null +++ b/keyboards/cyboard/dactyl/manuform_function_row/rj12/config.h @@ -0,0 +1,17 @@ +/* Copyright 2023 Cyboard LLC (@Cyboard-DigitalTailor) + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#pragma once + +/* Split keyboard settings */ +#undef SPLIT_HAND_PIN +#define MASTER_LEFT + +#undef SERIAL_USART_TX_PIN +#define SERIAL_USART_TX_PIN GP0 + +#undef USB_VBUS_PIN +#define USB_VBUS_PIN GP19 + + diff --git a/keyboards/cyboard/dactyl/manuform_function_row/rj12/info.json b/keyboards/cyboard/dactyl/manuform_function_row/rj12/info.json index e2b579bf56e..f3cc7d51ee3 100644 --- a/keyboards/cyboard/dactyl/manuform_function_row/rj12/info.json +++ b/keyboards/cyboard/dactyl/manuform_function_row/rj12/info.json @@ -1,186 +1,182 @@ { + "usb": { + "device_version": "0.1.0" + }, + "matrix_pins": { + "rows": ["GP8", "GP7", "GP28", "GP6", "GP23", "GP27", "GP21"], + "cols": ["GP9", "GP26", "GP22", "GP20", "GP29", "GP4", "GP5"] + }, + "ws2812": { + "pin": "GP1" + }, "rgb_matrix": { "split_count": [40, 40], "layout": [ - {"flags": 4, "matrix": [3, 0], "x": 86, "y": 32}, - {"flags": 4, "matrix": [2, 0], "x": 86, "y": 43}, - {"flags": 4, "matrix": [6, 0], "x": 86, "y": 0}, - {"flags": 4, "matrix": [5, 0], "x": 86, "y": 11}, - {"flags": 4, "matrix": [4, 0], "x": 86, "y": 21}, - - {"flags": 4, "matrix": [3, 1], "x": 69, "y": 32}, - {"flags": 4, "matrix": [2, 1], "x": 69, "y": 43}, - {"flags": 4, "matrix": [6, 1], "x": 69, "y": 0}, - {"flags": 4, "matrix": [5, 1], "x": 69, "y": 11}, - {"flags": 4, "matrix": [4, 1], "x": 69, "y": 21}, - - {"flags": 4, "matrix": [3, 2], "x": 52, "y": 32}, - {"flags": 4, "matrix": [2, 2], "x": 52, "y": 43}, - {"flags": 4, "matrix": [1, 2], "x": 52, "y": 53}, - {"flags": 4, "matrix": [6, 2], "x": 52, "y": 0}, - {"flags": 4, "matrix": [5, 2], "x": 52, "y": 11}, - {"flags": 4, "matrix": [4, 2], "x": 52, "y": 21}, - - {"flags": 4, "matrix": [3, 3], "x": 34, "y": 32}, - {"flags": 4, "matrix": [2, 3], "x": 34, "y": 43}, - {"flags": 4, "matrix": [1, 3], "x": 34, "y": 53}, - {"flags": 4, "matrix": [6, 3], "x": 34, "y": 0}, - {"flags": 4, "matrix": [5, 3], "x": 34, "y": 11}, - {"flags": 4, "matrix": [4, 3], "x": 34, "y": 21}, - - {"flags": 4, "matrix": [3, 4], "x": 17, "y": 32}, - {"flags": 4, "matrix": [2, 4], "x": 17, "y": 43}, - {"flags": 4, "matrix": [1, 4], "x": 17, "y": 53}, - {"flags": 4, "matrix": [6, 4], "x": 17, "y": 0}, - {"flags": 4, "matrix": [5, 4], "x": 17, "y": 11}, - {"flags": 4, "matrix": [4, 4], "x": 17, "y": 21}, - - {"flags": 4, "matrix": [3, 5], "x": 0, "y": 32}, - {"flags": 4, "matrix": [2, 5], "x": 0, "y": 43}, - {"flags": 4, "matrix": [1, 5], "x": 0, "y": 53}, - {"flags": 4, "matrix": [6, 5], "x": 0, "y": 0}, - {"flags": 4, "matrix": [5, 5], "x": 0, "y": 11}, - {"flags": 4, "matrix": [4, 5], "x": 0, "y": 21}, - - {"flags": 4, "matrix": [0, 3], "x": 86, "y": 53}, - {"flags": 4, "matrix": [0, 2], "x": 103, "y": 53}, - {"flags": 4, "matrix": [0, 1], "x": 103, "y": 64}, - {"flags": 4, "matrix": [0, 7], "x": 69, "y": 53}, - {"flags": 4, "matrix": [0, 6], "x": 69, "y": 64}, - {"flags": 4, "matrix": [0, 5], "x": 86, "y": 64}, - - - {"flags": 4, "matrix": [10, 0], "x": 138, "y": 32}, - {"flags": 4, "matrix": [9, 0], "x": 138, "y": 43}, - {"flags": 4, "matrix": [13, 0], "x": 138, "y": 0}, - {"flags": 4, "matrix": [12, 0], "x": 138, "y": 11}, - {"flags": 4, "matrix": [11, 0], "x": 138, "y": 21}, - - {"flags": 4, "matrix": [10, 1], "x": 155, "y": 32}, - {"flags": 4, "matrix": [9, 1], "x": 155, "y": 43}, - {"flags": 4, "matrix": [13, 1], "x": 155, "y": 0}, - {"flags": 4, "matrix": [12, 1], "x": 155, "y": 11}, - {"flags": 4, "matrix": [11, 1], "x": 155, "y": 21}, - - {"flags": 4, "matrix": [10, 2], "x": 172, "y": 32}, - {"flags": 4, "matrix": [9, 2], "x": 172, "y": 43}, - {"flags": 4, "matrix": [8, 2], "x": 172, "y": 53}, - {"flags": 4, "matrix": [13, 2], "x": 172, "y": 0}, - {"flags": 4, "matrix": [12, 2], "x": 172, "y": 11}, - {"flags": 4, "matrix": [11, 2], "x": 172, "y": 21}, - - {"flags": 4, "matrix": [10, 3], "x": 190, "y": 32}, - {"flags": 4, "matrix": [9, 3], "x": 190, "y": 43}, - {"flags": 4, "matrix": [8, 3], "x": 190, "y": 53}, - {"flags": 4, "matrix": [13, 3], "x": 190, "y": 0}, - {"flags": 4, "matrix": [12, 3], "x": 190, "y": 11}, - {"flags": 4, "matrix": [11, 3], "x": 190, "y": 21}, - - {"flags": 4, "matrix": [10, 4], "x": 207, "y": 32}, - {"flags": 4, "matrix": [9, 4], "x": 207, "y": 43}, - {"flags": 4, "matrix": [8, 4], "x": 207, "y": 53}, - {"flags": 4, "matrix": [13, 4], "x": 207, "y": 0}, - {"flags": 4, "matrix": [12, 4], "x": 207, "y": 11}, - {"flags": 4, "matrix": [11, 4], "x": 207, "y": 21}, - - {"flags": 4, "matrix": [10, 5], "x": 224, "y": 32}, - {"flags": 4, "matrix": [9, 5], "x": 224, "y": 43}, - {"flags": 4, "matrix": [8, 5], "x": 224, "y": 53}, - {"flags": 4, "matrix": [13, 5], "x": 224, "y": 0}, - {"flags": 4, "matrix": [12, 5], "x": 224, "y": 11}, - {"flags": 4, "matrix": [11, 5], "x": 224, "y": 21}, - - {"flags": 4, "matrix": [7, 3], "x": 138, "y": 53}, - {"flags": 4, "matrix": [7, 2], "x": 121, "y": 53}, - {"flags": 4, "matrix": [7, 1], "x": 121, "y": 64}, - {"flags": 4, "matrix": [7, 7], "x": 138, "y": 64}, - {"flags": 4, "matrix": [7, 6], "x": 155, "y": 64}, - {"flags": 4, "matrix": [7, 5], "x": 155, "y": 53} + {"flags": 4, "matrix": [2, 1], "x": 86, "y": 43}, + {"flags": 4, "matrix": [3, 1], "x": 86, "y": 32}, + {"flags": 4, "matrix": [4, 1], "x": 86, "y": 21}, + {"flags": 4, "matrix": [5, 1], "x": 86, "y": 11}, + {"flags": 4, "matrix": [6, 1], "x": 86, "y": 0}, + {"flags": 4, "matrix": [1, 1], "x": 86, "y": 53}, + {"flags": 4, "matrix": [1, 0], "x": 103, "y": 53}, + {"flags": 4, "matrix": [0, 0], "x": 103, "y": 64}, + {"flags": 4, "matrix": [0, 1], "x": 86, "y": 64}, + {"flags": 4, "matrix": [0, 2], "x": 69, "y": 64}, + {"flags": 4, "matrix": [1, 2], "x": 69, "y": 53}, + {"flags": 4, "matrix": [2, 2], "x": 69, "y": 43}, + {"flags": 4, "matrix": [3, 2], "x": 69, "y": 32}, + {"flags": 4, "matrix": [4, 2], "x": 69, "y": 21}, + {"flags": 4, "matrix": [5, 2], "x": 69, "y": 11}, + {"flags": 4, "matrix": [6, 2], "x": 69, "y": 0}, + {"flags": 4, "matrix": [1, 3], "x": 52, "y": 53}, + {"flags": 4, "matrix": [2, 3], "x": 52, "y": 43}, + {"flags": 4, "matrix": [3, 3], "x": 52, "y": 32}, + {"flags": 4, "matrix": [4, 3], "x": 52, "y": 21}, + {"flags": 4, "matrix": [5, 3], "x": 52, "y": 11}, + {"flags": 4, "matrix": [6, 3], "x": 52, "y": 0}, + {"flags": 4, "matrix": [1, 4], "x": 34, "y": 53}, + {"flags": 4, "matrix": [2, 4], "x": 34, "y": 43}, + {"flags": 4, "matrix": [3, 4], "x": 34, "y": 32}, + {"flags": 4, "matrix": [4, 4], "x": 34, "y": 21}, + {"flags": 4, "matrix": [5, 4], "x": 34, "y": 11}, + {"flags": 4, "matrix": [6, 4], "x": 34, "y": 0}, + {"flags": 4, "matrix": [1, 5], "x": 17, "y": 53}, + {"flags": 4, "matrix": [2, 5], "x": 17, "y": 43}, + {"flags": 4, "matrix": [3, 5], "x": 17, "y": 32}, + {"flags": 4, "matrix": [4, 5], "x": 17, "y": 21}, + {"flags": 4, "matrix": [5, 5], "x": 17, "y": 11}, + {"flags": 4, "matrix": [6, 5], "x": 17, "y": 0}, + {"flags": 4, "matrix": [1, 6], "x": 0, "y": 53}, + {"flags": 4, "matrix": [2, 6], "x": 0, "y": 43}, + {"flags": 4, "matrix": [3, 6], "x": 0, "y": 32}, + {"flags": 4, "matrix": [4, 6], "x": 0, "y": 21}, + {"flags": 4, "matrix": [5, 6], "x": 0, "y": 11}, + {"flags": 4, "matrix": [6, 6], "x": 0, "y": 0}, + {"flags": 4, "matrix": [9, 1], "x": 138, "y": 43}, + {"flags": 4, "matrix": [10, 1], "x": 138, "y": 32}, + {"flags": 4, "matrix": [11, 1], "x": 138, "y": 21}, + {"flags": 4, "matrix": [12, 1], "x": 138, "y": 11}, + {"flags": 4, "matrix": [13, 1], "x": 138, "y": 0}, + {"flags": 4, "matrix": [8, 1], "x": 138, "y": 53}, + {"flags": 4, "matrix": [8, 0], "x": 121, "y": 53}, + {"flags": 4, "matrix": [7, 0], "x": 121, "y": 64}, + {"flags": 4, "matrix": [7, 1], "x": 138, "y": 64}, + {"flags": 4, "matrix": [7, 2], "x": 155, "y": 64}, + {"flags": 4, "matrix": [8, 2], "x": 155, "y": 53}, + {"flags": 4, "matrix": [9, 2], "x": 155, "y": 43}, + {"flags": 4, "matrix": [10, 2], "x": 155, "y": 32}, + {"flags": 4, "matrix": [11, 2], "x": 155, "y": 21}, + {"flags": 4, "matrix": [12, 2], "x": 155, "y": 11}, + {"flags": 4, "matrix": [13, 2], "x": 155, "y": 0}, + {"flags": 4, "matrix": [8, 3], "x": 172, "y": 53}, + {"flags": 4, "matrix": [9, 3], "x": 172, "y": 43}, + {"flags": 4, "matrix": [10, 3], "x": 172, "y": 32}, + {"flags": 4, "matrix": [11, 3], "x": 172, "y": 21}, + {"flags": 4, "matrix": [12, 3], "x": 172, "y": 11}, + {"flags": 4, "matrix": [13, 3], "x": 172, "y": 0}, + {"flags": 4, "matrix": [8, 4], "x": 190, "y": 53}, + {"flags": 4, "matrix": [9, 4], "x": 190, "y": 43}, + {"flags": 4, "matrix": [10, 4], "x": 190, "y": 32}, + {"flags": 4, "matrix": [11, 4], "x": 190, "y": 21}, + {"flags": 4, "matrix": [12, 4], "x": 190, "y": 11}, + {"flags": 4, "matrix": [13, 4], "x": 190, "y": 0}, + {"flags": 4, "matrix": [8, 5], "x": 207, "y": 53}, + {"flags": 4, "matrix": [9, 5], "x": 207, "y": 43}, + {"flags": 4, "matrix": [10, 5], "x": 207, "y": 32}, + {"flags": 4, "matrix": [11, 5], "x": 207, "y": 21}, + {"flags": 4, "matrix": [12, 5], "x": 207, "y": 11}, + {"flags": 4, "matrix": [13, 5], "x": 207, "y": 0}, + {"flags": 4, "matrix": [8, 6], "x": 224, "y": 53}, + {"flags": 4, "matrix": [9, 6], "x": 224, "y": 43}, + {"flags": 4, "matrix": [10, 6], "x": 224, "y": 32}, + {"flags": 4, "matrix": [11, 6], "x": 224, "y": 21}, + {"flags": 4, "matrix": [12, 6], "x": 224, "y": 11}, + {"flags": 4, "matrix": [13, 6], "x": 224, "y": 0} ] }, "layouts": { "LAYOUT_manuform_fun": { "layout": [ - { "matrix": [6, 5], "x": 0, "y": 0 }, - { "matrix": [6, 4], "x": 1, "y": 0 }, - { "matrix": [6, 3], "x": 2, "y": 0 }, - { "matrix": [6, 2], "x": 3, "y": 0 }, - { "matrix": [6, 1], "x": 4, "y": 0 }, - { "matrix": [6, 0], "x": 5, "y": 0 }, - { "matrix": [13, 0], "x": 11.5, "y": 0 }, - { "matrix": [13, 1], "x": 12.5, "y": 0 }, - { "matrix": [13, 2], "x": 13.5, "y": 0 }, - { "matrix": [13, 3], "x": 14.5, "y": 0 }, - { "matrix": [13, 4], "x": 15.5, "y": 0 }, - { "matrix": [13, 5], "x": 16.5, "y": 0 }, - { "matrix": [5, 5], "x": 0, "y": 0 }, - { "matrix": [5, 4], "x": 1, "y": 0 }, - { "matrix": [5, 3], "x": 2, "y": 0 }, - { "matrix": [5, 2], "x": 3, "y": 0 }, - { "matrix": [5, 1], "x": 4, "y": 0 }, - { "matrix": [5, 0], "x": 5, "y": 0 }, - { "matrix": [12, 0], "x": 11.5, "y": 0 }, - { "matrix": [12, 1], "x": 12.5, "y": 0 }, - { "matrix": [12, 2], "x": 13.5, "y": 0 }, - { "matrix": [12, 3], "x": 14.5, "y": 0 }, - { "matrix": [12, 4], "x": 15.5, "y": 0 }, - { "matrix": [12, 5], "x": 16.5, "y": 0 }, - { "matrix": [4, 5], "x": 0, "y": 1 }, - { "matrix": [4, 4], "x": 1, "y": 1 }, - { "matrix": [4, 3], "x": 2, "y": 1 }, - { "matrix": [4, 2], "x": 3, "y": 1 }, - { "matrix": [4, 1], "x": 4, "y": 1 }, - { "matrix": [4, 0], "x": 5, "y": 1 }, - { "matrix": [11, 0], "x": 10.5, "y": 1 }, - { "matrix": [11, 1], "x": 11.5, "y": 1 }, - { "matrix": [11, 2], "x": 12.5, "y": 1 }, - { "matrix": [11, 3], "x": 13.5, "y": 1 }, - { "matrix": [11, 4], "x": 14.5, "y": 1 }, - { "matrix": [11, 5], "x": 15.5, "y": 1 }, - { "matrix": [3, 5], "x": 0, "y": 2 }, - { "matrix": [3, 4], "x": 1, "y": 2 }, - { "matrix": [3, 3], "x": 2, "y": 2 }, - { "matrix": [3, 2], "x": 3, "y": 2 }, - { "matrix": [3, 1], "x": 4, "y": 2 }, - { "matrix": [3, 0], "x": 5, "y": 2 }, - { "matrix": [10, 0], "x": 10.5, "y": 2 }, - { "matrix": [10, 1], "x": 11.5, "y": 2 }, - { "matrix": [10, 2], "x": 12.5, "y": 2 }, - { "matrix": [10, 3], "x": 13.5, "y": 2 }, - { "matrix": [10, 4], "x": 14.5, "y": 2 }, - { "matrix": [10, 5], "x": 15.5, "y": 2 }, - { "matrix": [2, 5], "x": 0, "y": 3 }, - { "matrix": [2, 4], "x": 1, "y": 3 }, - { "matrix": [2, 3], "x": 2, "y": 3 }, - { "matrix": [2, 2], "x": 3, "y": 3 }, - { "matrix": [2, 1], "x": 4, "y": 3 }, - { "matrix": [2, 0], "x": 5, "y": 3 }, - { "matrix": [9, 0], "x": 10.5, "y": 3 }, - { "matrix": [9, 1], "x": 11.5, "y": 3 }, - { "matrix": [9, 2], "x": 12.5, "y": 3 }, - { "matrix": [9, 3], "x": 13.5, "y": 3 }, - { "matrix": [9, 4], "x": 14.5, "y": 3 }, - { "matrix": [9, 5], "x": 15.5, "y": 3 }, - { "matrix": [1, 5], "x": 0, "y": 3 }, - { "matrix": [1, 4], "x": 1, "y": 3 }, - { "matrix": [1, 3], "x": 2, "y": 3 }, - { "matrix": [1, 2], "x": 3, "y": 3 }, - { "matrix": [0, 7], "x": 4.5, "y": 3.5 }, - { "matrix": [0, 3], "x": 5.5, "y": 3.5 }, - { "matrix": [0, 2], "x": 6.5, "y": 4 }, - { "matrix": [7, 2], "x": 10, "y": 4 }, - { "matrix": [7, 3], "x": 11, "y": 3.5 }, - { "matrix": [7, 7], "x": 12, "y": 3.5 }, - { "matrix": [8, 2], "x": 13.5, "y": 3 }, - { "matrix": [8, 3], "x": 14.5, "y": 3 }, - { "matrix": [8, 4], "x": 15.5, "y": 3 }, - { "matrix": [8, 5], "x": 16.5, "y": 3 }, - { "matrix": [0, 6], "x": 6.5, "y": 5 }, - { "matrix": [0, 5], "x": 7.5, "y": 5 }, - { "matrix": [0, 1], "x": 7.5, "y": 4 }, - { "matrix": [7, 1], "x": 9, "y": 4 }, - { "matrix": [7, 5], "x": 9, "y": 5 }, - { "matrix": [7, 6], "x": 10, "y": 5 } + { "matrix": [6, 6], "x": 0, "y": 0 }, + { "matrix": [6, 5], "x": 1, "y": 0 }, + { "matrix": [6, 4], "x": 2, "y": 0 }, + { "matrix": [6, 3], "x": 3, "y": 0 }, + { "matrix": [6, 2], "x": 4, "y": 0 }, + { "matrix": [6, 1], "x": 5, "y": 0 }, + { "matrix": [13, 1], "x": 11.5, "y": 0 }, + { "matrix": [13, 2], "x": 12.5, "y": 0 }, + { "matrix": [13, 3], "x": 13.5, "y": 0 }, + { "matrix": [13, 4], "x": 14.5, "y": 0 }, + { "matrix": [13, 5], "x": 15.5, "y": 0 }, + { "matrix": [13, 6], "x": 16.5, "y": 0 }, + { "matrix": [5, 6], "x": 0, "y": 1 }, + { "matrix": [5, 5], "x": 1, "y": 1 }, + { "matrix": [5, 4], "x": 2, "y": 1 }, + { "matrix": [5, 3], "x": 3, "y": 1 }, + { "matrix": [5, 2], "x": 4, "y": 1 }, + { "matrix": [5, 1], "x": 5, "y": 1 }, + { "matrix": [12, 1], "x": 11.5, "y": 1 }, + { "matrix": [12, 2], "x": 12.5, "y": 1 }, + { "matrix": [12, 3], "x": 13.5, "y": 1 }, + { "matrix": [12, 4], "x": 14.5, "y": 1 }, + { "matrix": [12, 5], "x": 15.5, "y": 1 }, + { "matrix": [12, 6], "x": 16.5, "y": 1 }, + { "matrix": [4, 6], "x": 0, "y": 2 }, + { "matrix": [4, 5], "x": 1, "y": 2 }, + { "matrix": [4, 4], "x": 2, "y": 2 }, + { "matrix": [4, 3], "x": 3, "y": 2 }, + { "matrix": [4, 2], "x": 4, "y": 2 }, + { "matrix": [4, 1], "x": 5, "y": 2 }, + { "matrix": [11, 1], "x": 11.5, "y": 2 }, + { "matrix": [11, 2], "x": 12.5, "y": 2 }, + { "matrix": [11, 3], "x": 13.5, "y": 2 }, + { "matrix": [11, 4], "x": 14.5, "y": 2 }, + { "matrix": [11, 5], "x": 15.5, "y": 2 }, + { "matrix": [11, 6], "x": 16.5, "y": 2 }, + { "matrix": [3, 6], "x": 0, "y": 3 }, + { "matrix": [3, 5], "x": 1, "y": 3 }, + { "matrix": [3, 4], "x": 2, "y": 3 }, + { "matrix": [3, 3], "x": 3, "y": 3 }, + { "matrix": [3, 2], "x": 4, "y": 3 }, + { "matrix": [3, 1], "x": 5, "y": 3 }, + { "matrix": [10, 1], "x": 11.5, "y": 3 }, + { "matrix": [10, 2], "x": 12.5, "y": 3 }, + { "matrix": [10, 3], "x": 13.5, "y": 3 }, + { "matrix": [10, 4], "x": 14.5, "y": 3 }, + { "matrix": [10, 5], "x": 15.5, "y": 3 }, + { "matrix": [10, 6], "x": 16.5, "y": 3 }, + { "matrix": [2, 6], "x": 0, "y": 4 }, + { "matrix": [2, 5], "x": 1, "y": 4 }, + { "matrix": [2, 4], "x": 2, "y": 4 }, + { "matrix": [2, 3], "x": 3, "y": 4 }, + { "matrix": [2, 2], "x": 4, "y": 4 }, + { "matrix": [2, 1], "x": 5, "y": 4 }, + { "matrix": [9, 1], "x": 11.5, "y": 4 }, + { "matrix": [9, 2], "x": 12.5, "y": 4 }, + { "matrix": [9, 3], "x": 13.5, "y": 4 }, + { "matrix": [9, 4], "x": 14.5, "y": 4 }, + { "matrix": [9, 5], "x": 15.5, "y": 4 }, + { "matrix": [9, 6], "x": 16.5, "y": 4 }, + { "matrix": [1, 6], "x": 0, "y": 5 }, + { "matrix": [1, 5], "x": 1, "y": 5 }, + { "matrix": [1, 4], "x": 2, "y": 5 }, + { "matrix": [1, 3], "x": 3, "y": 5 }, + { "matrix": [1, 2], "x": 4.5, "y": 5.5 }, + { "matrix": [1, 1], "x": 5.5, "y": 5.5 }, + { "matrix": [1, 0], "x": 6.5, "y": 6 }, + { "matrix": [8, 0], "x": 10, "y": 6 }, + { "matrix": [8, 1], "x": 11, "y": 5.5 }, + { "matrix": [8, 2], "x": 12, "y": 5.5 }, + { "matrix": [8, 3], "x": 13.5, "y": 5 }, + { "matrix": [8, 4], "x": 14.5, "y": 5 }, + { "matrix": [8, 5], "x": 15.5, "y": 5 }, + { "matrix": [8, 6], "x": 16.5, "y": 5 }, + { "matrix": [0, 2], "x": 6.5, "y": 7 }, + { "matrix": [0, 1], "x": 7.5, "y": 7 }, + { "matrix": [0, 0], "x": 7.5, "y": 6 }, + { "matrix": [7, 0], "x": 9, "y": 6 }, + { "matrix": [7, 1], "x": 9, "y": 7 }, + { "matrix": [7, 2], "x": 10, "y": 7 } ] } } diff --git a/keyboards/cyboard/dactyl/manuform_function_row/rj12/keymaps/vial/vial.json b/keyboards/cyboard/dactyl/manuform_function_row/rj12/keymaps/vial/vial.json index 775052d983e..49745f24010 100644 --- a/keyboards/cyboard/dactyl/manuform_function_row/rj12/keymaps/vial/vial.json +++ b/keyboards/cyboard/dactyl/manuform_function_row/rj12/keymaps/vial/vial.json @@ -5,146 +5,146 @@ "lighting": "vialrgb", "matrix": { "rows": 14, - "cols": 8 + "cols": 7 }, "layouts": { "keymap": [ [ + "6,6", "6,5", "6,4", "6,3", "6,2", "6,1", - "6,0", { "x": 5.5 }, - "13,0", "13,1", "13,2", "13,3", "13,4", - "13,5" + "13,5", + "13,6" ], [ + "5,6", "5,5", "5,4", "5,3", "5,2", "5,1", - "5,0", { "x": 5.5 }, - "12,0", "12,1", "12,2", "12,3", "12,4", - "12,5" + "12,5", + "12,6" ], [ + "4,6", "4,5", "4,4", "4,3", "4,2", "4,1", - "4,0", { "x": 5.5 }, - "11,0", "11,1", "11,2", "11,3", "11,4", - "11,5" + "11,5", + "11,6" ], [ + "3,6", "3,5", "3,4", "3,3", "3,2", "3,1", - "3,0", { "x": 5.5 }, - "10,0", "10,1", "10,2", "10,3", "10,4", - "10,5" + "10,5", + "10,6" ], [ + "2,6", "2,5", "2,4", "2,3", "2,2", "2,1", - "2,0", { "x": 5.5 }, - "9,0", "9,1", "9,2", "9,3", "9,4", - "9,5" + "9,5", + "9,6" ], [ + "1,6", "1,5", "1,4", "1,3", - "1,2", { "x": 9.5 }, - "8,2", "8,3", "8,4", - "8,5" + "8,5", + "8,6" ], [ { "y": -0.5, "x": 4.5 }, - "0,7", - "0,3", + "1,2", + "1,1", { "x": 4.5 }, - "7,3", - "7,7" + "8,1", + "8,2" ], [ { "y": -0.5, "x": 6.5 }, - "0,2", - "0,1", + "1,0", + "0,0", { "x": 0.5 }, - "7,1", - "7,2" + "7,0", + "8,0" ], [ { "x": 6.5 }, - "0,6", - "0,5", + "0,2", + "0,1", { "x": 0.5 }, - "7,5", - "7,6" + "7,1", + "7,2" ] ] } diff --git a/keyboards/cyboard/readme.md b/keyboards/cyboard/readme.md index c17b0d2b7af..c9f2e8726d2 100644 --- a/keyboards/cyboard/readme.md +++ b/keyboards/cyboard/readme.md @@ -9,10 +9,11 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## Building Firmware Various sizes and thumb-cluster styles are supported as keymaps. To build the firmware, use the command: -`make cyboard/{MODEL}/{THUMB STYLE}_{ROWS}:vial` +`make cyboard/{MODEL}/{THUMB STYLE}_{ROWS}{VERSION}:vial` where `{MODEL}` can be `imprint` or `dactyl` , `{THUMB STYLE}` can be `imprint`, `manuform`, `dual_arcs`, or `single_arc` -, and `{ROWS}` can be `function_row`, `number_row`, or `letters_only` +, `{ROWS}` can be `function_row`, `number_row`, or `letters_only` +, and `{VERSION}` is for supporting older models that used RJ-12 (telephone) cables for the split interconnect. It can be omitted if your board uses USB-C for the split interconnect, or `/rj12` if your board uses RJ-12. ## Flashing