diff options
Diffstat (limited to 'keyboards/bandominedoni')
| -rw-r--r-- | keyboards/bandominedoni/bandominedoni.h | 40 | ||||
| -rw-r--r-- | keyboards/bandominedoni/config.h | 19 | ||||
| -rw-r--r-- | keyboards/bandominedoni/info.json | 165 | ||||
| -rw-r--r-- | keyboards/bandominedoni/rules.mk | 1 |
4 files changed, 87 insertions, 138 deletions
diff --git a/keyboards/bandominedoni/bandominedoni.h b/keyboards/bandominedoni/bandominedoni.h index c83958ce8a..c10793c0ea 100644 --- a/keyboards/bandominedoni/bandominedoni.h +++ b/keyboards/bandominedoni/bandominedoni.h @@ -18,46 +18,6 @@ #include "quantum.h" -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -// oc: for Open Close selection pedal -// fn: function layer - -#define LAYOUT( \ - l00, l01, l02, l03, l04, \ - l10, l11, l12, l13, l14, l15, l16, \ - l20, l21, l22, l23, l24, l25, l26, \ - l30, l31, l32, l33, l34, l35, l36, \ - l40, l41, l42, l43, l44, l45, l46, l47, \ - \ - oc, r00, r01, r02, r03, fn, \ - r10, r11, r12, r13, r14, \ - r20, r21, r22, r23, r24, r25, \ - r30, r31, r32, r33, r34, r35, r36, r37, \ - r40, r41, r42, r43, r44, r45, r46, r47, \ - r50, r51, r52, r53, r54, r55, r56, r57, r58 \ -) { \ - { l40, l00, l01, l02, l03, l04, KC_NO }, \ - { l10, l11, l12, l13, l14, l15, l16 }, \ - { l20, l21, l22, l23, l24, l25, l26 }, \ - { l30, l31, l32, l33, l34, l35, l36 }, \ - { l41, l42, l43, l44, l45, l46, l47 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { r50, r40, r31, r20, r10, r00, r30 }, \ - { r51, r41, r32, r21, r11, r01, oc }, \ - { r52, r42, r33, r22, r12, r02, fn }, \ - { r53, r43, r34, r23, r13, r03, r58 }, \ - { r54, r44, r35, r24, r14, r47, r57 }, \ - { r55, r45, r36, r25, r37, r46, r56 } \ -} - // Uncomment below if a pedal used for Open/Close is normally-on type (such as Yamaha's.) // #define PEDAL_NORMALLY_CLOSED diff --git a/keyboards/bandominedoni/config.h b/keyboards/bandominedoni/config.h index 7a25216afd..91a4eb0ae8 100644 --- a/keyboards/bandominedoni/config.h +++ b/keyboards/bandominedoni/config.h @@ -15,33 +15,14 @@ */ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B5, B4, D7, F6, C6, D4 } -#define MATRIX_COL_PINS { D1, E6, F7, B1, B3, B2, D0 } - #define MASTER_RIGHT #ifndef MASTER_RIGHT // SPLIT_HAND_MATRIX_GRID was initially designed to use with left hand side diode D35 mounted and not pressing K7 on the right hand side during boot. However when a USB cable is reconnected immediately, it fails. Decided to use "MASTER_RIGHT" to make it more reliable. # define SPLIT_HAND_MATRIX_GRID B5, D0 #endif -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_USB_DETECT -#define RGB_DI_PIN D3 - #ifdef RGB_MATRIX_ENABLE /* ws2812 RGB MATRIX */ diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json index d0d470a4e4..c4dfe46d74 100644 --- a/keyboards/bandominedoni/info.json +++ b/keyboards/bandominedoni/info.json @@ -8,6 +8,14 @@ "pid": "0xF4B5", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"], + "rows": ["B5", "B4", "D7", "F6", "C6", "D4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2", "encoder": { @@ -18,99 +26,100 @@ } } }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label": "l00", "x": 2, "y": 0.5}, - {"label": "l01", "x": 3, "y": 0.5}, - {"label": "l02", "x": 4, "y": 0.5}, - {"label": "l03", "x": 5, "y": 0.5}, - {"label": "l04", "x": 6, "y": 0.5}, - - {"label": "l10", "x": 0.5, "y": 1.5}, - {"label": "l11", "x": 1.5, "y": 1.5}, - {"label": "l12", "x": 2.5, "y": 1.5}, - {"label": "l13", "x": 3.5, "y": 1.5}, - {"label": "l14", "x": 4.5, "y": 1.5}, - {"label": "l15", "x": 5.5, "y": 1.5}, - {"label": "l16", "x": 6.5, "y": 1.5}, - - {"label": "l20", "x": 1, "y": 2.5}, - {"label": "l21", "x": 2, "y": 2.5}, - {"label": "l22", "x": 3, "y": 2.5}, - {"label": "l23", "x": 4, "y": 2.5}, - {"label": "l24", "x": 5, "y": 2.5}, - {"label": "l25", "x": 6, "y": 2.5}, - {"label": "l26", "x": 7, "y": 2.5}, + {"label": "l00", "matrix": [0, 1], "x": 2, "y": 0.5}, + {"label": "l01", "matrix": [0, 2], "x": 3, "y": 0.5}, + {"label": "l02", "matrix": [0, 3], "x": 4, "y": 0.5}, + {"label": "l03", "matrix": [0, 4], "x": 5, "y": 0.5}, + {"label": "l04", "matrix": [0, 5], "x": 6, "y": 0.5}, - {"label": "l30", "x": 0.5, "y": 3.5}, - {"label": "l31", "x": 1.5, "y": 3.5}, - {"label": "l32", "x": 2.5, "y": 3.5}, - {"label": "l33", "x": 3.5, "y": 3.5}, - {"label": "l34", "x": 4.5, "y": 3.5}, - {"label": "l35", "x": 5.5, "y": 3.5}, - {"label": "l36", "x": 6.5, "y": 3.5}, + {"label": "l10", "matrix": [1, 0], "x": 0.5, "y": 1.5}, + {"label": "l11", "matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"label": "l12", "matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"label": "l13", "matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"label": "l14", "matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"label": "l15", "matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"label": "l16", "matrix": [1, 6], "x": 6.5, "y": 1.5}, - {"label": "l40", "x": 0, "y": 4.5}, - {"label": "l41", "x": 1, "y": 4.5}, - {"label": "l42", "x": 2, "y": 4.5}, - {"label": "l43", "x": 3, "y": 4.5}, - {"label": "l44", "x": 4, "y": 4.5}, - {"label": "l45", "x": 5, "y": 4.5}, - {"label": "l46", "x": 6, "y": 4.5}, - {"label": "l47", "x": 7, "y": 4.5}, + {"label": "l20", "matrix": [2, 0], "x": 1, "y": 2.5}, + {"label": "l21", "matrix": [2, 1], "x": 2, "y": 2.5}, + {"label": "l22", "matrix": [2, 2], "x": 3, "y": 2.5}, + {"label": "l23", "matrix": [2, 3], "x": 4, "y": 2.5}, + {"label": "l24", "matrix": [2, 4], "x": 5, "y": 2.5}, + {"label": "l25", "matrix": [2, 5], "x": 6, "y": 2.5}, + {"label": "l26", "matrix": [2, 6], "x": 7, "y": 2.5}, - {"label": "oc", "x": 9, "y": 0}, + {"label": "l30", "matrix": [3, 0], "x": 0.5, "y": 3.5}, + {"label": "l31", "matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"label": "l32", "matrix": [3, 2], "x": 2.5, "y": 3.5}, + {"label": "l33", "matrix": [3, 3], "x": 3.5, "y": 3.5}, + {"label": "l34", "matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"label": "l35", "matrix": [3, 5], "x": 5.5, "y": 3.5}, + {"label": "l36", "matrix": [3, 6], "x": 6.5, "y": 3.5}, - {"label": "r00", "x": 11.5, "y": 0}, - {"label": "r01", "x": 12.5, "y": 0}, - {"label": "r02", "x": 13.5, "y": 0}, - {"label": "r03", "x": 14.5, "y": 0}, + {"label": "l40", "matrix": [0, 0], "x": 0, "y": 4.5}, + {"label": "l41", "matrix": [4, 0], "x": 1, "y": 4.5}, + {"label": "l42", "matrix": [4, 1], "x": 2, "y": 4.5}, + {"label": "l43", "matrix": [4, 2], "x": 3, "y": 4.5}, + {"label": "l44", "matrix": [4, 3], "x": 4, "y": 4.5}, + {"label": "l45", "matrix": [4, 4], "x": 5, "y": 4.5}, + {"label": "l46", "matrix": [4, 5], "x": 6, "y": 4.5}, + {"label": "l47", "matrix": [4, 6], "x": 7, "y": 4.5}, - {"label": "fn", "x": 17, "y": 0}, + {"label": "oc", "matrix": [7, 6], "x": 9, "y": 0}, + {"label": "r00", "matrix": [6, 5], "x": 11.5, "y": 0}, + {"label": "r01", "matrix": [7, 5], "x": 12.5, "y": 0}, + {"label": "r02", "matrix": [8, 5], "x": 13.5, "y": 0}, + {"label": "r03", "matrix": [9, 5], "x": 14.5, "y": 0}, + {"label": "fn", "matrix": [8, 6], "x": 17, "y": 0}, - {"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": "r10", "matrix": [6, 4], "x": 11, "y": 1}, + {"label": "r11", "matrix": [7, 4], "x": 12, "y": 1}, + {"label": "r12", "matrix": [8, 4], "x": 13, "y": 1}, + {"label": "r13", "matrix": [9, 4], "x": 14, "y": 1}, + {"label": "r14", "matrix": [10, 4], "x": 15, "y": 1}, - {"label": "r20", "x": 10.5, "y": 2}, - {"label": "r21", "x": 11.5, "y": 2}, - {"label": "r22", "x": 12.5, "y": 2}, - {"label": "r23", "x": 13.5, "y": 2}, - {"label": "r24", "x": 14.5, "y": 2}, - {"label": "r25", "x": 15.5, "y": 2}, + {"label": "r20", "matrix": [6, 3], "x": 10.5, "y": 2}, + {"label": "r21", "matrix": [7, 3], "x": 11.5, "y": 2}, + {"label": "r22", "matrix": [8, 3], "x": 12.5, "y": 2}, + {"label": "r23", "matrix": [9, 3], "x": 13.5, "y": 2}, + {"label": "r24", "matrix": [10, 3], "x": 14.5, "y": 2}, + {"label": "r25", "matrix": [11, 3], "x": 15.5, "y": 2}, - {"label": "r30", "x": 9, "y": 3}, - {"label": "r31", "x": 10, "y": 3}, - {"label": "r32", "x": 11, "y": 3}, - {"label": "r33", "x": 12, "y": 3}, - {"label": "r34", "x": 13, "y": 3}, - {"label": "r35", "x": 14, "y": 3}, - {"label": "r36", "x": 15, "y": 3}, - {"label": "r37", "x": 16, "y": 3}, + {"label": "r30", "matrix": [6, 6], "x": 9, "y": 3}, + {"label": "r31", "matrix": [6, 2], "x": 10, "y": 3}, + {"label": "r32", "matrix": [7, 2], "x": 11, "y": 3}, + {"label": "r33", "matrix": [8, 2], "x": 12, "y": 3}, + {"label": "r34", "matrix": [9, 2], "x": 13, "y": 3}, + {"label": "r35", "matrix": [10, 2], "x": 14, "y": 3}, + {"label": "r36", "matrix": [11, 2], "x": 15, "y": 3}, + {"label": "r37", "matrix": [11, 4], "x": 16, "y": 3}, - {"label": "r40", "x": 9.5, "y": 4}, - {"label": "r41", "x": 10.5, "y": 4}, - {"label": "r42", "x": 11.5, "y": 4}, - {"label": "r43", "x": 12.5, "y": 4}, - {"label": "r44", "x": 13.5, "y": 4}, - {"label": "r45", "x": 14.5, "y": 4}, - {"label": "r46", "x": 15.5, "y": 4}, - {"label": "r47", "x": 16.5, "y": 4}, + {"label": "r40", "matrix": [6, 1], "x": 9.5, "y": 4}, + {"label": "r41", "matrix": [7, 1], "x": 10.5, "y": 4}, + {"label": "r42", "matrix": [8, 1], "x": 11.5, "y": 4}, + {"label": "r43", "matrix": [9, 1], "x": 12.5, "y": 4}, + {"label": "r44", "matrix": [10, 1], "x": 13.5, "y": 4}, + {"label": "r45", "matrix": [11, 1], "x": 14.5, "y": 4}, + {"label": "r46", "matrix": [11, 5], "x": 15.5, "y": 4}, + {"label": "r47", "matrix": [10, 5], "x": 16.5, "y": 4}, - {"label": "r50", "x": 9, "y": 5}, - {"label": "r51", "x": 10, "y": 5}, - {"label": "r52", "x": 11, "y": 5}, - {"label": "r53", "x": 12, "y": 5}, - {"label": "r54", "x": 13, "y": 5}, - {"label": "r55", "x": 14, "y": 5}, - {"label": "r56", "x": 15, "y": 5}, - {"label": "r57", "x": 16, "y": 5}, - {"label": "r58", "x": 17, "y": 5} + {"label": "r50", "matrix": [6, 0], "x": 9, "y": 5}, + {"label": "r51", "matrix": [7, 0], "x": 10, "y": 5}, + {"label": "r52", "matrix": [8, 0], "x": 11, "y": 5}, + {"label": "r53", "matrix": [9, 0], "x": 12, "y": 5}, + {"label": "r54", "matrix": [10, 0], "x": 13, "y": 5}, + {"label": "r55", "matrix": [11, 0], "x": 14, "y": 5}, + {"label": "r56", "matrix": [11, 6], "x": 15, "y": 5}, + {"label": "r57", "matrix": [10, 6], "x": 16, "y": 5}, + {"label": "r58", "matrix": [9, 6], "x": 17, "y": 5} ] } } diff --git a/keyboards/bandominedoni/rules.mk b/keyboards/bandominedoni/rules.mk index 18ccf846ec..c32d761f10 100644 --- a/keyboards/bandominedoni/rules.mk +++ b/keyboards/bandominedoni/rules.mk @@ -14,6 +14,5 @@ MIDI_ENABLE = yes # MIDI support ENCODER_ENABLE = yes # encoder on mute button SPLIT_KEYBOARD = yes # Enables split keyboard support RGB_MATRIX_ENABLE = no # Use RGB matrix (Don't enable this when RGBLIGHT_ENABLE is used.) -RGB_MATRIX_DRIVER = WS2812 # LTO_ENABLE = yes |