diff options
Diffstat (limited to 'keyboards/montsinger/rebound/rev4')
-rw-r--r-- | keyboards/montsinger/rebound/rev4/config.h | 20 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev4/info.json | 207 | ||||
-rw-r--r-- | keyboards/montsinger/rebound/rev4/rev4.h | 59 |
3 files changed, 107 insertions, 179 deletions
diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h index 58cf478e13..b0b9bb6c17 100644 --- a/keyboards/montsinger/rebound/rev4/config.h +++ b/keyboards/montsinger/rebound/rev4/config.h @@ -14,30 +14,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #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 { D1, D0, D4, C6, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { D7, E6, B4, B5, B2, B3, B1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN B6 #define RGBLED_NUM 17 diff --git a/keyboards/montsinger/rebound/rev4/info.json b/keyboards/montsinger/rebound/rev4/info.json index dd76ea25e9..fbee96edc7 100644 --- a/keyboards/montsinger/rebound/rev4/info.json +++ b/keyboards/montsinger/rebound/rev4/info.json @@ -8,132 +8,139 @@ "pid": "0x0001", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5", "B2", "B3", "B1"], + "rows": ["D1", "D0", "D4", "C6", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D3"} ] }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_all": { "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}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [7, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [7, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [7, 2], "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}, + {"matrix": [0, 4], "x": 7, "y": 0}, + {"matrix": [7, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [7, 5], "x": 10, "y": 0}, + {"matrix": [0, 6], "x": 11, "y": 0}, + {"matrix": [7, 6], "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":6, "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}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [6, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [6, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [6, 2], "x": 5, "y": 1}, + {"matrix": [1, 3], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [6, 4], "x": 8, "y": 1}, + {"matrix": [1, 5], "x": 9, "y": 1}, + {"matrix": [6, 5], "x": 10, "y": 1}, + {"matrix": [1, 6], "x": 11, "y": 1}, + {"matrix": [6, 6], "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":6, "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}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [5, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [5, 2], "x": 5, "y": 2}, + {"matrix": [2, 3], "x": 6, "y": 2}, + {"matrix": [2, 4], "x": 7, "y": 2}, + {"matrix": [5, 4], "x": 8, "y": 2}, + {"matrix": [2, 5], "x": 9, "y": 2}, + {"matrix": [5, 5], "x": 10, "y": 2}, + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [5, 6], "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":6, "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} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [4, 0], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [4, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [4, 2], "x": 5, "y": 3}, + {"matrix": [3, 3], "x": 6, "y": 3}, + {"matrix": [3, 4], "x": 7, "y": 3}, + {"matrix": [4, 4], "x": 8, "y": 3}, + {"matrix": [3, 5], "x": 9, "y": 3}, + {"matrix": [4, 5], "x": 10, "y": 3}, + {"matrix": [3, 6], "x": 11, "y": 3}, + {"matrix": [4, 6], "x": 12, "y": 3} ] }, "LAYOUT_ortho_4x12": { "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [7, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [7, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [7, 2], "x": 5, "y": 0}, - {"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}, + {"matrix": [0, 4], "x": 7, "y": 0}, + {"matrix": [7, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [7, 5], "x": 10, "y": 0}, + {"matrix": [0, 6], "x": 11, "y": 0}, + {"matrix": [7, 6], "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}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [6, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [6, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [6, 2], "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}, + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [6, 4], "x": 8, "y": 1}, + {"matrix": [1, 5], "x": 9, "y": 1}, + {"matrix": [6, 5], "x": 10, "y": 1}, + {"matrix": [1, 6], "x": 11, "y": 1}, + {"matrix": [6, 6], "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}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [5, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [5, 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}, + {"matrix": [2, 4], "x": 7, "y": 2}, + {"matrix": [5, 4], "x": 8, "y": 2}, + {"matrix": [2, 5], "x": 9, "y": 2}, + {"matrix": [5, 5], "x": 10, "y": 2}, + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [5, 6], "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}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [4, 0], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [4, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [4, 2], "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} + {"matrix": [3, 4], "x": 7, "y": 3}, + {"matrix": [4, 4], "x": 8, "y": 3}, + {"matrix": [3, 5], "x": 9, "y": 3}, + {"matrix": [4, 5], "x": 10, "y": 3}, + {"matrix": [3, 6], "x": 11, "y": 3}, + {"matrix": [4, 6], "x": 12, "y": 3} ] } } diff --git a/keyboards/montsinger/rebound/rev4/rev4.h b/keyboards/montsinger/rebound/rev4/rev4.h deleted file mode 100644 index c0e5c9e68d..0000000000 --- a/keyboards/montsinger/rebound/rev4/rev4.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2020 Ross Montsinger - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * The first section contains all of the arguments representing the - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_ortho_4x12( \ - K00, K70, K01, K71, K02, K72, K04, K74, K05, K75, K06, K76, \ - K10, K60, K11, K61, K12, K62, K14, K64, K15, K65, K16, K66, \ - K20, K50, K21, K51, K22, K52, K24, K54, K25, K55, K26, K56, \ - K30, K40, K31, K41, K32, K42, K34, K44, K35, K45, K36, K46 \ - ) { \ - { K00, K01, K02, KC_NO, K04, K05, K06}, \ - { K10, K11, K12, KC_NO, K14, K15, K16}, \ - { K20, K21, K22, KC_NO, K24, K25, K26}, \ - { K30, K31, K32, KC_NO, K34, K35, K36}, \ - { K40, K41, K42, KC_NO, K44, K45, K46}, \ - { K50, K51, K52, KC_NO, K54, K55, K56}, \ - { K60, K61, K62, KC_NO, K64, K65, K66}, \ - { K70, K71, K72, KC_NO, K74, K75, K76} \ -} - -#define LAYOUT_all( \ - K00, K70, K01, K71, K02, K72, K04, K74, K05, K75, K06, K76, \ - K10, K60, K11, K61, K12, K62, K13, K14, K64, K15, K65, K16, K66, \ - K20, K50, K21, K51, K22, K52, K23, K24, K54, K25, K55, K26, K56,\ - K30, K40, K31, K41, K32, K42, K33, K34, K44, K35, K45, K36, K46\ - ) { \ - { K00, K01, K02, KC_NO, K04, K05, K06}, \ - { K10, K11, K12, K13, K14, K15, K16}, \ - { K20, K21, K22, K23, K24, K25, K26}, \ - { K30, K31, K32, K33, K34, K35, K36}, \ - { K40, K41, K42, KC_NO, K44, K45, K46}, \ - { K50, K51, K52, KC_NO, K54, K55, K56}, \ - { K60, K61, K62, KC_NO, K64, K65, K66}, \ - { K70, K71, K72, KC_NO, K74, K75, K76} \ -} - |