diff --git a/keyboards/keebio/cepstrum/cepstrum.c b/keyboards/keebio/cepstrum/cepstrum.c deleted file mode 100644 index 3d8cf5336357..000000000000 --- a/keyboards/keebio/cepstrum/cepstrum.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Danny Nguyen (danny@keeb.io) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "cepstrum.h" diff --git a/keyboards/keebio/cepstrum/cepstrum.h b/keyboards/keebio/cepstrum/cepstrum.h deleted file mode 100644 index 1b5d0e856bbf..000000000000 --- a/keyboards/keebio/cepstrum/cepstrum.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2022 Danny Nguyen (danny@keeb.io) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_keebio_cepstrum_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/keebio/cepstrum/info.json b/keyboards/keebio/cepstrum/info.json index e3061f52453c..61d1b43f8b3d 100644 --- a/keyboards/keebio/cepstrum/info.json +++ b/keyboards/keebio/cepstrum/info.json @@ -6,14 +6,12 @@ "vid": "0xCB10" }, "features": { - "audio": false, "bootmagic": true, "command": false, "console": true, "extrakey": true, "mousekey": true, - "nkro": false, - "unicode": false + "nkro": false }, "split": { "enabled": true @@ -25,7 +23,7 @@ "LAYOUT_65xt": { "layout": [ {"label":"F1", "x":0, "y":0}, - {"label":"F6", "x":1, "y":0}, + {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.25, "y":0}, {"label":"1", "x":3.25, "y":0}, @@ -42,10 +40,10 @@ {"label":"-", "x":14.25, "y":0}, {"label":"=", "x":15.25, "y":0}, {"label":"Bksp", "x":17.25, "y":0, "w": 2}, - {"label":"Home", "x":18.25, "y":0}, + {"label":"Del", "x":18.25, "y":0}, - {"label":"F2", "x":0, "y":1}, - {"label":"F7", "x":1, "y":1}, + {"label":"F3", "x":0, "y":1}, + {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, @@ -62,10 +60,10 @@ {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, - {"label":"PgUp", "x":18.25, "y":1}, + {"label":"Home", "x":18.25, "y":1}, - {"label":"F3", "x":0, "y":2}, - {"label":"F8", "x":1, "y":2}, + {"label":"F5", "x":0, "y":2}, + {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, @@ -81,10 +79,10 @@ {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, - {"label":"PgDn", "x":18.25, "y":2}, + {"label":"PgUp", "x":18.25, "y":2}, - {"label":"F4", "x":0, "y":3}, - {"label":"F9", "x":1, "y":3}, + {"label":"F7", "x":0, "y":3}, + {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, @@ -100,9 +98,9 @@ {"label":"/", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Up", "x":17.25, "y":3}, - {"label":"End", "x":18.25, "y":3}, + {"label":"PgDn", "x":18.25, "y":3}, - {"label":"F5", "x":0, "y":4}, + {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, @@ -113,8 +111,8 @@ {"label":"Space", "x":11.75, "y":4, "w":1.5}, {"label":"Alt", "x":13.25, "y":4}, - {"label":"Ctrl", "x":14.25, "y":4}, - {"label":"Win", "x":15.25, "y":4}, + {"label":"Fn", "x":14.25, "y":4}, + {"label":"Ctrl", "x":15.25, "y":4}, {"label":"Left", "x":16.25, "y":4}, {"label":"Down", "x":17.25, "y":4}, {"label":"Right", "x":18.25, "y":4} diff --git a/keyboards/keebio/cepstrum/keymaps/via/keymap.c b/keyboards/keebio/cepstrum/keymaps/via/keymap.c index 1188757b7c24..e8fc2e29c95b 100644 --- a/keyboards/keebio/cepstrum/keymaps/via/keymap.c +++ b/keyboards/keebio/cepstrum/keymaps/via/keymap.c @@ -17,19 +17,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_VAI, RGB_VAD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, EE_CLR, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [2] = LAYOUT_65xt( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ - ), - [3] = LAYOUT_65xt( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/keebio/cepstrum/rev1/info.json b/keyboards/keebio/cepstrum/rev1/info.json index 457a0fceb9a9..225989eac5e0 100644 --- a/keyboards/keebio/cepstrum/rev1/info.json +++ b/keyboards/keebio/cepstrum/rev1/info.json @@ -6,9 +6,6 @@ "debounce": 5, "diode_direction": "COL2ROW", "features": { - "console" : true , - "rgblight" : false, - "backlight" : false, "rgb_matrix": true }, "split": { @@ -24,6 +21,92 @@ "cols": ["GP29", "GP28", "GP27", "GP2", "GP3", "GP5", "GP6", "GP7", "GP8"], "rows": ["GP26", "GP25", "GP21", "GP20", "GP19"] }, + "layouts": { + "LAYOUT_65xt": { + "layout": [ + { "label": "F1", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "F2", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "Esc", "matrix": [0, 2], "w": 1, "x": 2.25, "y": 0 }, + { "label": "1", "matrix": [0, 3], "w": 1, "x": 3.25, "y": 0 }, + { "label": "2", "matrix": [0, 4], "w": 1, "x": 4.25, "y": 0 }, + { "label": "3", "matrix": [0, 5], "w": 1, "x": 5.25, "y": 0 }, + { "label": "4", "matrix": [0, 6], "w": 1, "x": 6.25, "y": 0 }, + { "label": "5", "matrix": [0, 7], "w": 1, "x": 7.25, "y": 0 }, + { "label": "6", "matrix": [0, 8], "w": 1, "x": 8.25, "y": 0 }, + { "label": "7", "matrix": [5, 0], "w": 1, "x": 10.25, "y": 0 }, + { "label": "8", "matrix": [5, 1], "w": 1, "x": 11.25, "y": 0 }, + { "label": "9", "matrix": [5, 2], "w": 1, "x": 12.25, "y": 0 }, + { "label": "0", "matrix": [5, 3], "w": 1, "x": 13.25, "y": 0 }, + { "label": "-", "matrix": [5, 4], "w": 1, "x": 14.25, "y": 0 }, + { "label": "=", "matrix": [5, 5], "w": 1, "x": 15.25, "y": 0 }, + { "label": "Bksp", "matrix": [5, 7], "w": 2, "x": 17.25, "y": 0 }, + { "label": "Del", "matrix": [5, 8], "w": 1, "x": 18.25, "y": 0 }, + { "label": "F3", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, + { "label": "F4", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, + { "label": "Tab", "matrix": [1, 2], "w": 1.5, "x": 2.25, "y": 1 }, + { "label": "Q", "matrix": [1, 3], "w": 1, "x": 3.75, "y": 1 }, + { "label": "W", "matrix": [1, 4], "w": 1, "x": 4.75, "y": 1 }, + { "label": "E", "matrix": [1, 5], "w": 1, "x": 5.75, "y": 1 }, + { "label": "R", "matrix": [1, 6], "w": 1, "x": 6.75, "y": 1 }, + { "label": "T", "matrix": [1, 7], "w": 1, "x": 7.75, "y": 1 }, + { "label": "Y", "matrix": [6, 0], "w": 1, "x": 9.75, "y": 1 }, + { "label": "U", "matrix": [6, 1], "w": 1, "x": 10.75, "y": 1 }, + { "label": "I", "matrix": [6, 2], "w": 1, "x": 11.75, "y": 1 }, + { "label": "O", "matrix": [6, 3], "w": 1, "x": 12.75, "y": 1 }, + { "label": "P", "matrix": [6, 4], "w": 1, "x": 13.75, "y": 1 }, + { "label": "{", "matrix": [6, 5], "w": 1, "x": 14.75, "y": 1 }, + { "label": "}", "matrix": [6, 6], "w": 1, "x": 15.75, "y": 1 }, + { "label": "|", "matrix": [6, 7], "w": 1.5, "x": 16.75, "y": 1 }, + { "label": "Home", "matrix": [6, 8], "w": 1, "x": 18.25, "y": 1 }, + { "label": "F5", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, + { "label": "F6", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, + { "label": "Caps Lock", "matrix": [2, 2], "w": 1.75, "x": 2.25, "y": 2 }, + { "label": "A", "matrix": [2, 3], "w": 1, "x": 4, "y": 2 }, + { "label": "S", "matrix": [2, 4], "w": 1, "x": 5, "y": 2 }, + { "label": "D", "matrix": [2, 5], "w": 1, "x": 6, "y": 2 }, + { "label": "F", "matrix": [2, 6], "w": 1, "x": 7, "y": 2 }, + { "label": "G", "matrix": [2, 7], "w": 1, "x": 8, "y": 2 }, + { "label": "H", "matrix": [7, 0], "w": 1, "x": 10, "y": 2 }, + { "label": "J", "matrix": [7, 1], "w": 1, "x": 11, "y": 2 }, + { "label": "K", "matrix": [7, 2], "w": 1, "x": 12, "y": 2 }, + { "label": "L", "matrix": [7, 3], "w": 1, "x": 13, "y": 2 }, + { "label": ":", "matrix": [7, 4], "w": 1, "x": 14, "y": 2 }, + { "label": "\"", "matrix": [7, 5], "w": 1, "x": 15, "y": 2 }, + { "label": "Enter", "matrix": [7, 7], "w": 2.25, "x": 16, "y": 2 }, + { "label": "PgUp", "matrix": [7, 8], "w": 1, "x": 18.25, "y": 2 }, + { "label": "F7", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, + { "label": "F8", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, + { "label": "Shift", "matrix": [3, 2], "w": 2.25, "x": 2.25, "y": 3 }, + { "label": "Z", "matrix": [3, 4], "w": 1, "x": 4.5, "y": 3 }, + { "label": "X", "matrix": [3, 5], "w": 1, "x": 5.5, "y": 3 }, + { "label": "C", "matrix": [3, 6], "w": 1, "x": 6.5, "y": 3 }, + { "label": "V", "matrix": [3, 7], "w": 1, "x": 7.5, "y": 3 }, + { "label": "B", "matrix": [3, 8], "w": 1, "x": 8.5, "y": 3 }, + { "label": "N", "matrix": [8, 0], "w": 1, "x": 10.5, "y": 3 }, + { "label": "M", "matrix": [8, 1], "w": 1, "x": 11.5, "y": 3 }, + { "label": ",", "matrix": [8, 2], "w": 1, "x": 12.5, "y": 3 }, + { "label": ".", "matrix": [8, 3], "w": 1, "x": 13.5, "y": 3 }, + { "label": "/", "matrix": [8, 4], "w": 1, "x": 14.5, "y": 3 }, + { "label": "Shift", "matrix": [8, 6], "w": 1.75, "x": 15.5, "y": 3 }, + { "label": "Up", "matrix": [8, 7], "w": 1, "x": 17.25, "y": 3 }, + { "label": "PgDn", "matrix": [8, 8], "w": 1, "x": 18.25, "y": 3 }, + { "label": "F9", "matrix": [4, 0], "w": 1, "x": 0, "y": 4 }, + { "label": "F10", "matrix": [4, 1], "w": 1, "x": 1, "y": 4 }, + { "label": "Ctrl", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 }, + { "label": "Win", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 }, + { "label": "Alt", "matrix": [4, 4], "w": 1.25, "x": 4.75, "y": 4 }, + { "label": "Fn", "matrix": [4, 5], "w": 1.25, "x": 6, "y": 4 }, + { "label": "Space", "matrix": [4, 7], "w": 1, "x": 7.25, "y": 4 }, + { "label": "Space", "matrix": [9, 1], "w": 1.5, "x": 11.75, "y": 4 }, + { "label": "Alt", "matrix": [9, 2], "w": 1, "x": 13.25, "y": 4 }, + { "label": "Fn", "matrix": [9, 3], "w": 1, "x": 14.25, "y": 4 }, + { "label": "Ctrl", "matrix": [9, 4], "w": 1, "x": 15.25, "y": 4 }, + { "label": "Left", "matrix": [9, 6], "w": 1, "x": 16.25, "y": 4 }, + { "label": "Down", "matrix": [9, 7], "w": 1, "x": 17.25, "y": 4 }, + { "label": "Right", "matrix": [9, 8], "w": 1, "x": 18.25, "y": 4 } + ] + } + }, "rgb_matrix": { "driver": "WS2812", "split_count": [48, 48], diff --git a/keyboards/keebio/cepstrum/rev1/rev1.h b/keyboards/keebio/cepstrum/rev1/rev1.h deleted file mode 100644 index faa84c308607..000000000000 --- a/keyboards/keebio/cepstrum/rev1/rev1.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2022 Danny Nguyen (danny@keeb.io) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "cepstrum.h" -#include "quantum.h" - -#define LAYOUT_65xt( \ - LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9, RA1, RA2, RA3, RA4, RA5, RA6, RA8, RA9, \ - LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ - LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC8, RC9, \ - LD1, LD2, LD3, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ - LE1, LE2, LE3, LE4, LE5, LE6, LE8, RE2, RE3, RE4, RE5, RE7, RE8, RE9 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ - { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \ - { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \ - { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \ - { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \ - { RA1, RA2, RA3, RA4, RA5, RA6, KC_NO, RA8, RA9 }, \ - { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \ - { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \ - { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ - { KC_NO, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \ - }