diff options
Diffstat (limited to 'keyboards/rart/rartpad')
| -rw-r--r-- | keyboards/rart/rartpad/config.h | 10 | ||||
| -rw-r--r-- | keyboards/rart/rartpad/info.json | 95 | ||||
| -rw-r--r-- | keyboards/rart/rartpad/rartpad.c | 15 | ||||
| -rw-r--r-- | keyboards/rart/rartpad/rartpad.h | 41 |
4 files changed, 50 insertions, 111 deletions
diff --git a/keyboards/rart/rartpad/config.h b/keyboards/rart/rartpad/config.h index 4a8e14be49..5da34f7ad3 100644 --- a/keyboards/rart/rartpad/config.h +++ b/keyboards/rart/rartpad/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B6, F6, D0, D4, C6 } -#define MATRIX_COL_PINS { B2, D1, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE @@ -32,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LOCKING_RESYNC_ENABLE #define RGB_DI_PIN F7 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -49,4 +40,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 240 #define RGBLIGHT_SLEEP -#endif diff --git a/keyboards/rart/rartpad/info.json b/keyboards/rart/rartpad/info.json index 016b0c49c8..78f034a063 100644 --- a/keyboards/rart/rartpad/info.json +++ b/keyboards/rart/rartpad/info.json @@ -8,6 +8,11 @@ "pid": "0x0050", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D1", "D2", "D3"], + "rows": ["B6", "F6", "D0", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B1"}, @@ -23,55 +28,55 @@ "layouts": { "LAYOUT_ortho_5x4": { "layout": [ - {"label": "Numlock", "x": 0, "y": 0}, - {"label": "/", "x": 1, "y": 0}, - {"label": "*", "x": 2, "y": 0}, - {"label": "-", "x": 3, "y": 0}, - - {"label": "7", "x": 0, "y": 1}, - {"label": "8", "x": 1, "y": 1}, - {"label": "9", "x": 2, "y": 1}, - {"label": "=", "x": 3, "y": 1}, - - {"label": "4", "x": 0, "y": 2}, - {"label": "5", "x": 1, "y": 2}, - {"label": "6", "x": 2, "y": 2}, - {"label": "+", "x": 3, "y": 2}, - - {"label": "1", "x": 0, "y": 3}, - {"label": "2", "x": 1, "y": 3}, - {"label": "3", "x": 2, "y": 3}, - {"label": "Esc", "x": 3, "y": 3}, - - {"label": "0", "x": 0, "y": 4}, - {"label": "00", "x": 1, "y": 4}, - {"label": ".", "x": 2, "y": 4}, - {"label": "Enter", "x": 3, "y": 4} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4} ] }, "LAYOUT_numpad_5x4": { "layout": [ - {"label": "Numlock", "x": 0, "y": 0}, - {"label": "/", "x": 1, "y": 0}, - {"label": "*", "x": 2, "y": 0}, - {"label": "-", "x": 3, "y": 0}, - - {"label": "7", "x": 0, "y": 1}, - {"label": "8", "x": 1, "y": 1}, - {"label": "9", "x": 2, "y": 1}, - - {"label": "4", "x": 0, "y": 2}, - {"label": "5", "x": 1, "y": 2}, - {"label": "6", "x": 2, "y": 2}, - {"label": "+", "x": 3, "y": 1, "h": 2}, - - {"label": "1", "x": 0, "y": 3}, - {"label": "2", "x": 1, "y": 3}, - {"label": "3", "x": 2, "y": 3}, - - {"label": "0", "x": 0, "y": 4, "w": 2}, - {"label": ".", "x": 2, "y": 4}, - {"label": "Enter", "x": 3, "y": 3, "h": 2} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/rart/rartpad/rartpad.c b/keyboards/rart/rartpad/rartpad.c deleted file mode 100644 index 4b5a9eb0c2..0000000000 --- a/keyboards/rart/rartpad/rartpad.c +++ /dev/null @@ -1,15 +0,0 @@ -/* Copyright 2020 Alabahuy - * 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/>. - */ -#include "rartpad.h"
\ No newline at end of file diff --git a/keyboards/rart/rartpad/rartpad.h b/keyboards/rart/rartpad/rartpad.h deleted file mode 100644 index 2e516e2cfe..0000000000 --- a/keyboards/rart/rartpad/rartpad.h +++ /dev/null @@ -1,41 +0,0 @@ - -#pragma once - -#include "quantum.h" - -/* This 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. - */ -#define LAYOUT_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ -} -#define LAYOUT_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K13, \ - K30, K31, K32, \ - K40, K42, K33 \ -) \ -{ \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ - { K30, K31, K32, K33 }, \ - { K40, KC_NO, K42, KC_NO }, \ -} |