diff options
Diffstat (limited to 'keyboards/rart/rartlice')
| -rw-r--r-- | keyboards/rart/rartlice/config.h | 5 | ||||
| -rw-r--r-- | keyboards/rart/rartlice/info.json | 164 | ||||
| -rw-r--r-- | keyboards/rart/rartlice/keymaps/default/keymap.c | 4 | ||||
| -rw-r--r-- | keyboards/rart/rartlice/keymaps/via/keymap.c | 8 | ||||
| -rw-r--r-- | keyboards/rart/rartlice/rartlice.c | 16 | ||||
| -rw-r--r-- | keyboards/rart/rartlice/rartlice.h | 27 | ||||
| -rw-r--r-- | keyboards/rart/rartlice/rules.mk | 1 |
7 files changed, 99 insertions, 126 deletions
diff --git a/keyboards/rart/rartlice/config.h b/keyboards/rart/rartlice/config.h index b6c3af7f7f..b242e63013 100644 --- a/keyboards/rart/rartlice/config.h +++ b/keyboards/rart/rartlice/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, B8, B5, B4, B3, B11, B10, B1, B0, A7, A6, A5, A3, A4, A1 } -#define MATRIX_ROW_PINS { B13, A15, B9, A2, A0 } -#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 */ @@ -36,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#define RGB_DI_PIN B15 #define RGBLED_NUM 11 #define WS2812_SPI SPID2 diff --git a/keyboards/rart/rartlice/info.json b/keyboards/rart/rartlice/info.json index dccdcf2132..b1046227cc 100644 --- a/keyboards/rart/rartlice/info.json +++ b/keyboards/rart/rartlice/info.json @@ -8,88 +8,110 @@ "pid": "0x0065", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B12", "B8", "B5", "B4", "B3", "B11", "B10", "B1", "B0", "A7", "A6", "A5", "A3", "A4", "A1"], + "rows": ["B13", "A15", "B9", "A2", "A0"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B14", "num_lock": "A8", "scroll_lock": "A9", "on_state": 0 }, + "ws2812": { + "pin": "B15", + "driver": "spi" + }, "processor": "STM32F103", "bootloader": "stm32duino", + "layout_aliases": { + "LAYOUT_all": "LAYOUT" + }, "layouts": { - "LAYOUT_all": { + "LAYOUT": { "layout": [ - {"label" : " ", "x":0, "y":0}, - {"label" : "Esc", "x":1.25, "y":0}, - {"label" : "1", "x":2.25, "y":0}, - {"label" : "2", "x":3.25, "y":0}, - {"label" : "3", "x":4.25, "y":0}, - {"label" : "4", "x":5.25, "y":0}, - {"label" : "5", "x":6.25, "y":0}, - {"label" : "6", "x":7.25, "y":0}, - {"label" : "7", "x":9.25, "y":0}, - {"label" : "8", "x":10.25, "y":0}, - {"label" : "9", "x":11.25, "y":0}, - {"label" : "0", "x":12.25, "y":0}, - {"label" : "-", "x":13.25, "y":0}, - {"label" : "=", "x":14.25, "y":0}, - {"label" : "|", "x":15.25, "y":0}, - {"label" : "Delete", "x":16.25, "y":0}, - - {"label" : " ", "x":0, "y":1}, - {"label" : "Tab", "x":1.25, "y":1, "w":1.5}, - {"label" : "Q", "x":2.75, "y":1}, - {"label" : "W", "x":3.75, "y":1}, - {"label" : "E", "x":4.75, "y":1}, - {"label" : "R", "x":5.75, "y":1}, - {"label" : "T", "x":6.75, "y":1}, - {"label" : "Y", "x":8.75, "y":1}, - {"label" : "U", "x":9.75, "y":1}, - {"label" : "I", "x":10.75, "y":1}, - {"label" : "O", "x":11.75, "y":1}, - {"label" : "P", "x":12.75, "y":1}, - {"label" : "[", "x":13.75, "y":1}, - {"label" : "]", "x":14.75, "y":1}, - {"label" : "|", "x":15.75, "y":1, "w":1.5}, + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "4", "matrix": [1, 4], "x": 5.25, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 6.25, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 7.25, "y": 0}, + + {"label": "7", "matrix": [0, 7], "x": 9.25, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 10.25, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 11.25, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 12.25, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 13.25, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 14.25, "y": 0}, + {"label": "`", "matrix": [0, 13], "x": 15.25, "y": 0}, + {"label": "Delete", "matrix": [0, 14], "x": 16.25, "y": 0}, + + {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1}, + + {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1}, + {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1}, + {"label": "E", "matrix": [2, 4], "x": 4.75, "y": 1}, + {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1}, + {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1}, + + {"label": "Y", "matrix": [1, 7], "x": 8.75, "y": 1}, + {"label": "U", "matrix": [1, 8], "x": 9.75, "y": 1}, + {"label": "I", "matrix": [1, 9], "x": 10.75, "y": 1}, + {"label": "O", "matrix": [1, 10], "x": 11.75, "y": 1}, + {"label": "P", "matrix": [1, 11], "x": 12.75, "y": 1}, + {"label": "[", "matrix": [1, 12], "x": 13.75, "y": 1}, + {"label": "]", "matrix": [1, 13], "x": 14.75, "y": 1}, + {"label": "Backspace", "matrix": [1, 14], "x": 15.75, "y": 1, "w": 1.5}, + + {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "S", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "D", "matrix": [3, 4], "x": 5, "y": 2}, + {"label": "F", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "G", "matrix": [2, 6], "x": 7, "y": 2}, + + {"label": "H", "matrix": [2, 7], "x": 9, "y": 2}, + {"label": "J", "matrix": [2, 8], "x": 10, "y": 2}, + {"label": "K", "matrix": [2, 9], "x": 11, "y": 2}, + {"label": "L", "matrix": [2, 10], "x": 12, "y": 2}, + {"label": ";", "matrix": [2, 11], "x": 13, "y": 2}, + {"label": "'", "matrix": [2, 12], "x": 14, "y": 2}, + {"label": "Enter", "matrix": [2, 13], "x": 15, "y": 2, "w": 2.25}, + + {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 3.5, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 4.5, "y": 3}, + {"label": "C", "matrix": [4, 4], "x": 5.5, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 6.5, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 7.5, "y": 3}, + + {"label": "N", "matrix": [3, 7], "x": 9.5, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 10.5, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 11.5, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 12.5, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 13.5, "y": 3}, + {"label": "Shift", "matrix": [3, 12], "x": 14.5, "y": 3, "w": 1.75}, + + {"label": "\u2191", "matrix": [3, 14], "x": 16.5, "y": 3.25}, + + {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 5], "x": 5.5, "y": 4, "w": 2}, + {"label": "Fn", "matrix": [4, 6], "x": 7.5, "y": 4}, + + {"label": "Space", "matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75}, + {"label": "Alt", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5}, - {"label" : " ", "x":0, "y":2}, - {"label" : "Caps lock", "x":1.25, "y":2, "w":1.75}, - {"label" : "A", "x":3, "y":2}, - {"label" : "S", "x":4, "y":2}, - {"label" : "D", "x":5, "y":2}, - {"label" : "F", "x":6, "y":2}, - {"label" : "G", "x":7, "y":2}, - {"label" : "H", "x":9, "y":2}, - {"label" : "J", "x":10, "y":2}, - {"label" : "K", "x":11, "y":2}, - {"label" : "L", "x":12, "y":2}, - {"label" : ";", "x":13, "y":2}, - {"label" : "'", "x":14, "y":2}, - {"label" : "Enter", "x":15, "y":2, "w":2.25}, - - {"label" : "Shift", "x":1.25, "y":3, "w":2.25}, - {"label" : "Z", "x":3.5, "y":3}, - {"label" : "X", "x":4.5, "y":3}, - {"label" : "C", "x":5.5, "y":3}, - {"label" : "V", "x":6.5, "y":3}, - {"label" : "B", "x":7.5, "y":3}, - {"label" : "N", "x":9.5, "y":3}, - {"label" : "M", "x":10.5, "y":3}, - {"label" : ",", "x":11.5, "y":3}, - {"label" : ".", "x":12.5, "y":3}, - {"label" : "/", "x":13.5, "y":3}, - {"label" : "Shift", "x":14.5, "y":3, "w":1.75}, - {"label" : "Up", "x":16.5, "y":3.25}, - - {"label" : "Ctrl", "x":1.25, "y":4, "w":1.25}, - {"label" : "Alt", "x":4.25, "y":4, "w":1.25}, - {"label" : "Space", "x":5.5, "y":4, "w":2}, - {"label" : "Fn", "x":7.5, "y":4}, - {"label" : "Space", "x":9.5, "y":4, "w":2.75}, - {"label" : "Ctrl", "x":12.25, "y":4, "w":1.5}, - {"label" : "Left", "x":15.5, "y":4.25 }, - {"label" : "Down", "x":16.5, "y":4.25 }, - {"label" : "Right", "x":17.5, "y":4.25 } + {"label": "\u2190", "matrix": [4, 12], "x": 15.5, "y": 4.25}, + {"label": "\u2193", "matrix": [4, 13], "x": 16.5, "y": 4.25}, + {"label": "\u2192", "matrix": [4, 14], "x": 17.5, "y": 4.25} ] } } diff --git a/keyboards/rart/rartlice/keymaps/default/keymap.c b/keyboards/rart/rartlice/keymaps/default/keymap.c index eec2a4b176..543e6ed2aa 100644 --- a/keyboards/rart/rartlice/keymaps/default/keymap.c +++ b/keyboards/rart/rartlice/keymaps/default/keymap.c @@ -17,14 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT( QK_GESC, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_DEL, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_all( + [1] = LAYOUT( KC_NUM, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, KC_SCRL, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, diff --git a/keyboards/rart/rartlice/keymaps/via/keymap.c b/keyboards/rart/rartlice/keymaps/via/keymap.c index 5c28e7bc7b..6edb187522 100644 --- a/keyboards/rart/rartlice/keymaps/via/keymap.c +++ b/keyboards/rart/rartlice/keymaps/via/keymap.c @@ -17,28 +17,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT( QK_GESC, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_GRV, KC_DEL, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LALT, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_all( + [1] = LAYOUT( KC_NUM, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, QK_BOOT, _______, KC_SCRL, _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_P7, KC_P8, KC_P9, KC_P0, _______, _______, _______, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_all( + [2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT_all( + [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/rart/rartlice/rartlice.c b/keyboards/rart/rartlice/rartlice.c deleted file mode 100644 index a970e96867..0000000000 --- a/keyboards/rart/rartlice/rartlice.c +++ /dev/null @@ -1,16 +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 "rartlice.h" diff --git a/keyboards/rart/rartlice/rartlice.h b/keyboards/rart/rartlice/rartlice.h deleted file mode 100644 index ea8b130e4c..0000000000 --- a/keyboards/rart/rartlice/rartlice.h +++ /dev/null @@ -1,27 +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_all( \ - K00, K01, K02, K03, K04, K14, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K24, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K34, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K31, K32, K33, K44, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ - K41, K43, K45, K46, K48, K4A, K4C, K4D, K4E \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO }, \ - { KC_NO, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E }, \ - { KC_NO, K41, KC_NO, K43, K44, K45, K46, KC_NO, K48, KC_NO, K4A, KC_NO, K4C, K4D, K4E }, \ -} diff --git a/keyboards/rart/rartlice/rules.mk b/keyboards/rart/rartlice/rules.mk index 2be366363a..49179d2fb9 100644 --- a/keyboards/rart/rartlice/rules.mk +++ b/keyboards/rart/rartlice/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output SLEEP_LED_ENABLE = yes -WS2812_DRIVER = spi OLED_ENABLE = yes OLED_DRIVER = SSD1306 |