From a210a6ddfca1d7453b067cf943461d4bf7f22c2c Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Mon, 7 Sep 2020 19:45:18 -0500 Subject: [PATCH 01/29] Core config done Still need to fix bug where the two inner keys on the bottom row don't register --- keyboards/keaboard/config.h | 20 ++++++ keyboards/keaboard/info.json | 68 +++++++++++++++++++++ keyboards/keaboard/keaboard.c | 1 + keyboards/keaboard/keaboard.h | 5 ++ keyboards/keaboard/keymaps/default/config.h | 25 ++++++++ keyboards/keaboard/keymaps/default/keymap.c | 51 ++++++++++++++++ keyboards/keaboard/readme.md | 15 +++++ keyboards/keaboard/rev1/config.h | 52 ++++++++++++++++ keyboards/keaboard/rev1/rev1.c | 1 + keyboards/keaboard/rev1/rev1.h | 25 ++++++++ keyboards/keaboard/rev1/rules.mk | 0 keyboards/keaboard/rules.mk | 35 +++++++++++ 12 files changed, 298 insertions(+) create mode 100644 keyboards/keaboard/config.h create mode 100644 keyboards/keaboard/info.json create mode 100644 keyboards/keaboard/keaboard.c create mode 100644 keyboards/keaboard/keaboard.h create mode 100644 keyboards/keaboard/keymaps/default/config.h create mode 100644 keyboards/keaboard/keymaps/default/keymap.c create mode 100644 keyboards/keaboard/readme.md create mode 100644 keyboards/keaboard/rev1/config.h create mode 100644 keyboards/keaboard/rev1/rev1.c create mode 100644 keyboards/keaboard/rev1/rev1.h create mode 100644 keyboards/keaboard/rev1/rules.mk create mode 100644 keyboards/keaboard/rules.mk diff --git a/keyboards/keaboard/config.h b/keyboards/keaboard/config.h new file mode 100644 index 000000000000..88a5328cb983 --- /dev/null +++ b/keyboards/keaboard/config.h @@ -0,0 +1,20 @@ +/* +Copyright 2020 Keith Wade + +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 . +*/ + +#pragma once + +#include "config_common.h" diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json new file mode 100644 index 000000000000..41ce02802163 --- /dev/null +++ b/keyboards/keaboard/info.json @@ -0,0 +1,68 @@ +{ + "keyboard_name": "keaboard", + "manufacturer": "keawade", + "identifier": "0x9090", + "url": "https://github.com/keawade/keaboard", + "maintainer": "qmk", + "processor": "atmega32u4", + "width": 14, + "height": 4, + "layouts": { + "LAYOUT": { + "key_count": 50, + "layout": [ + // TODO: Relabel these keys + { "label": "L00", "x": 0, "y": 0.375 }, + { "label": "L01", "x": 1, "y": 0.25 }, + { "label": "L02", "x": 2, "y": 0.125 }, + { "label": "L03", "x": 3, "y": 0 }, + { "label": "L04", "x": 4, "y": 0.125 }, + { "label": "L05", "x": 5, "y": 0.25 }, + { "label": "R01", "x": 10, "y": 0.25 }, + { "label": "R02", "x": 11, "y": 0.125 }, + { "label": "R03", "x": 12, "y": 0 }, + { "label": "R04", "x": 13, "y": 0.125 }, + { "label": "R05", "x": 14, "y": 0.25 }, + { "label": "R06", "x": 15, "y": 0.375 }, + { "label": "L10", "x": 0, "y": 1.375 }, + { "label": "L11", "x": 1, "y": 1.25 }, + { "label": "L12", "x": 2, "y": 1.125 }, + { "label": "L13", "x": 3, "y": 1 }, + { "label": "L14", "x": 4, "y": 1.125 }, + { "label": "L15", "x": 5, "y": 1.25 }, + { "label": "R11", "x": 10, "y": 1.25 }, + { "label": "R12", "x": 11, "y": 1.125 }, + { "label": "R13", "x": 12, "y": 1 }, + { "label": "R14", "x": 13, "y": 1.125 }, + { "label": "R15", "x": 14, "y": 1.25 }, + { "label": "R16", "x": 15, "y": 1.375 }, + { "label": "L20", "x": 0, "y": 2.375 }, + { "label": "L21", "x": 1, "y": 2.25 }, + { "label": "L22", "x": 2, "y": 2.125 }, + { "label": "L23", "x": 3, "y": 2 }, + { "label": "L24", "x": 4, "y": 2.125 }, + { "label": "L25", "x": 5, "y": 2.25 }, + { "label": "L26", "x": 6.5, "y": 3 }, + { "label": "R20", "x": 8.5, "y": 3 }, + { "label": "R21", "x": 10, "y": 2.25 }, + { "label": "R22", "x": 11, "y": 2.125 }, + { "label": "R23", "x": 12, "y": 2 }, + { "label": "R24", "x": 13, "y": 2.125 }, + { "label": "R25", "x": 14, "y": 2.25 }, + { "label": "R26", "x": 15, "y": 2.375 }, + { "label": "L30", "x": 0, "y": 3.375 }, + { "label": "L31", "x": 1, "y": 3.25 }, + { "label": "L32", "x": 2, "y": 3.125 }, + { "label": "L33", "x": 3, "y": 3 }, + { "label": "L34", "x": 5.5, "y": 4 }, + { "label": "L35", "x": 6.5, "y": 4 }, + { "label": "R30", "x": 8.5, "y": 4 }, + { "label": "R31", "x": 9.5, "y": 4 }, + { "label": "R32", "x": 12, "y": 3 }, + { "label": "R33", "x": 13, "y": 3.125 }, + { "label": "R34", "x": 14, "y": 3.25 }, + { "label": "R35", "x": 15, "y": 3.375 } + ] + } + } +} diff --git a/keyboards/keaboard/keaboard.c b/keyboards/keaboard/keaboard.c new file mode 100644 index 000000000000..a754cb05cf0d --- /dev/null +++ b/keyboards/keaboard/keaboard.c @@ -0,0 +1 @@ +#include "keaboard.h" diff --git a/keyboards/keaboard/keaboard.h b/keyboards/keaboard/keaboard.h new file mode 100644 index 000000000000..d9125e86ab07 --- /dev/null +++ b/keyboards/keaboard/keaboard.h @@ -0,0 +1,5 @@ +#pragma once + +#ifdef KEYBOARD_keaboard_rev1 + #include "rev1.h" +#endif diff --git a/keyboards/keaboard/keymaps/default/config.h b/keyboards/keaboard/keymaps/default/config.h new file mode 100644 index 000000000000..c0b6869252a1 --- /dev/null +++ b/keyboards/keaboard/keymaps/default/config.h @@ -0,0 +1,25 @@ +/* +Copyright 2020 Keith Wade + +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 . +*/ + +#pragma once + +/* Use I2C or Serial, not both */ +#define USE_SERIAL + +/* Select hand configuration */ +#define MASTER_LEFT +// #define MASTER_RIGHT diff --git a/keyboards/keaboard/keymaps/default/keymap.c b/keyboards/keaboard/keymaps/default/keymap.c new file mode 100644 index 000000000000..bdfc89e51092 --- /dev/null +++ b/keyboards/keaboard/keymaps/default/keymap.c @@ -0,0 +1,51 @@ +#include QMK_KEYBOARD_H + +#define _QWERTY 0 +#define _LOWER 1 +#define _RAISE 2 + +enum custom_keycodes { + QWERTY = SAFE_RANGE, + LOWER, + RAISE, +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_QWERTY] = LAYOUT( + //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F2, KC_F12, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' + ), + + [_RAISE] = LAYOUT( + //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_TRNS, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END + //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' + ), + + [_LOWER] = LAYOUT( + //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_DQUO, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_TRNS, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' + ) + +}; diff --git a/keyboards/keaboard/readme.md b/keyboards/keaboard/readme.md new file mode 100644 index 000000000000..2b586256f184 --- /dev/null +++ b/keyboards/keaboard/readme.md @@ -0,0 +1,15 @@ +# keaboard + +![keaboard](http://i.imgur.com/q2M3uEU.jpg) + +A split ergo 4x6 keyboard with 3 thumb keys designed by [Keith Wade](https://github.com/keawade). [More info on the GitHub Repo](https://github.com/keawade/keaboard). + +* Keyboard Maintainer: [Keith Wade](https://github.com/keawade) +* Hardware Supported: Elite-C, nice!nano +* Hardware Availability: Open source. You can order your own from a PCB manufacturer. + +Make example for this keyboard (after setting up your build environment): + + make keaboard/rev1:default + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/keaboard/rev1/config.h b/keyboards/keaboard/rev1/config.h new file mode 100644 index 000000000000..7a9cb2935bd7 --- /dev/null +++ b/keyboards/keaboard/rev1/config.h @@ -0,0 +1,52 @@ +/* +Copyright 2020 Keith Wade + +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 . +*/ + +#pragma once + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0xFEED +#define PRODUCT_ID 0x9090 +#define DEVICE_VER 0x0001 +#define MANUFACTURER You +#define PRODUCT Keaboard Rev 1 +#define DESCRIPTION Split 40 percent ergonomic hotswap keyboard + +/* key matrix size */ +// Rows are doubled-up +#define MATRIX_ROWS 8 +#define MATRIX_COLS 7 + +// wiring of each half +#define MATRIX_ROW_PINS { D7, E6, B4, B5 } +#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } + +/* COL2ROW or ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +/* define if matrix has ghost */ +//#define MATRIX_HAS_GHOST + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* 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 + +/* serial.c configuration for split keyboard */ +#define SOFT_SERIAL_PIN D0 diff --git a/keyboards/keaboard/rev1/rev1.c b/keyboards/keaboard/rev1/rev1.c new file mode 100644 index 000000000000..520a869e57ba --- /dev/null +++ b/keyboards/keaboard/rev1/rev1.c @@ -0,0 +1 @@ +#include "rev1.h" diff --git a/keyboards/keaboard/rev1/rev1.h b/keyboards/keaboard/rev1/rev1.h new file mode 100644 index 000000000000..0e75a7e52189 --- /dev/null +++ b/keyboards/keaboard/rev1/rev1.h @@ -0,0 +1,25 @@ +#ifndef REV1_H +#define REV1_H + +#include "keaboard.h" + +#include "quantum.h" + +#define LAYOUT( \ + L01, L05, L09, L13, L17, L21, R01, R05, R09, R13, R17, R21, \ + L02, L06, L10, L14, L18, L22, R02, R06, R10, R14, R18, R22, \ + L03, L07, L11, L15, L19, L23, L24, R03, R07, R11, R15, R19, R23, R24, \ + L04, L08, L12, L16, L20, L25, R04, R08, R12, R16, R20, R25 \ + ) \ + { \ + { L01, L05, L09, L13, L17, L21, KC_NO }, \ + { L02, L06, L10, L14, L18, L22, KC_NO }, \ + { L03, L07, L11, L15, L19, L23, L24 }, \ + { L04, L08, L12, L16, L20, KC_NO, L25 }, \ + { R01, R05, R09, R13, R17, R21, KC_NO }, \ + { R02, R06, R10, R14, R18, R22, KC_NO }, \ + { R03, R07, R11, R15, R19, R23, R24 }, \ + { R04, R08, R12, R16, R20, KC_NO, R25 } \ + } + +#endif diff --git a/keyboards/keaboard/rev1/rules.mk b/keyboards/keaboard/rev1/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/keaboard/rules.mk b/keyboards/keaboard/rules.mk new file mode 100644 index 000000000000..47933dda88d2 --- /dev/null +++ b/keyboards/keaboard/rules.mk @@ -0,0 +1,35 @@ +# MCU name +MCU = atmega32u4 + +# Bootloader selection +# Teensy halfkay +# Pro Micro caterina +# Atmel DFU atmel-dfu +# LUFA DFU lufa-dfu +# QMK DFU qmk-dfu +# ATmega32A bootloadHID +# ATmega328P USBasp +BOOTLOADER = caterina + +# Build Options +# change to "no" to disable the options, or define them in the Makefile in +# the appropriate keymap folder that will get included automatically +# +BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration +MOUSEKEY_ENABLE = yes # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend + +SPLIT_KEYBOARD = yes + +DEFAULT_FOLDER = keaboard/rev1 From ab91e06cbc46be35938db9b210994d757332becf Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Mon, 7 Sep 2020 19:58:17 -0500 Subject: [PATCH 02/29] Update image --- keyboards/keaboard/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keaboard/readme.md b/keyboards/keaboard/readme.md index 2b586256f184..0a981812c272 100644 --- a/keyboards/keaboard/readme.md +++ b/keyboards/keaboard/readme.md @@ -1,6 +1,6 @@ # keaboard -![keaboard](http://i.imgur.com/q2M3uEU.jpg) +![keaboard](https://github.com/keawade/keaboard/blob/master/images/keaboard-rev1-pcb-render.png) A split ergo 4x6 keyboard with 3 thumb keys designed by [Keith Wade](https://github.com/keawade). [More info on the GitHub Repo](https://github.com/keawade/keaboard). From 5485ff0d56438c106a64f4a6d012c4045965fdea Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Tue, 8 Sep 2020 20:33:16 -0500 Subject: [PATCH 03/29] Mapping finally working --- keyboards/keaboard/rev1/rev1.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/keaboard/rev1/rev1.h b/keyboards/keaboard/rev1/rev1.h index 0e75a7e52189..b8cf46a6d35f 100644 --- a/keyboards/keaboard/rev1/rev1.h +++ b/keyboards/keaboard/rev1/rev1.h @@ -6,10 +6,10 @@ #include "quantum.h" #define LAYOUT( \ - L01, L05, L09, L13, L17, L21, R01, R05, R09, R13, R17, R21, \ - L02, L06, L10, L14, L18, L22, R02, R06, R10, R14, R18, R22, \ - L03, L07, L11, L15, L19, L23, L24, R03, R07, R11, R15, R19, R23, R24, \ - L04, L08, L12, L16, L20, L25, R04, R08, R12, R16, R20, R25 \ + L01, L05, L09, L13, L17, L21, R21, R17, R13, R09, R05, R01, \ + L02, L06, L10, L14, L18, L22, R22, R18, R14, R10, R06, R02, \ + L03, L07, L11, L15, L19, L23, L24, R24, R23, R19, R15, R11, R07, R03, \ + L04, L08, L12, L16, L20, L25, R25, R20, R16, R12, R08, R04 \ ) \ { \ { L01, L05, L09, L13, L17, L21, KC_NO }, \ From 3f003844bd2bc5966240316d065eca26a282485d Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Tue, 8 Sep 2020 20:56:47 -0500 Subject: [PATCH 04/29] Implement layers --- keyboards/keaboard/keymaps/default/keymap.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/keyboards/keaboard/keymaps/default/keymap.c b/keyboards/keaboard/keymaps/default/keymap.c index bdfc89e51092..4acf21e597a2 100644 --- a/keyboards/keaboard/keymaps/default/keymap.c +++ b/keyboards/keaboard/keymaps/default/keymap.c @@ -4,12 +4,6 @@ #define _LOWER 1 #define _RAISE 2 -enum custom_keycodes { - QWERTY = SAFE_RANGE, - LOWER, - RAISE, -}; - const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( @@ -20,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F2, KC_F12, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, MO(_LOWER), KC_ENT, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' ), From 5e9d1fd8d9445546ef67deb1f48879fc41946f7a Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Tue, 8 Sep 2020 21:36:46 -0500 Subject: [PATCH 05/29] Improve formatting --- keyboards/keaboard/keymaps/default/keymap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/keyboards/keaboard/keymaps/default/keymap.c b/keyboards/keaboard/keymaps/default/keymap.c index 4acf21e597a2..6a29f5661a1a 100644 --- a/keyboards/keaboard/keymaps/default/keymap.c +++ b/keyboards/keaboard/keymaps/default/keymap.c @@ -4,6 +4,9 @@ #define _LOWER 1 #define _RAISE 2 +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( @@ -14,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F2, KC_F12, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, MO(_LOWER), KC_ENT, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' ), From d72f000461969cceba2e9bbe61d39b715c833ca4 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Tue, 8 Sep 2020 21:52:30 -0500 Subject: [PATCH 06/29] Add keawade layout --- keyboards/keaboard/keymaps/keawade/config.h | 25 +++++++++++ keyboards/keaboard/keymaps/keawade/keymap.c | 48 +++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 keyboards/keaboard/keymaps/keawade/config.h create mode 100644 keyboards/keaboard/keymaps/keawade/keymap.c diff --git a/keyboards/keaboard/keymaps/keawade/config.h b/keyboards/keaboard/keymaps/keawade/config.h new file mode 100644 index 000000000000..c0b6869252a1 --- /dev/null +++ b/keyboards/keaboard/keymaps/keawade/config.h @@ -0,0 +1,25 @@ +/* +Copyright 2020 Keith Wade + +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 . +*/ + +#pragma once + +/* Use I2C or Serial, not both */ +#define USE_SERIAL + +/* Select hand configuration */ +#define MASTER_LEFT +// #define MASTER_RIGHT diff --git a/keyboards/keaboard/keymaps/keawade/keymap.c b/keyboards/keaboard/keymaps/keawade/keymap.c new file mode 100644 index 000000000000..6a29f5661a1a --- /dev/null +++ b/keyboards/keaboard/keymaps/keawade/keymap.c @@ -0,0 +1,48 @@ +#include QMK_KEYBOARD_H + +#define _QWERTY 0 +#define _LOWER 1 +#define _RAISE 2 + +#define LOWER MO(_LOWER) +#define RAISE MO(_RAISE) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [_QWERTY] = LAYOUT( + //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F2, KC_F12, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' + ), + + [_RAISE] = LAYOUT( + //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_TRNS, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END + //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' + ), + + [_LOWER] = LAYOUT( + //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_DQUO, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_TRNS, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, + //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' + ) + +}; From bfa460b9dbb5f23fa50cf9f4dabf5831cc3c5806 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Tue, 8 Sep 2020 22:06:44 -0500 Subject: [PATCH 07/29] Update info.json labels --- keyboards/keaboard/info.json | 99 ++++++++++++++++++------------------ 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index 41ce02802163..b95e6631ae91 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -11,57 +11,56 @@ "LAYOUT": { "key_count": 50, "layout": [ - // TODO: Relabel these keys - { "label": "L00", "x": 0, "y": 0.375 }, - { "label": "L01", "x": 1, "y": 0.25 }, - { "label": "L02", "x": 2, "y": 0.125 }, - { "label": "L03", "x": 3, "y": 0 }, - { "label": "L04", "x": 4, "y": 0.125 }, - { "label": "L05", "x": 5, "y": 0.25 }, - { "label": "R01", "x": 10, "y": 0.25 }, - { "label": "R02", "x": 11, "y": 0.125 }, - { "label": "R03", "x": 12, "y": 0 }, - { "label": "R04", "x": 13, "y": 0.125 }, + { "label": "L01", "x": 0, "y": 0.375 }, + { "label": "L05", "x": 1, "y": 0.25 }, + { "label": "L09", "x": 2, "y": 0.125 }, + { "label": "L13", "x": 3, "y": 0 }, + { "label": "L17", "x": 4, "y": 0.125 }, + { "label": "L21", "x": 5, "y": 0.25 }, + { "label": "R21", "x": 10, "y": 0.25 }, + { "label": "R17", "x": 11, "y": 0.125 }, + { "label": "R13", "x": 12, "y": 0 }, + { "label": "R09", "x": 13, "y": 0.125 }, { "label": "R05", "x": 14, "y": 0.25 }, - { "label": "R06", "x": 15, "y": 0.375 }, - { "label": "L10", "x": 0, "y": 1.375 }, - { "label": "L11", "x": 1, "y": 1.25 }, - { "label": "L12", "x": 2, "y": 1.125 }, - { "label": "L13", "x": 3, "y": 1 }, - { "label": "L14", "x": 4, "y": 1.125 }, - { "label": "L15", "x": 5, "y": 1.25 }, - { "label": "R11", "x": 10, "y": 1.25 }, - { "label": "R12", "x": 11, "y": 1.125 }, - { "label": "R13", "x": 12, "y": 1 }, - { "label": "R14", "x": 13, "y": 1.125 }, - { "label": "R15", "x": 14, "y": 1.25 }, - { "label": "R16", "x": 15, "y": 1.375 }, - { "label": "L20", "x": 0, "y": 2.375 }, - { "label": "L21", "x": 1, "y": 2.25 }, - { "label": "L22", "x": 2, "y": 2.125 }, - { "label": "L23", "x": 3, "y": 2 }, - { "label": "L24", "x": 4, "y": 2.125 }, - { "label": "L25", "x": 5, "y": 2.25 }, - { "label": "L26", "x": 6.5, "y": 3 }, - { "label": "R20", "x": 8.5, "y": 3 }, - { "label": "R21", "x": 10, "y": 2.25 }, - { "label": "R22", "x": 11, "y": 2.125 }, - { "label": "R23", "x": 12, "y": 2 }, - { "label": "R24", "x": 13, "y": 2.125 }, - { "label": "R25", "x": 14, "y": 2.25 }, - { "label": "R26", "x": 15, "y": 2.375 }, - { "label": "L30", "x": 0, "y": 3.375 }, - { "label": "L31", "x": 1, "y": 3.25 }, - { "label": "L32", "x": 2, "y": 3.125 }, - { "label": "L33", "x": 3, "y": 3 }, - { "label": "L34", "x": 5.5, "y": 4 }, - { "label": "L35", "x": 6.5, "y": 4 }, - { "label": "R30", "x": 8.5, "y": 4 }, - { "label": "R31", "x": 9.5, "y": 4 }, - { "label": "R32", "x": 12, "y": 3 }, - { "label": "R33", "x": 13, "y": 3.125 }, - { "label": "R34", "x": 14, "y": 3.25 }, - { "label": "R35", "x": 15, "y": 3.375 } + { "label": "R01", "x": 15, "y": 0.375 }, + { "label": "L02", "x": 0, "y": 1.375 }, + { "label": "L06", "x": 1, "y": 1.25 }, + { "label": "L10", "x": 2, "y": 1.125 }, + { "label": "L14", "x": 3, "y": 1 }, + { "label": "L18", "x": 4, "y": 1.125 }, + { "label": "L22", "x": 5, "y": 1.25 }, + { "label": "R22", "x": 10, "y": 1.25 }, + { "label": "R18", "x": 11, "y": 1.125 }, + { "label": "R14", "x": 12, "y": 1 }, + { "label": "R10", "x": 13, "y": 1.125 }, + { "label": "R06", "x": 14, "y": 1.25 }, + { "label": "R02", "x": 15, "y": 1.375 }, + { "label": "L03", "x": 0, "y": 2.375 }, + { "label": "L07", "x": 1, "y": 2.25 }, + { "label": "L11", "x": 2, "y": 2.125 }, + { "label": "L15", "x": 3, "y": 2 }, + { "label": "L19", "x": 4, "y": 2.125 }, + { "label": "L23", "x": 5, "y": 2.25 }, + { "label": "L24", "x": 6.5, "y": 3 }, + { "label": "R24", "x": 8.5, "y": 3 }, + { "label": "R23", "x": 10, "y": 2.25 }, + { "label": "R19", "x": 11, "y": 2.125 }, + { "label": "R15", "x": 12, "y": 2 }, + { "label": "R11", "x": 13, "y": 2.125 }, + { "label": "R07", "x": 14, "y": 2.25 }, + { "label": "R03", "x": 15, "y": 2.375 }, + { "label": "L04", "x": 0, "y": 3.375 }, + { "label": "L08", "x": 1, "y": 3.25 }, + { "label": "L12", "x": 2, "y": 3.125 }, + { "label": "L16", "x": 3, "y": 3 }, + { "label": "L20", "x": 5.5, "y": 4 }, + { "label": "L25", "x": 6.5, "y": 4 }, + { "label": "R25", "x": 8.5, "y": 4 }, + { "label": "R20", "x": 9.5, "y": 4 }, + { "label": "R16", "x": 12, "y": 3 }, + { "label": "R12", "x": 13, "y": 3.125 }, + { "label": "R08", "x": 14, "y": 3.25 }, + { "label": "R04", "x": 15, "y": 3.375 } ] } } From 2e860c450c85f4074b686b206dbcdccf72fb959b Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Wed, 9 Sep 2020 17:54:50 -0500 Subject: [PATCH 08/29] Add license headers, update keymap --- keyboards/keaboard/keaboard.c | 17 +++++++++++++++++ keyboards/keaboard/keaboard.h | 17 +++++++++++++++++ keyboards/keaboard/keymaps/default/keymap.c | 21 +++++++++++++++++++-- keyboards/keaboard/keymaps/keawade/keymap.c | 21 +++++++++++++++++++-- keyboards/keaboard/rev1/rev1.c | 17 +++++++++++++++++ keyboards/keaboard/rev1/rev1.h | 17 +++++++++++++++++ 6 files changed, 106 insertions(+), 4 deletions(-) diff --git a/keyboards/keaboard/keaboard.c b/keyboards/keaboard/keaboard.c index a754cb05cf0d..261f27ce555c 100644 --- a/keyboards/keaboard/keaboard.c +++ b/keyboards/keaboard/keaboard.c @@ -1 +1,18 @@ +/* +Copyright 2020 Keith Wade + +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 . +*/ + #include "keaboard.h" diff --git a/keyboards/keaboard/keaboard.h b/keyboards/keaboard/keaboard.h index d9125e86ab07..443c77e40957 100644 --- a/keyboards/keaboard/keaboard.h +++ b/keyboards/keaboard/keaboard.h @@ -1,3 +1,20 @@ +/* +Copyright 2020 Keith Wade + +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 . +*/ + #pragma once #ifdef KEYBOARD_keaboard_rev1 diff --git a/keyboards/keaboard/keymaps/default/keymap.c b/keyboards/keaboard/keymaps/default/keymap.c index 6a29f5661a1a..940967191d2f 100644 --- a/keyboards/keaboard/keymaps/default/keymap.c +++ b/keyboards/keaboard/keymaps/default/keymap.c @@ -1,3 +1,20 @@ +/* +Copyright 2020 Keith Wade + +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 . +*/ + #include QMK_KEYBOARD_H #define _QWERTY 0 @@ -29,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' ), @@ -41,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_TRNS, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' ) diff --git a/keyboards/keaboard/keymaps/keawade/keymap.c b/keyboards/keaboard/keymaps/keawade/keymap.c index 6a29f5661a1a..940967191d2f 100644 --- a/keyboards/keaboard/keymaps/keawade/keymap.c +++ b/keyboards/keaboard/keymaps/keawade/keymap.c @@ -1,3 +1,20 @@ +/* +Copyright 2020 Keith Wade + +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 . +*/ + #include QMK_KEYBOARD_H #define _QWERTY 0 @@ -29,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' ), @@ -41,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_TRNS, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' ) diff --git a/keyboards/keaboard/rev1/rev1.c b/keyboards/keaboard/rev1/rev1.c index 520a869e57ba..f6148ec7f104 100644 --- a/keyboards/keaboard/rev1/rev1.c +++ b/keyboards/keaboard/rev1/rev1.c @@ -1 +1,18 @@ +/* +Copyright 2020 Keith Wade + +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 . +*/ + #include "rev1.h" diff --git a/keyboards/keaboard/rev1/rev1.h b/keyboards/keaboard/rev1/rev1.h index b8cf46a6d35f..3712e21e3392 100644 --- a/keyboards/keaboard/rev1/rev1.h +++ b/keyboards/keaboard/rev1/rev1.h @@ -1,3 +1,20 @@ +/* +Copyright 2020 Keith Wade + +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 . +*/ + #ifndef REV1_H #define REV1_H From 9c9ec672864ae1384ed5f0f32dcb653e9adffaea Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sat, 11 Feb 2023 17:31:09 -0500 Subject: [PATCH 09/29] Update keaboard config --- keyboards/keaboard/config.h | 2 +- keyboards/keaboard/info.json | 19 +++--- keyboards/keaboard/keaboard.c | 2 +- keyboards/keaboard/keaboard.h | 2 +- keyboards/keaboard/keymaps/default/config.h | 2 +- keyboards/keaboard/keymaps/default/keymap.c | 2 +- keyboards/keaboard/keymaps/keawade/config.h | 25 -------- keyboards/keaboard/keymaps/keawade/keymap.c | 65 --------------------- keyboards/keaboard/rev1/config.h | 28 +-------- keyboards/keaboard/rev1/rev1.c | 2 +- keyboards/keaboard/rev1/rev1.h | 2 +- 11 files changed, 20 insertions(+), 131 deletions(-) delete mode 100644 keyboards/keaboard/keymaps/keawade/config.h delete mode 100644 keyboards/keaboard/keymaps/keawade/keymap.c diff --git a/keyboards/keaboard/config.h b/keyboards/keaboard/config.h index 88a5328cb983..c5b07b973a40 100644 --- a/keyboards/keaboard/config.h +++ b/keyboards/keaboard/config.h @@ -1,5 +1,5 @@ /* -Copyright 2020 Keith Wade +Copyright 2023 Keith Wade 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 diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index b95e6631ae91..77f5da6f8eac 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -1,15 +1,20 @@ { "keyboard_name": "keaboard", - "manufacturer": "keawade", - "identifier": "0x9090", + "manufacturer": "You", "url": "https://github.com/keawade/keaboard", - "maintainer": "qmk", - "processor": "atmega32u4", - "width": 14, - "height": 4, + "maintainer": "keawade", + "usb": { + "vid": "0xFEED", + "pid": "0x9090", + "device_version": "1.0.0" + }, + "diode_direction": "COL2ROW", + "matrix_pins": { + "rows": ["D7", "E6", "B4", "B5"], + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, "layouts": { "LAYOUT": { - "key_count": 50, "layout": [ { "label": "L01", "x": 0, "y": 0.375 }, { "label": "L05", "x": 1, "y": 0.25 }, diff --git a/keyboards/keaboard/keaboard.c b/keyboards/keaboard/keaboard.c index 261f27ce555c..6a1e55989ffb 100644 --- a/keyboards/keaboard/keaboard.c +++ b/keyboards/keaboard/keaboard.c @@ -1,5 +1,5 @@ /* -Copyright 2020 Keith Wade +Copyright 2023 Keith Wade 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 diff --git a/keyboards/keaboard/keaboard.h b/keyboards/keaboard/keaboard.h index 443c77e40957..ca07d89755fb 100644 --- a/keyboards/keaboard/keaboard.h +++ b/keyboards/keaboard/keaboard.h @@ -1,5 +1,5 @@ /* -Copyright 2020 Keith Wade +Copyright 2023 Keith Wade 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 diff --git a/keyboards/keaboard/keymaps/default/config.h b/keyboards/keaboard/keymaps/default/config.h index c0b6869252a1..cd388d85f321 100644 --- a/keyboards/keaboard/keymaps/default/config.h +++ b/keyboards/keaboard/keymaps/default/config.h @@ -1,5 +1,5 @@ /* -Copyright 2020 Keith Wade +Copyright 2023 Keith Wade 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 diff --git a/keyboards/keaboard/keymaps/default/keymap.c b/keyboards/keaboard/keymaps/default/keymap.c index 940967191d2f..62b4876a24a2 100644 --- a/keyboards/keaboard/keymaps/default/keymap.c +++ b/keyboards/keaboard/keymaps/default/keymap.c @@ -1,5 +1,5 @@ /* -Copyright 2020 Keith Wade +Copyright 2023 Keith Wade 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 diff --git a/keyboards/keaboard/keymaps/keawade/config.h b/keyboards/keaboard/keymaps/keawade/config.h deleted file mode 100644 index c0b6869252a1..000000000000 --- a/keyboards/keaboard/keymaps/keawade/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2020 Keith Wade - -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 . -*/ - -#pragma once - -/* Use I2C or Serial, not both */ -#define USE_SERIAL - -/* Select hand configuration */ -#define MASTER_LEFT -// #define MASTER_RIGHT diff --git a/keyboards/keaboard/keymaps/keawade/keymap.c b/keyboards/keaboard/keymaps/keawade/keymap.c deleted file mode 100644 index 940967191d2f..000000000000 --- a/keyboards/keaboard/keymaps/keawade/keymap.c +++ /dev/null @@ -1,65 +0,0 @@ -/* -Copyright 2020 Keith Wade - -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 . -*/ - -#include QMK_KEYBOARD_H - -#define _QWERTY 0 -#define _LOWER 1 -#define _RAISE 2 - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [_QWERTY] = LAYOUT( - //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F2, KC_F12, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT - //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' - ), - - [_RAISE] = LAYOUT( - //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_TRNS, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY - //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' - ), - - [_LOWER] = LAYOUT( - //,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------. - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_DQUO, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_TRNS, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, - //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END - //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' - ) - -}; diff --git a/keyboards/keaboard/rev1/config.h b/keyboards/keaboard/rev1/config.h index 7a9cb2935bd7..7a17a4fe6e41 100644 --- a/keyboards/keaboard/rev1/config.h +++ b/keyboards/keaboard/rev1/config.h @@ -1,5 +1,5 @@ /* -Copyright 2020 Keith Wade +Copyright 2023 Keith Wade 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 @@ -17,36 +17,10 @@ along with this program. If not, see . #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0xFEED -#define PRODUCT_ID 0x9090 -#define DEVICE_VER 0x0001 -#define MANUFACTURER You -#define PRODUCT Keaboard Rev 1 -#define DESCRIPTION Split 40 percent ergonomic hotswap keyboard - /* key matrix size */ // Rows are doubled-up #define MATRIX_ROWS 8 #define MATRIX_COLS 7 -// wiring of each half -#define MATRIX_ROW_PINS { D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* 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 - /* serial.c configuration for split keyboard */ #define SOFT_SERIAL_PIN D0 diff --git a/keyboards/keaboard/rev1/rev1.c b/keyboards/keaboard/rev1/rev1.c index f6148ec7f104..1eebfc037b43 100644 --- a/keyboards/keaboard/rev1/rev1.c +++ b/keyboards/keaboard/rev1/rev1.c @@ -1,5 +1,5 @@ /* -Copyright 2020 Keith Wade +Copyright 2023 Keith Wade 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 diff --git a/keyboards/keaboard/rev1/rev1.h b/keyboards/keaboard/rev1/rev1.h index 3712e21e3392..488fd1cb7586 100644 --- a/keyboards/keaboard/rev1/rev1.h +++ b/keyboards/keaboard/rev1/rev1.h @@ -1,5 +1,5 @@ /* -Copyright 2020 Keith Wade +Copyright 2023 Keith Wade 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 From f50d9f123712760898ef0f0ef5dc523d0bfe3814 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sat, 11 Feb 2023 18:49:44 -0500 Subject: [PATCH 10/29] Update keaboard documentation --- keyboards/keaboard/keymaps/default/readme.md | 3 +++ keyboards/keaboard/readme.md | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 keyboards/keaboard/keymaps/default/readme.md diff --git a/keyboards/keaboard/keymaps/default/readme.md b/keyboards/keaboard/keymaps/default/readme.md new file mode 100644 index 000000000000..b8cdac180491 --- /dev/null +++ b/keyboards/keaboard/keymaps/default/readme.md @@ -0,0 +1,3 @@ +# Default keaboard Layout + +This is the default layout provided for the keaboard. diff --git a/keyboards/keaboard/readme.md b/keyboards/keaboard/readme.md index 0a981812c272..562822714a6f 100644 --- a/keyboards/keaboard/readme.md +++ b/keyboards/keaboard/readme.md @@ -2,14 +2,22 @@ ![keaboard](https://github.com/keawade/keaboard/blob/master/images/keaboard-rev1-pcb-render.png) -A split ergo 4x6 keyboard with 3 thumb keys designed by [Keith Wade](https://github.com/keawade). [More info on the GitHub Repo](https://github.com/keawade/keaboard). +A split columnular stagger 4x6 keyboard with 3 thumb keys designed by [Keith Wade](https://github.com/keawade). [More info on the GitHub Repo](https://github.com/keawade/keaboard). * Keyboard Maintainer: [Keith Wade](https://github.com/keawade) -* Hardware Supported: Elite-C, nice!nano +* Hardware Supported: Elite-C, nice!nano (via ZMK) * Hardware Availability: Open source. You can order your own from a PCB manufacturer. Make example for this keyboard (after setting up your build environment): make keaboard/rev1:default +Flashing example for this keyboard: + + make keaboard/rev1:default:flash + See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader by holding the reset button while powering on the keyboard. From 23b1fb282df5bf6e7d645e55f61a104685877efb Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sat, 11 Feb 2023 20:26:37 -0500 Subject: [PATCH 11/29] Update keaboard documentation --- keyboards/keaboard/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keaboard/readme.md b/keyboards/keaboard/readme.md index 562822714a6f..c88dc671f581 100644 --- a/keyboards/keaboard/readme.md +++ b/keyboards/keaboard/readme.md @@ -1,11 +1,11 @@ # keaboard -![keaboard](https://github.com/keawade/keaboard/blob/master/images/keaboard-rev1-pcb-render.png) +![keaboard](https://raw.githubusercontent.com/keawade/keaboard/master/images/keaboard-rev1-pcb-render.png) A split columnular stagger 4x6 keyboard with 3 thumb keys designed by [Keith Wade](https://github.com/keawade). [More info on the GitHub Repo](https://github.com/keawade/keaboard). * Keyboard Maintainer: [Keith Wade](https://github.com/keawade) -* Hardware Supported: Elite-C, nice!nano (via ZMK) +* Hardware Supported: Pro Micro and clones * Hardware Availability: Open source. You can order your own from a PCB manufacturer. Make example for this keyboard (after setting up your build environment): From 86460d90f1007d7d5f40186324ce8afd6c96aa8f Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sat, 11 Feb 2023 20:35:40 -0500 Subject: [PATCH 12/29] Clarify bootloader instructions --- keyboards/keaboard/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keaboard/readme.md b/keyboards/keaboard/readme.md index c88dc671f581..d797049f37b7 100644 --- a/keyboards/keaboard/readme.md +++ b/keyboards/keaboard/readme.md @@ -20,4 +20,4 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to ## Bootloader -Enter the bootloader by holding the reset button while powering on the keyboard. +Enter the bootloader by holding tapping reset button on the top edge of the board. \ No newline at end of file From ba65892da4634bf9dda964528c687b5eb8a0e100 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sat, 11 Feb 2023 20:56:57 -0500 Subject: [PATCH 13/29] Move more config options to info.json --- keyboards/keaboard/info.json | 19 ++++++++++++++++++ keyboards/keaboard/keymaps/default/config.h | 7 ------- keyboards/keaboard/rev1/config.h | 3 --- keyboards/keaboard/rules.mk | 22 +++------------------ 4 files changed, 22 insertions(+), 29 deletions(-) diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index 77f5da6f8eac..8dccf1993197 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -1,18 +1,37 @@ { + "$schema": "https://raw.githubusercontent.com/qmk/qmk_firmware/master/data/schemas/keyboard.jsonschema", "keyboard_name": "keaboard", "manufacturer": "You", "url": "https://github.com/keawade/keaboard", "maintainer": "keawade", + "usb": { "vid": "0xFEED", "pid": "0x9090", "device_version": "1.0.0" }, + "diode_direction": "COL2ROW", "matrix_pins": { "rows": ["D7", "E6", "B4", "B5"], "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] }, + "bootloader": "caterina", + "processor": "atmega32u4", + + "split": { + "enabled": true, + "soft_serial_pin": "D0", + "main": "left", + "transport": { + "protocol": "serial" + } + }, + "mouse_key": { + "enabled": true + }, + + "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keaboard/keymaps/default/config.h b/keyboards/keaboard/keymaps/default/config.h index cd388d85f321..084e3d602cac 100644 --- a/keyboards/keaboard/keymaps/default/config.h +++ b/keyboards/keaboard/keymaps/default/config.h @@ -16,10 +16,3 @@ along with this program. If not, see . */ #pragma once - -/* Use I2C or Serial, not both */ -#define USE_SERIAL - -/* Select hand configuration */ -#define MASTER_LEFT -// #define MASTER_RIGHT diff --git a/keyboards/keaboard/rev1/config.h b/keyboards/keaboard/rev1/config.h index 7a17a4fe6e41..4e01362a4f5a 100644 --- a/keyboards/keaboard/rev1/config.h +++ b/keyboards/keaboard/rev1/config.h @@ -21,6 +21,3 @@ along with this program. If not, see . // Rows are doubled-up #define MATRIX_ROWS 8 #define MATRIX_COLS 7 - -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D0 diff --git a/keyboards/keaboard/rules.mk b/keyboards/keaboard/rules.mk index 47933dda88d2..13e91492065f 100644 --- a/keyboards/keaboard/rules.mk +++ b/keyboards/keaboard/rules.mk @@ -1,35 +1,19 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = caterina - # Build Options # change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = no # Unicode +UNICODE_ENABLE = yes # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -SPLIT_KEYBOARD = yes - DEFAULT_FOLDER = keaboard/rev1 From 1261bed66d9200f55f1534497b8a4aaf67ea6242 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sat, 11 Feb 2023 21:07:30 -0500 Subject: [PATCH 14/29] Remove schema ref --- keyboards/keaboard/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index 8dccf1993197..066c48e670c3 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -1,5 +1,4 @@ { - "$schema": "https://raw.githubusercontent.com/qmk/qmk_firmware/master/data/schemas/keyboard.jsonschema", "keyboard_name": "keaboard", "manufacturer": "You", "url": "https://github.com/keawade/keaboard", From 3a74573098c1621aea272ab0dc8ded1fa130a763 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sat, 11 Feb 2023 21:38:51 -0500 Subject: [PATCH 15/29] Apply requested changes --- keyboards/keaboard/config.h | 20 -------------------- keyboards/keaboard/info.json | 11 +++-------- keyboards/keaboard/keymaps/default/config.h | 18 ------------------ keyboards/keaboard/keymaps/default/keymap.c | 8 +++++--- keyboards/keaboard/keymaps/default/readme.md | 3 --- keyboards/keaboard/readme.md | 2 -- keyboards/keaboard/rev1/config.h | 5 ----- keyboards/keaboard/rev1/rev1.h | 7 ------- keyboards/keaboard/rev1/rules.mk | 1 + 9 files changed, 9 insertions(+), 66 deletions(-) delete mode 100644 keyboards/keaboard/config.h delete mode 100644 keyboards/keaboard/keymaps/default/config.h delete mode 100644 keyboards/keaboard/keymaps/default/readme.md diff --git a/keyboards/keaboard/config.h b/keyboards/keaboard/config.h deleted file mode 100644 index c5b07b973a40..000000000000 --- a/keyboards/keaboard/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2023 Keith Wade - -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 . -*/ - -#pragma once - -#include "config_common.h" diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index 066c48e670c3..af68928ee68f 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -20,17 +20,12 @@ "split": { "enabled": true, - "soft_serial_pin": "D0", - "main": "left", - "transport": { - "protocol": "serial" - } + "soft_serial_pin": "D0" }, - "mouse_key": { - "enabled": true + "features": { + "mousekey": true }, - "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/keaboard/keymaps/default/config.h b/keyboards/keaboard/keymaps/default/config.h deleted file mode 100644 index 084e3d602cac..000000000000 --- a/keyboards/keaboard/keymaps/default/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2023 Keith Wade - -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 . -*/ - -#pragma once diff --git a/keyboards/keaboard/keymaps/default/keymap.c b/keyboards/keaboard/keymaps/default/keymap.c index 62b4876a24a2..54dbd86009c3 100644 --- a/keyboards/keaboard/keymaps/default/keymap.c +++ b/keyboards/keaboard/keymaps/default/keymap.c @@ -17,9 +17,11 @@ along with this program. If not, see . #include QMK_KEYBOARD_H -#define _QWERTY 0 -#define _LOWER 1 -#define _RAISE 2 +enum layers { + _QWERTY, + _LOWER, + _RAISE +}; #define LOWER MO(_LOWER) #define RAISE MO(_RAISE) diff --git a/keyboards/keaboard/keymaps/default/readme.md b/keyboards/keaboard/keymaps/default/readme.md deleted file mode 100644 index b8cdac180491..000000000000 --- a/keyboards/keaboard/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default keaboard Layout - -This is the default layout provided for the keaboard. diff --git a/keyboards/keaboard/readme.md b/keyboards/keaboard/readme.md index d797049f37b7..71473211eda0 100644 --- a/keyboards/keaboard/readme.md +++ b/keyboards/keaboard/readme.md @@ -1,7 +1,5 @@ # keaboard -![keaboard](https://raw.githubusercontent.com/keawade/keaboard/master/images/keaboard-rev1-pcb-render.png) - A split columnular stagger 4x6 keyboard with 3 thumb keys designed by [Keith Wade](https://github.com/keawade). [More info on the GitHub Repo](https://github.com/keawade/keaboard). * Keyboard Maintainer: [Keith Wade](https://github.com/keawade) diff --git a/keyboards/keaboard/rev1/config.h b/keyboards/keaboard/rev1/config.h index 4e01362a4f5a..084e3d602cac 100644 --- a/keyboards/keaboard/rev1/config.h +++ b/keyboards/keaboard/rev1/config.h @@ -16,8 +16,3 @@ along with this program. If not, see . */ #pragma once - -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 8 -#define MATRIX_COLS 7 diff --git a/keyboards/keaboard/rev1/rev1.h b/keyboards/keaboard/rev1/rev1.h index 488fd1cb7586..3d064de427ac 100644 --- a/keyboards/keaboard/rev1/rev1.h +++ b/keyboards/keaboard/rev1/rev1.h @@ -15,11 +15,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#ifndef REV1_H -#define REV1_H - -#include "keaboard.h" - #include "quantum.h" #define LAYOUT( \ @@ -38,5 +33,3 @@ along with this program. If not, see . { R03, R07, R11, R15, R19, R23, R24 }, \ { R04, R08, R12, R16, R20, KC_NO, R25 } \ } - -#endif diff --git a/keyboards/keaboard/rev1/rules.mk b/keyboards/keaboard/rev1/rules.mk index e69de29bb2d1..6e7633bfe015 100644 --- a/keyboards/keaboard/rev1/rules.mk +++ b/keyboards/keaboard/rev1/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From a9610534ca0d35b7c19f15554a9621c0a17ca6c6 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sat, 11 Feb 2023 21:56:51 -0500 Subject: [PATCH 16/29] Move more config options to info.json features --- keyboards/keaboard/info.json | 5 ++++- keyboards/keaboard/rules.mk | 3 --- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index af68928ee68f..3f660ecf8a2f 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -23,7 +23,10 @@ "soft_serial_pin": "D0" }, "features": { - "mousekey": true + "extrakey": true, + "mousekey": true, + "unicode": true, + "command": true }, "layouts": { diff --git a/keyboards/keaboard/rules.mk b/keyboards/keaboard/rules.mk index 13e91492065f..4f245488394b 100644 --- a/keyboards/keaboard/rules.mk +++ b/keyboards/keaboard/rules.mk @@ -3,14 +3,11 @@ # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality MIDI_ENABLE = no # MIDI controls AUDIO_ENABLE = no # Audio output on port C6 -UNICODE_ENABLE = yes # Unicode BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE From d9271655e195accb7dc1623046bd073b952ff0fd Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sat, 11 Feb 2023 22:00:42 -0500 Subject: [PATCH 17/29] Drop unneeded build options. Co-authored-by: Ryan --- keyboards/keaboard/rules.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/keyboards/keaboard/rules.mk b/keyboards/keaboard/rules.mk index 4f245488394b..9205366d1a0c 100644 --- a/keyboards/keaboard/rules.mk +++ b/keyboards/keaboard/rules.mk @@ -1,16 +1,2 @@ -# Build Options -# change to "no" to disable the options, or define them in the Makefile in -# the appropriate keymap folder that will get included automatically -# -BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration -CONSOLE_ENABLE = no # Console for debug -NKRO_ENABLE = no # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -MIDI_ENABLE = no # MIDI controls -AUDIO_ENABLE = no # Audio output on port C6 -BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID -RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend DEFAULT_FOLDER = keaboard/rev1 From 2256563c9ee20bf9fe01624448dd1a9c3c7df42e Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sun, 12 Feb 2023 15:24:18 -0500 Subject: [PATCH 18/29] Remove base rule.mk with default folder and instead require direct targeting of rev1 --- keyboards/keaboard/rules.mk | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 keyboards/keaboard/rules.mk diff --git a/keyboards/keaboard/rules.mk b/keyboards/keaboard/rules.mk deleted file mode 100644 index 9205366d1a0c..000000000000 --- a/keyboards/keaboard/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ - -DEFAULT_FOLDER = keaboard/rev1 From 7cbad03e09c6fb7945f6109e50644c579ab6094e Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sun, 12 Feb 2023 20:07:53 -0500 Subject: [PATCH 19/29] Convert to info.json layout matrix definition --- keyboards/keaboard/info.json | 105 +++++++++++++++++---------------- keyboards/keaboard/keaboard.c | 18 ------ keyboards/keaboard/keaboard.h | 22 ------- keyboards/keaboard/rev1/rev1.c | 18 ------ keyboards/keaboard/rev1/rev1.h | 35 ----------- 5 files changed, 53 insertions(+), 145 deletions(-) delete mode 100644 keyboards/keaboard/keaboard.c delete mode 100644 keyboards/keaboard/keaboard.h delete mode 100644 keyboards/keaboard/rev1/rev1.c delete mode 100644 keyboards/keaboard/rev1/rev1.h diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index 3f660ecf8a2f..2cc4cdc099ce 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -9,7 +9,7 @@ "pid": "0x9090", "device_version": "1.0.0" }, - + "diode_direction": "COL2ROW", "matrix_pins": { "rows": ["D7", "E6", "B4", "B5"], @@ -17,7 +17,7 @@ }, "bootloader": "caterina", "processor": "atmega32u4", - + "split": { "enabled": true, "soft_serial_pin": "D0" @@ -32,56 +32,57 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "L01", "x": 0, "y": 0.375 }, - { "label": "L05", "x": 1, "y": 0.25 }, - { "label": "L09", "x": 2, "y": 0.125 }, - { "label": "L13", "x": 3, "y": 0 }, - { "label": "L17", "x": 4, "y": 0.125 }, - { "label": "L21", "x": 5, "y": 0.25 }, - { "label": "R21", "x": 10, "y": 0.25 }, - { "label": "R17", "x": 11, "y": 0.125 }, - { "label": "R13", "x": 12, "y": 0 }, - { "label": "R09", "x": 13, "y": 0.125 }, - { "label": "R05", "x": 14, "y": 0.25 }, - { "label": "R01", "x": 15, "y": 0.375 }, - { "label": "L02", "x": 0, "y": 1.375 }, - { "label": "L06", "x": 1, "y": 1.25 }, - { "label": "L10", "x": 2, "y": 1.125 }, - { "label": "L14", "x": 3, "y": 1 }, - { "label": "L18", "x": 4, "y": 1.125 }, - { "label": "L22", "x": 5, "y": 1.25 }, - { "label": "R22", "x": 10, "y": 1.25 }, - { "label": "R18", "x": 11, "y": 1.125 }, - { "label": "R14", "x": 12, "y": 1 }, - { "label": "R10", "x": 13, "y": 1.125 }, - { "label": "R06", "x": 14, "y": 1.25 }, - { "label": "R02", "x": 15, "y": 1.375 }, - { "label": "L03", "x": 0, "y": 2.375 }, - { "label": "L07", "x": 1, "y": 2.25 }, - { "label": "L11", "x": 2, "y": 2.125 }, - { "label": "L15", "x": 3, "y": 2 }, - { "label": "L19", "x": 4, "y": 2.125 }, - { "label": "L23", "x": 5, "y": 2.25 }, - { "label": "L24", "x": 6.5, "y": 3 }, - { "label": "R24", "x": 8.5, "y": 3 }, - { "label": "R23", "x": 10, "y": 2.25 }, - { "label": "R19", "x": 11, "y": 2.125 }, - { "label": "R15", "x": 12, "y": 2 }, - { "label": "R11", "x": 13, "y": 2.125 }, - { "label": "R07", "x": 14, "y": 2.25 }, - { "label": "R03", "x": 15, "y": 2.375 }, - { "label": "L04", "x": 0, "y": 3.375 }, - { "label": "L08", "x": 1, "y": 3.25 }, - { "label": "L12", "x": 2, "y": 3.125 }, - { "label": "L16", "x": 3, "y": 3 }, - { "label": "L20", "x": 5.5, "y": 4 }, - { "label": "L25", "x": 6.5, "y": 4 }, - { "label": "R25", "x": 8.5, "y": 4 }, - { "label": "R20", "x": 9.5, "y": 4 }, - { "label": "R16", "x": 12, "y": 3 }, - { "label": "R12", "x": 13, "y": 3.125 }, - { "label": "R08", "x": 14, "y": 3.25 }, - { "label": "R04", "x": 15, "y": 3.375 } + { "label": "L01", "matrix": [0, 0], "x": 0, "y": 0.375 }, + { "label": "L02", "matrix": [1, 0], "x": 0, "y": 1.375 }, + { "label": "L03", "matrix": [2, 0], "x": 0, "y": 2.375 }, + { "label": "L04", "matrix": [3, 0], "x": 0, "y": 3.375 }, + { "label": "L05", "matrix": [0, 1], "x": 1, "y": 0.25 }, + { "label": "L06", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "L07", "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "label": "L08", "matrix": [3, 1], "x": 1, "y": 3.25 }, + { "label": "L09", "matrix": [0, 2], "x": 2, "y": 0.125 }, + { "label": "L10", "matrix": [1, 2], "x": 2, "y": 1.125 }, + { "label": "L11", "matrix": [2, 2], "x": 2, "y": 2.125 }, + { "label": "L12", "matrix": [3, 2], "x": 2, "y": 3.125 }, + { "label": "L13", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "L14", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "L15", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "L16", "matrix": [3, 3], "x": 3, "y": 3 }, + { "label": "L17", "matrix": [0, 4], "x": 4, "y": 0.125 }, + { "label": "L18", "matrix": [1, 4], "x": 4, "y": 1.125 }, + { "label": "L19", "matrix": [2, 4], "x": 4, "y": 2.125 }, + { "label": "L20", "matrix": [3, 4], "x": 5.5, "y": 4 }, + { "label": "L21", "matrix": [0, 5], "x": 5, "y": 0.25 }, + { "label": "L22", "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "label": "L23", "matrix": [2, 5], "x": 5, "y": 2.25 }, + { "label": "L24", "matrix": [2, 6], "x": 6.5, "y": 3 }, + { "label": "L25", "matrix": [3, 6], "x": 6.5, "y": 4 }, + + { "label": "R01", "matrix": [4, 0], "x": 15, "y": 0.375 }, + { "label": "R02", "matrix": [5, 0], "x": 15, "y": 1.375 }, + { "label": "R03", "matrix": [6, 0], "x": 15, "y": 2.375 }, + { "label": "R04", "matrix": [7, 0], "x": 15, "y": 3.375 }, + { "label": "R05", "matrix": [4, 1], "x": 14, "y": 0.25 }, + { "label": "R06", "matrix": [5, 1], "x": 14, "y": 1.25 }, + { "label": "R07", "matrix": [6, 1], "x": 14, "y": 2.25 }, + { "label": "R08", "matrix": [7, 1], "x": 14, "y": 3.25 }, + { "label": "R09", "matrix": [4, 2], "x": 13, "y": 0.125 }, + { "label": "R10", "matrix": [5, 2], "x": 13, "y": 1.125 }, + { "label": "R11", "matrix": [6, 2], "x": 13, "y": 2.125 }, + { "label": "R12", "matrix": [7, 2], "x": 13, "y": 3.125 }, + { "label": "R13", "matrix": [4, 3], "x": 12, "y": 0 }, + { "label": "R14", "matrix": [5, 3], "x": 12, "y": 1 }, + { "label": "R15", "matrix": [6, 3], "x": 12, "y": 2 }, + { "label": "R16", "matrix": [7, 3], "x": 12, "y": 3 }, + { "label": "R17", "matrix": [4, 4], "x": 11, "y": 0.125 }, + { "label": "R18", "matrix": [5, 4], "x": 11, "y": 1.125 }, + { "label": "R19", "matrix": [6, 4], "x": 11, "y": 2.125 }, + { "label": "R20", "matrix": [7, 4], "x": 9.5, "y": 4 }, + { "label": "R21", "matrix": [4, 5], "x": 10, "y": 0.25 }, + { "label": "R22", "matrix": [5, 5], "x": 10, "y": 1.25 }, + { "label": "R23", "matrix": [6, 5], "x": 10, "y": 2.25 }, + { "label": "R24", "matrix": [6, 6], "x": 8.5, "y": 3 }, + { "label": "R25", "matrix": [7, 6], "x": 8.5, "y": 4 } ] } } diff --git a/keyboards/keaboard/keaboard.c b/keyboards/keaboard/keaboard.c deleted file mode 100644 index 6a1e55989ffb..000000000000 --- a/keyboards/keaboard/keaboard.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2023 Keith Wade - -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 . -*/ - -#include "keaboard.h" diff --git a/keyboards/keaboard/keaboard.h b/keyboards/keaboard/keaboard.h deleted file mode 100644 index ca07d89755fb..000000000000 --- a/keyboards/keaboard/keaboard.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2023 Keith Wade - -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 . -*/ - -#pragma once - -#ifdef KEYBOARD_keaboard_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/keaboard/rev1/rev1.c b/keyboards/keaboard/rev1/rev1.c deleted file mode 100644 index 1eebfc037b43..000000000000 --- a/keyboards/keaboard/rev1/rev1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2023 Keith Wade - -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 . -*/ - -#include "rev1.h" diff --git a/keyboards/keaboard/rev1/rev1.h b/keyboards/keaboard/rev1/rev1.h deleted file mode 100644 index 3d064de427ac..000000000000 --- a/keyboards/keaboard/rev1/rev1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2023 Keith Wade - -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 . -*/ - -#include "quantum.h" - -#define LAYOUT( \ - L01, L05, L09, L13, L17, L21, R21, R17, R13, R09, R05, R01, \ - L02, L06, L10, L14, L18, L22, R22, R18, R14, R10, R06, R02, \ - L03, L07, L11, L15, L19, L23, L24, R24, R23, R19, R15, R11, R07, R03, \ - L04, L08, L12, L16, L20, L25, R25, R20, R16, R12, R08, R04 \ - ) \ - { \ - { L01, L05, L09, L13, L17, L21, KC_NO }, \ - { L02, L06, L10, L14, L18, L22, KC_NO }, \ - { L03, L07, L11, L15, L19, L23, L24 }, \ - { L04, L08, L12, L16, L20, KC_NO, L25 }, \ - { R01, R05, R09, R13, R17, R21, KC_NO }, \ - { R02, R06, R10, R14, R18, R22, KC_NO }, \ - { R03, R07, R11, R15, R19, R23, R24 }, \ - { R04, R08, R12, R16, R20, KC_NO, R25 } \ - } From f90fa619cb4eac4b08a06a2ef67de20f82a4c855 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sun, 12 Feb 2023 22:57:50 -0500 Subject: [PATCH 20/29] Work in progress Top left row is mapped. Nothing else works as expected and I don't know why. --- keyboards/keaboard/info.json | 92 ++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index 2cc4cdc099ce..42e0b7d26f4f 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -33,55 +33,55 @@ "LAYOUT": { "layout": [ { "label": "L01", "matrix": [0, 0], "x": 0, "y": 0.375 }, - { "label": "L02", "matrix": [1, 0], "x": 0, "y": 1.375 }, - { "label": "L03", "matrix": [2, 0], "x": 0, "y": 2.375 }, - { "label": "L04", "matrix": [3, 0], "x": 0, "y": 3.375 }, - { "label": "L05", "matrix": [0, 1], "x": 1, "y": 0.25 }, - { "label": "L06", "matrix": [1, 1], "x": 1, "y": 1.25 }, - { "label": "L07", "matrix": [2, 1], "x": 1, "y": 2.25 }, - { "label": "L08", "matrix": [3, 1], "x": 1, "y": 3.25 }, - { "label": "L09", "matrix": [0, 2], "x": 2, "y": 0.125 }, - { "label": "L10", "matrix": [1, 2], "x": 2, "y": 1.125 }, - { "label": "L11", "matrix": [2, 2], "x": 2, "y": 2.125 }, - { "label": "L12", "matrix": [3, 2], "x": 2, "y": 3.125 }, - { "label": "L13", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "L14", "matrix": [1, 3], "x": 3, "y": 1 }, - { "label": "L15", "matrix": [2, 3], "x": 3, "y": 2 }, - { "label": "L16", "matrix": [3, 3], "x": 3, "y": 3 }, - { "label": "L17", "matrix": [0, 4], "x": 4, "y": 0.125 }, - { "label": "L18", "matrix": [1, 4], "x": 4, "y": 1.125 }, - { "label": "L19", "matrix": [2, 4], "x": 4, "y": 2.125 }, - { "label": "L20", "matrix": [3, 4], "x": 5.5, "y": 4 }, - { "label": "L21", "matrix": [0, 5], "x": 5, "y": 0.25 }, - { "label": "L22", "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "label": "L23", "matrix": [2, 5], "x": 5, "y": 2.25 }, - { "label": "L24", "matrix": [2, 6], "x": 6.5, "y": 3 }, + { "label": "L02", "matrix": [0, 1], "x": 0, "y": 1.375 }, + { "label": "L03", "matrix": [0, 2], "x": 0, "y": 2.375 }, + { "label": "L04", "matrix": [0, 3], "x": 0, "y": 3.375 }, + { "label": "L05", "matrix": [0, 4], "x": 1, "y": 0.25 }, + { "label": "L06", "matrix": [0, 5], "x": 1, "y": 1.25 }, + { "label": "L07", "matrix": [1, 0], "x": 1, "y": 2.25 }, + { "label": "L08", "matrix": [1, 1], "x": 1, "y": 3.25 }, + { "label": "L09", "matrix": [1, 2], "x": 2, "y": 0.125 }, + { "label": "L10", "matrix": [1, 3], "x": 2, "y": 1.125 }, + { "label": "L11", "matrix": [1, 4], "x": 2, "y": 2.125 }, + { "label": "L12", "matrix": [1, 5], "x": 2, "y": 3.125 }, + { "label": "L13", "matrix": [2, 0], "x": 3, "y": 0 }, + { "label": "L14", "matrix": [2, 1], "x": 3, "y": 1 }, + { "label": "L15", "matrix": [2, 2], "x": 3, "y": 2 }, + { "label": "L16", "matrix": [2, 3], "x": 3, "y": 3 }, + { "label": "L17", "matrix": [2, 4], "x": 4, "y": 0.125 }, + { "label": "L18", "matrix": [2, 5], "x": 4, "y": 1.125 }, + { "label": "L19", "matrix": [2, 6], "x": 4, "y": 2.125 }, + { "label": "L20", "matrix": [3, 0], "x": 5.5, "y": 4 }, + { "label": "L21", "matrix": [3, 1], "x": 5, "y": 0.25 }, + { "label": "L22", "matrix": [3, 2], "x": 5, "y": 1.25 }, + { "label": "L23", "matrix": [3, 3], "x": 5, "y": 2.25 }, + { "label": "L24", "matrix": [3, 4], "x": 6.5, "y": 3 }, { "label": "L25", "matrix": [3, 6], "x": 6.5, "y": 4 }, { "label": "R01", "matrix": [4, 0], "x": 15, "y": 0.375 }, - { "label": "R02", "matrix": [5, 0], "x": 15, "y": 1.375 }, - { "label": "R03", "matrix": [6, 0], "x": 15, "y": 2.375 }, - { "label": "R04", "matrix": [7, 0], "x": 15, "y": 3.375 }, - { "label": "R05", "matrix": [4, 1], "x": 14, "y": 0.25 }, - { "label": "R06", "matrix": [5, 1], "x": 14, "y": 1.25 }, - { "label": "R07", "matrix": [6, 1], "x": 14, "y": 2.25 }, - { "label": "R08", "matrix": [7, 1], "x": 14, "y": 3.25 }, - { "label": "R09", "matrix": [4, 2], "x": 13, "y": 0.125 }, - { "label": "R10", "matrix": [5, 2], "x": 13, "y": 1.125 }, - { "label": "R11", "matrix": [6, 2], "x": 13, "y": 2.125 }, - { "label": "R12", "matrix": [7, 2], "x": 13, "y": 3.125 }, - { "label": "R13", "matrix": [4, 3], "x": 12, "y": 0 }, - { "label": "R14", "matrix": [5, 3], "x": 12, "y": 1 }, - { "label": "R15", "matrix": [6, 3], "x": 12, "y": 2 }, - { "label": "R16", "matrix": [7, 3], "x": 12, "y": 3 }, - { "label": "R17", "matrix": [4, 4], "x": 11, "y": 0.125 }, - { "label": "R18", "matrix": [5, 4], "x": 11, "y": 1.125 }, - { "label": "R19", "matrix": [6, 4], "x": 11, "y": 2.125 }, - { "label": "R20", "matrix": [7, 4], "x": 9.5, "y": 4 }, - { "label": "R21", "matrix": [4, 5], "x": 10, "y": 0.25 }, - { "label": "R22", "matrix": [5, 5], "x": 10, "y": 1.25 }, - { "label": "R23", "matrix": [6, 5], "x": 10, "y": 2.25 }, - { "label": "R24", "matrix": [6, 6], "x": 8.5, "y": 3 }, + { "label": "R02", "matrix": [4, 1], "x": 15, "y": 1.375 }, + { "label": "R03", "matrix": [4, 2], "x": 15, "y": 2.375 }, + { "label": "R04", "matrix": [4, 3], "x": 15, "y": 3.375 }, + { "label": "R05", "matrix": [4, 4], "x": 14, "y": 0.25 }, + { "label": "R06", "matrix": [4, 5], "x": 14, "y": 1.25 }, + { "label": "R07", "matrix": [5, 0], "x": 14, "y": 2.25 }, + { "label": "R08", "matrix": [5, 1], "x": 14, "y": 3.25 }, + { "label": "R09", "matrix": [5, 2], "x": 13, "y": 0.125 }, + { "label": "R10", "matrix": [5, 3], "x": 13, "y": 1.125 }, + { "label": "R11", "matrix": [5, 4], "x": 13, "y": 2.125 }, + { "label": "R12", "matrix": [5, 5], "x": 13, "y": 3.125 }, + { "label": "R13", "matrix": [6, 0], "x": 12, "y": 0 }, + { "label": "R14", "matrix": [6, 1], "x": 12, "y": 1 }, + { "label": "R15", "matrix": [6, 2], "x": 12, "y": 2 }, + { "label": "R16", "matrix": [6, 3], "x": 12, "y": 3 }, + { "label": "R17", "matrix": [6, 4], "x": 11, "y": 0.125 }, + { "label": "R18", "matrix": [6, 5], "x": 11, "y": 1.125 }, + { "label": "R19", "matrix": [6, 6], "x": 11, "y": 2.125 }, + { "label": "R20", "matrix": [7, 0], "x": 9.5, "y": 4 }, + { "label": "R21", "matrix": [7, 1], "x": 10, "y": 0.25 }, + { "label": "R22", "matrix": [7, 2], "x": 10, "y": 1.25 }, + { "label": "R23", "matrix": [7, 3], "x": 10, "y": 2.25 }, + { "label": "R24", "matrix": [7, 4], "x": 8.5, "y": 3 }, { "label": "R25", "matrix": [7, 6], "x": 8.5, "y": 4 } ] } From 161ab0cda45e568a7c80487fb593df9c5897c594 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sun, 12 Feb 2023 23:42:10 -0500 Subject: [PATCH 21/29] Working data-driven matrix :crossed_fingers: --- keyboards/keaboard/info.json | 95 ++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index 42e0b7d26f4f..cda2204624c4 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -33,56 +33,55 @@ "LAYOUT": { "layout": [ { "label": "L01", "matrix": [0, 0], "x": 0, "y": 0.375 }, - { "label": "L02", "matrix": [0, 1], "x": 0, "y": 1.375 }, - { "label": "L03", "matrix": [0, 2], "x": 0, "y": 2.375 }, - { "label": "L04", "matrix": [0, 3], "x": 0, "y": 3.375 }, - { "label": "L05", "matrix": [0, 4], "x": 1, "y": 0.25 }, - { "label": "L06", "matrix": [0, 5], "x": 1, "y": 1.25 }, - { "label": "L07", "matrix": [1, 0], "x": 1, "y": 2.25 }, - { "label": "L08", "matrix": [1, 1], "x": 1, "y": 3.25 }, - { "label": "L09", "matrix": [1, 2], "x": 2, "y": 0.125 }, - { "label": "L10", "matrix": [1, 3], "x": 2, "y": 1.125 }, - { "label": "L11", "matrix": [1, 4], "x": 2, "y": 2.125 }, - { "label": "L12", "matrix": [1, 5], "x": 2, "y": 3.125 }, - { "label": "L13", "matrix": [2, 0], "x": 3, "y": 0 }, - { "label": "L14", "matrix": [2, 1], "x": 3, "y": 1 }, - { "label": "L15", "matrix": [2, 2], "x": 3, "y": 2 }, - { "label": "L16", "matrix": [2, 3], "x": 3, "y": 3 }, - { "label": "L17", "matrix": [2, 4], "x": 4, "y": 0.125 }, - { "label": "L18", "matrix": [2, 5], "x": 4, "y": 1.125 }, - { "label": "L19", "matrix": [2, 6], "x": 4, "y": 2.125 }, - { "label": "L20", "matrix": [3, 0], "x": 5.5, "y": 4 }, - { "label": "L21", "matrix": [3, 1], "x": 5, "y": 0.25 }, - { "label": "L22", "matrix": [3, 2], "x": 5, "y": 1.25 }, - { "label": "L23", "matrix": [3, 3], "x": 5, "y": 2.25 }, - { "label": "L24", "matrix": [3, 4], "x": 6.5, "y": 3 }, - { "label": "L25", "matrix": [3, 6], "x": 6.5, "y": 4 }, - - { "label": "R01", "matrix": [4, 0], "x": 15, "y": 0.375 }, - { "label": "R02", "matrix": [4, 1], "x": 15, "y": 1.375 }, - { "label": "R03", "matrix": [4, 2], "x": 15, "y": 2.375 }, - { "label": "R04", "matrix": [4, 3], "x": 15, "y": 3.375 }, + { "label": "L05", "matrix": [0, 1], "x": 1, "y": 0.25 }, + { "label": "L09", "matrix": [0, 2], "x": 2, "y": 0.125 }, + { "label": "L13", "matrix": [0, 3], "x": 3, "y": 0 }, + { "label": "L17", "matrix": [0, 4], "x": 4, "y": 0.125 }, + { "label": "L21", "matrix": [0, 5], "x": 5, "y": 0.25 }, + { "label": "R01", "matrix": [4, 5], "x": 15, "y": 0.375 }, { "label": "R05", "matrix": [4, 4], "x": 14, "y": 0.25 }, - { "label": "R06", "matrix": [4, 5], "x": 14, "y": 1.25 }, - { "label": "R07", "matrix": [5, 0], "x": 14, "y": 2.25 }, - { "label": "R08", "matrix": [5, 1], "x": 14, "y": 3.25 }, - { "label": "R09", "matrix": [5, 2], "x": 13, "y": 0.125 }, + { "label": "R09", "matrix": [4, 3], "x": 13, "y": 0.125 }, + { "label": "R13", "matrix": [4, 2], "x": 12, "y": 0 }, + { "label": "R17", "matrix": [4, 1], "x": 11, "y": 0.125 }, + { "label": "R21", "matrix": [4, 0], "x": 10, "y": 0.25 }, + { "label": "L02", "matrix": [1, 0], "x": 0, "y": 1.375 }, + { "label": "L06", "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "label": "L10", "matrix": [1, 2], "x": 2, "y": 1.125 }, + { "label": "L14", "matrix": [1, 3], "x": 3, "y": 1 }, + { "label": "L18", "matrix": [1, 4], "x": 4, "y": 1.125 }, + { "label": "L22", "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "label": "R02", "matrix": [5, 5], "x": 15, "y": 1.375 }, + { "label": "R06", "matrix": [5, 4], "x": 14, "y": 1.25 }, { "label": "R10", "matrix": [5, 3], "x": 13, "y": 1.125 }, - { "label": "R11", "matrix": [5, 4], "x": 13, "y": 2.125 }, - { "label": "R12", "matrix": [5, 5], "x": 13, "y": 3.125 }, - { "label": "R13", "matrix": [6, 0], "x": 12, "y": 0 }, - { "label": "R14", "matrix": [6, 1], "x": 12, "y": 1 }, - { "label": "R15", "matrix": [6, 2], "x": 12, "y": 2 }, - { "label": "R16", "matrix": [6, 3], "x": 12, "y": 3 }, - { "label": "R17", "matrix": [6, 4], "x": 11, "y": 0.125 }, - { "label": "R18", "matrix": [6, 5], "x": 11, "y": 1.125 }, - { "label": "R19", "matrix": [6, 6], "x": 11, "y": 2.125 }, - { "label": "R20", "matrix": [7, 0], "x": 9.5, "y": 4 }, - { "label": "R21", "matrix": [7, 1], "x": 10, "y": 0.25 }, - { "label": "R22", "matrix": [7, 2], "x": 10, "y": 1.25 }, - { "label": "R23", "matrix": [7, 3], "x": 10, "y": 2.25 }, - { "label": "R24", "matrix": [7, 4], "x": 8.5, "y": 3 }, - { "label": "R25", "matrix": [7, 6], "x": 8.5, "y": 4 } + { "label": "R14", "matrix": [5, 2], "x": 12, "y": 1 }, + { "label": "R18", "matrix": [5, 1], "x": 11, "y": 1.125 }, + { "label": "R22", "matrix": [5, 0], "x": 10, "y": 1.25 }, + { "label": "L03", "matrix": [2, 0], "x": 0, "y": 2.375 }, + { "label": "L07", "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "label": "L11", "matrix": [2, 2], "x": 2, "y": 2.125 }, + { "label": "L15", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "L19", "matrix": [2, 4], "x": 4, "y": 2.125 }, + { "label": "L23", "matrix": [2, 5], "x": 5, "y": 2.25 }, + { "label": "L24", "matrix": [2, 6], "x": 6.5, "y": 3 }, + { "label": "R03", "matrix": [6, 6], "x": 15, "y": 2.375 }, + { "label": "R07", "matrix": [6, 5], "x": 14, "y": 2.25 }, + { "label": "R11", "matrix": [6, 4], "x": 13, "y": 2.125 }, + { "label": "R15", "matrix": [6, 3], "x": 12, "y": 2 }, + { "label": "R19", "matrix": [6, 2], "x": 11, "y": 2.125 }, + { "label": "R23", "matrix": [6, 1], "x": 10, "y": 2.25 }, + { "label": "R24", "matrix": [6, 0], "x": 8.5, "y": 3 }, + { "label": "L04", "matrix": [3, 0], "x": 0, "y": 3.375 }, + { "label": "L08", "matrix": [3, 1], "x": 1, "y": 3.25 }, + { "label": "L12", "matrix": [3, 2], "x": 2, "y": 3.125 }, + { "label": "L16", "matrix": [3, 3], "x": 3, "y": 3 }, + { "label": "L20", "matrix": [3, 4], "x": 5.5, "y": 4 }, + { "label": "L25", "matrix": [3, 6], "x": 6.5, "y": 4 }, + { "label": "R04", "matrix": [7, 6], "x": 15, "y": 3.375 }, + { "label": "R08", "matrix": [7, 4], "x": 14, "y": 3.25 }, + { "label": "R12", "matrix": [7, 3], "x": 13, "y": 3.125 }, + { "label": "R16", "matrix": [7, 2], "x": 12, "y": 3 }, + { "label": "R20", "matrix": [7, 1], "x": 9.5, "y": 4 }, + { "label": "R25", "matrix": [7, 0], "x": 8.5, "y": 4 } ] } } From 33465f9d34294e1f5be79b723c7fcc4f1c324038 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Sun, 12 Feb 2023 23:47:07 -0500 Subject: [PATCH 22/29] Remove config.h Now that I'm done testing locally, the local builds breaking from this removal is fine --- keyboards/keaboard/rev1/config.h | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 keyboards/keaboard/rev1/config.h diff --git a/keyboards/keaboard/rev1/config.h b/keyboards/keaboard/rev1/config.h deleted file mode 100644 index 084e3d602cac..000000000000 --- a/keyboards/keaboard/rev1/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2023 Keith Wade - -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 . -*/ - -#pragma once From 7270ddc212ffcc5ee63e98542923cd63999fe82b Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Mon, 13 Feb 2023 09:46:15 -0500 Subject: [PATCH 23/29] Fix layout key order for configurator --- keyboards/keaboard/info.json | 48 ++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index cda2204624c4..4c40df55ed6d 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -38,24 +38,24 @@ { "label": "L13", "matrix": [0, 3], "x": 3, "y": 0 }, { "label": "L17", "matrix": [0, 4], "x": 4, "y": 0.125 }, { "label": "L21", "matrix": [0, 5], "x": 5, "y": 0.25 }, - { "label": "R01", "matrix": [4, 5], "x": 15, "y": 0.375 }, - { "label": "R05", "matrix": [4, 4], "x": 14, "y": 0.25 }, - { "label": "R09", "matrix": [4, 3], "x": 13, "y": 0.125 }, - { "label": "R13", "matrix": [4, 2], "x": 12, "y": 0 }, - { "label": "R17", "matrix": [4, 1], "x": 11, "y": 0.125 }, - { "label": "R21", "matrix": [4, 0], "x": 10, "y": 0.25 }, + { "label": "R21", "matrix": [4, 5], "x": 10, "y": 0.25 }, + { "label": "R17", "matrix": [4, 4], "x": 11, "y": 0.125 }, + { "label": "R13", "matrix": [4, 3], "x": 12, "y": 0 }, + { "label": "R09", "matrix": [4, 2], "x": 13, "y": 0.125 }, + { "label": "R05", "matrix": [4, 1], "x": 14, "y": 0.25 }, + { "label": "R01", "matrix": [4, 0], "x": 15, "y": 0.375 }, { "label": "L02", "matrix": [1, 0], "x": 0, "y": 1.375 }, { "label": "L06", "matrix": [1, 1], "x": 1, "y": 1.25 }, { "label": "L10", "matrix": [1, 2], "x": 2, "y": 1.125 }, { "label": "L14", "matrix": [1, 3], "x": 3, "y": 1 }, { "label": "L18", "matrix": [1, 4], "x": 4, "y": 1.125 }, { "label": "L22", "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "label": "R02", "matrix": [5, 5], "x": 15, "y": 1.375 }, - { "label": "R06", "matrix": [5, 4], "x": 14, "y": 1.25 }, - { "label": "R10", "matrix": [5, 3], "x": 13, "y": 1.125 }, - { "label": "R14", "matrix": [5, 2], "x": 12, "y": 1 }, - { "label": "R18", "matrix": [5, 1], "x": 11, "y": 1.125 }, - { "label": "R22", "matrix": [5, 0], "x": 10, "y": 1.25 }, + { "label": "R22", "matrix": [5, 5], "x": 10, "y": 1.25 }, + { "label": "R18", "matrix": [5, 4], "x": 11, "y": 1.125 }, + { "label": "R14", "matrix": [5, 3], "x": 12, "y": 1 }, + { "label": "R10", "matrix": [5, 2], "x": 13, "y": 1.125 }, + { "label": "R06", "matrix": [5, 1], "x": 14, "y": 1.25 }, + { "label": "R02", "matrix": [5, 0], "x": 15, "y": 1.375 }, { "label": "L03", "matrix": [2, 0], "x": 0, "y": 2.375 }, { "label": "L07", "matrix": [2, 1], "x": 1, "y": 2.25 }, { "label": "L11", "matrix": [2, 2], "x": 2, "y": 2.125 }, @@ -63,25 +63,25 @@ { "label": "L19", "matrix": [2, 4], "x": 4, "y": 2.125 }, { "label": "L23", "matrix": [2, 5], "x": 5, "y": 2.25 }, { "label": "L24", "matrix": [2, 6], "x": 6.5, "y": 3 }, - { "label": "R03", "matrix": [6, 6], "x": 15, "y": 2.375 }, - { "label": "R07", "matrix": [6, 5], "x": 14, "y": 2.25 }, - { "label": "R11", "matrix": [6, 4], "x": 13, "y": 2.125 }, + { "label": "R24", "matrix": [6, 6], "x": 8.5, "y": 3 }, + { "label": "R23", "matrix": [6, 5], "x": 10, "y": 2.25 }, + { "label": "R19", "matrix": [6, 4], "x": 11, "y": 2.125 }, { "label": "R15", "matrix": [6, 3], "x": 12, "y": 2 }, - { "label": "R19", "matrix": [6, 2], "x": 11, "y": 2.125 }, - { "label": "R23", "matrix": [6, 1], "x": 10, "y": 2.25 }, - { "label": "R24", "matrix": [6, 0], "x": 8.5, "y": 3 }, + { "label": "R11", "matrix": [6, 2], "x": 13, "y": 2.125 }, + { "label": "R07", "matrix": [6, 1], "x": 14, "y": 2.25 }, + { "label": "R03", "matrix": [6, 0], "x": 15, "y": 2.375 }, { "label": "L04", "matrix": [3, 0], "x": 0, "y": 3.375 }, { "label": "L08", "matrix": [3, 1], "x": 1, "y": 3.25 }, { "label": "L12", "matrix": [3, 2], "x": 2, "y": 3.125 }, { "label": "L16", "matrix": [3, 3], "x": 3, "y": 3 }, { "label": "L20", "matrix": [3, 4], "x": 5.5, "y": 4 }, { "label": "L25", "matrix": [3, 6], "x": 6.5, "y": 4 }, - { "label": "R04", "matrix": [7, 6], "x": 15, "y": 3.375 }, - { "label": "R08", "matrix": [7, 4], "x": 14, "y": 3.25 }, - { "label": "R12", "matrix": [7, 3], "x": 13, "y": 3.125 }, - { "label": "R16", "matrix": [7, 2], "x": 12, "y": 3 }, - { "label": "R20", "matrix": [7, 1], "x": 9.5, "y": 4 }, - { "label": "R25", "matrix": [7, 0], "x": 8.5, "y": 4 } + { "label": "R25", "matrix": [7, 6], "x": 8.5, "y": 4 }, + { "label": "R20", "matrix": [7, 4], "x": 9.5, "y": 4 }, + { "label": "R16", "matrix": [7, 3], "x": 12, "y": 3 }, + { "label": "R12", "matrix": [7, 2], "x": 13, "y": 3.125 }, + { "label": "R08", "matrix": [7, 1], "x": 14, "y": 3.25 }, + { "label": "R04", "matrix": [7, 0], "x": 15, "y": 3.375 } ] } } From 0f3690f3e1689cf6142edf729461d3e660a87bf4 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Mon, 13 Feb 2023 19:27:20 -0500 Subject: [PATCH 24/29] Apply suggestions from code review Co-authored-by: Ryan --- keyboards/keaboard/info.json | 100 ++++++++++---------- keyboards/keaboard/keymaps/default/keymap.c | 6 +- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index 4c40df55ed6d..f28ba3f7cd89 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -32,56 +32,56 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "L01", "matrix": [0, 0], "x": 0, "y": 0.375 }, - { "label": "L05", "matrix": [0, 1], "x": 1, "y": 0.25 }, - { "label": "L09", "matrix": [0, 2], "x": 2, "y": 0.125 }, - { "label": "L13", "matrix": [0, 3], "x": 3, "y": 0 }, - { "label": "L17", "matrix": [0, 4], "x": 4, "y": 0.125 }, - { "label": "L21", "matrix": [0, 5], "x": 5, "y": 0.25 }, - { "label": "R21", "matrix": [4, 5], "x": 10, "y": 0.25 }, - { "label": "R17", "matrix": [4, 4], "x": 11, "y": 0.125 }, - { "label": "R13", "matrix": [4, 3], "x": 12, "y": 0 }, - { "label": "R09", "matrix": [4, 2], "x": 13, "y": 0.125 }, - { "label": "R05", "matrix": [4, 1], "x": 14, "y": 0.25 }, - { "label": "R01", "matrix": [4, 0], "x": 15, "y": 0.375 }, - { "label": "L02", "matrix": [1, 0], "x": 0, "y": 1.375 }, - { "label": "L06", "matrix": [1, 1], "x": 1, "y": 1.25 }, - { "label": "L10", "matrix": [1, 2], "x": 2, "y": 1.125 }, - { "label": "L14", "matrix": [1, 3], "x": 3, "y": 1 }, - { "label": "L18", "matrix": [1, 4], "x": 4, "y": 1.125 }, - { "label": "L22", "matrix": [1, 5], "x": 5, "y": 1.25 }, - { "label": "R22", "matrix": [5, 5], "x": 10, "y": 1.25 }, - { "label": "R18", "matrix": [5, 4], "x": 11, "y": 1.125 }, - { "label": "R14", "matrix": [5, 3], "x": 12, "y": 1 }, - { "label": "R10", "matrix": [5, 2], "x": 13, "y": 1.125 }, - { "label": "R06", "matrix": [5, 1], "x": 14, "y": 1.25 }, - { "label": "R02", "matrix": [5, 0], "x": 15, "y": 1.375 }, - { "label": "L03", "matrix": [2, 0], "x": 0, "y": 2.375 }, - { "label": "L07", "matrix": [2, 1], "x": 1, "y": 2.25 }, - { "label": "L11", "matrix": [2, 2], "x": 2, "y": 2.125 }, - { "label": "L15", "matrix": [2, 3], "x": 3, "y": 2 }, - { "label": "L19", "matrix": [2, 4], "x": 4, "y": 2.125 }, - { "label": "L23", "matrix": [2, 5], "x": 5, "y": 2.25 }, - { "label": "L24", "matrix": [2, 6], "x": 6.5, "y": 3 }, - { "label": "R24", "matrix": [6, 6], "x": 8.5, "y": 3 }, - { "label": "R23", "matrix": [6, 5], "x": 10, "y": 2.25 }, - { "label": "R19", "matrix": [6, 4], "x": 11, "y": 2.125 }, - { "label": "R15", "matrix": [6, 3], "x": 12, "y": 2 }, - { "label": "R11", "matrix": [6, 2], "x": 13, "y": 2.125 }, - { "label": "R07", "matrix": [6, 1], "x": 14, "y": 2.25 }, - { "label": "R03", "matrix": [6, 0], "x": 15, "y": 2.375 }, - { "label": "L04", "matrix": [3, 0], "x": 0, "y": 3.375 }, - { "label": "L08", "matrix": [3, 1], "x": 1, "y": 3.25 }, - { "label": "L12", "matrix": [3, 2], "x": 2, "y": 3.125 }, - { "label": "L16", "matrix": [3, 3], "x": 3, "y": 3 }, - { "label": "L20", "matrix": [3, 4], "x": 5.5, "y": 4 }, - { "label": "L25", "matrix": [3, 6], "x": 6.5, "y": 4 }, - { "label": "R25", "matrix": [7, 6], "x": 8.5, "y": 4 }, - { "label": "R20", "matrix": [7, 4], "x": 9.5, "y": 4 }, - { "label": "R16", "matrix": [7, 3], "x": 12, "y": 3 }, - { "label": "R12", "matrix": [7, 2], "x": 13, "y": 3.125 }, - { "label": "R08", "matrix": [7, 1], "x": 14, "y": 3.25 }, - { "label": "R04", "matrix": [7, 0], "x": 15, "y": 3.375 } + { "matrix": [0, 0], "x": 0, "y": 0.375 }, + { "matrix": [0, 1], "x": 1, "y": 0.25 }, + { "matrix": [0, 2], "x": 2, "y": 0.125 }, + { "matrix": [0, 3], "x": 3, "y": 0 }, + { "matrix": [0, 4], "x": 4, "y": 0.125 }, + { "matrix": [0, 5], "x": 5, "y": 0.25 }, + { "matrix": [4, 5], "x": 10, "y": 0.25 }, + { "matrix": [4, 4], "x": 11, "y": 0.125 }, + { "matrix": [4, 3], "x": 12, "y": 0 }, + { "matrix": [4, 2], "x": 13, "y": 0.125 }, + { "matrix": [4, 1], "x": 14, "y": 0.25 }, + { "matrix": [4, 0], "x": 15, "y": 0.375 }, + { "matrix": [1, 0], "x": 0, "y": 1.375 }, + { "matrix": [1, 1], "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "x": 2, "y": 1.125 }, + { "matrix": [1, 3], "x": 3, "y": 1 }, + { "matrix": [1, 4], "x": 4, "y": 1.125 }, + { "matrix": [1, 5], "x": 5, "y": 1.25 }, + { "matrix": [5, 5], "x": 10, "y": 1.25 }, + { "matrix": [5, 4], "x": 11, "y": 1.125 }, + { "matrix": [5, 3], "x": 12, "y": 1 }, + { "matrix": [5, 2], "x": 13, "y": 1.125 }, + { "matrix": [5, 1], "x": 14, "y": 1.25 }, + { "matrix": [5, 0], "x": 15, "y": 1.375 }, + { "matrix": [2, 0], "x": 0, "y": 2.375 }, + { "matrix": [2, 1], "x": 1, "y": 2.25 }, + { "matrix": [2, 2], "x": 2, "y": 2.125 }, + { "matrix": [2, 3], "x": 3, "y": 2 }, + { "matrix": [2, 4], "x": 4, "y": 2.125 }, + { "matrix": [2, 5], "x": 5, "y": 2.25 }, + { "matrix": [2, 6], "x": 6.5, "y": 3 }, + { "matrix": [6, 6], "x": 8.5, "y": 3 }, + { "matrix": [6, 5], "x": 10, "y": 2.25 }, + { "matrix": [6, 4], "x": 11, "y": 2.125 }, + { "matrix": [6, 3], "x": 12, "y": 2 }, + { "matrix": [6, 2], "x": 13, "y": 2.125 }, + { "matrix": [6, 1], "x": 14, "y": 2.25 }, + { "matrix": [6, 0], "x": 15, "y": 2.375 }, + { "matrix": [3, 0], "x": 0, "y": 3.375 }, + { "matrix": [3, 1], "x": 1, "y": 3.25 }, + { "matrix": [3, 2], "x": 2, "y": 3.125 }, + { "matrix": [3, 3], "x": 3, "y": 3 }, + { "matrix": [3, 4], "x": 5.5, "y": 4 }, + { "matrix": [3, 6], "x": 6.5, "y": 4 }, + { "matrix": [7, 6], "x": 8.5, "y": 4 }, + { "matrix": [7, 4], "x": 9.5, "y": 4 }, + { "matrix": [7, 3], "x": 12, "y": 3 }, + { "matrix": [7, 2], "x": 13, "y": 3.125 }, + { "matrix": [7, 1], "x": 14, "y": 3.25 }, + { "matrix": [7, 0], "x": 15, "y": 3.375 } ] } } diff --git a/keyboards/keaboard/keymaps/default/keymap.c b/keyboards/keaboard/keymaps/default/keymap.c index 54dbd86009c3..43e47009d103 100644 --- a/keyboards/keaboard/keymaps/default/keymap.c +++ b/keyboards/keaboard/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F2, KC_F12, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' ), @@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' ), @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, KC_TRNS, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PIPE, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' ) From 18b7960cf763d5f65928f6a748fee35050a47e17 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Mon, 13 Feb 2023 19:28:48 -0500 Subject: [PATCH 25/29] Align keymap L39 --- keyboards/keaboard/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keaboard/keymaps/default/keymap.c b/keyboards/keaboard/keymaps/default/keymap.c index 43e47009d103..b7b7fd7a023a 100644 --- a/keyboards/keaboard/keymaps/default/keymap.c +++ b/keyboards/keaboard/keymaps/default/keymap.c @@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F2, KC_F12, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------| - KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + KC_DEL, KC_LALT, KC_LCTL, KC_LGUI, LOWER, KC_ENT, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT //`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------' ), From 47dc15fa58f1141a1aff04b319a1d9cc498fd8f2 Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Mon, 13 Feb 2023 19:36:55 -0500 Subject: [PATCH 26/29] Update keyboards/keaboard/info.json Co-authored-by: Ryan --- keyboards/keaboard/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/keaboard/info.json b/keyboards/keaboard/info.json index f28ba3f7cd89..74e8ce3e93d5 100644 --- a/keyboards/keaboard/info.json +++ b/keyboards/keaboard/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "keaboard", - "manufacturer": "You", + "manufacturer": "keawade", "url": "https://github.com/keawade/keaboard", "maintainer": "keawade", From 91d86f61fa280835dbdf8db2d45664312a4c566c Mon Sep 17 00:00:00 2001 From: Keith Wade Date: Mon, 13 Feb 2023 22:57:38 -0500 Subject: [PATCH 27/29] Add rev1/config.h --- keyboards/keaboard/rev1/config.h | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 keyboards/keaboard/rev1/config.h diff --git a/keyboards/keaboard/rev1/config.h b/keyboards/keaboard/rev1/config.h new file mode 100644 index 000000000000..941b25a2d78c --- /dev/null +++ b/keyboards/keaboard/rev1/config.h @@ -0,0 +1,4 @@ +// Copyright 2023 Keith Wade +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once From 859ecf20175469d8df674f4e53d863496f394315 Mon Sep 17 00:00:00 2001 From: jack <0x6a73@protonmail.com> Date: Tue, 14 Feb 2023 00:12:14 -0700 Subject: [PATCH 28/29] Update keyboards/keaboard/readme.md --- keyboards/keaboard/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keaboard/readme.md b/keyboards/keaboard/readme.md index 71473211eda0..69943cdad177 100644 --- a/keyboards/keaboard/readme.md +++ b/keyboards/keaboard/readme.md @@ -8,11 +8,11 @@ A split columnular stagger 4x6 keyboard with 3 thumb keys designed by [Keith Wad Make example for this keyboard (after setting up your build environment): - make keaboard/rev1:default + make keaboard:default Flashing example for this keyboard: - make keaboard/rev1:default:flash + make keaboard:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 154bb09a90fea4e7a42f7d3c64a1e798d141d812 Mon Sep 17 00:00:00 2001 From: jack <0x6a73@protonmail.com> Date: Tue, 14 Feb 2023 00:13:03 -0700 Subject: [PATCH 29/29] Update keyboards/keaboard/readme.md Oop previous commit entirely my mistake. --- keyboards/keaboard/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/keaboard/readme.md b/keyboards/keaboard/readme.md index 69943cdad177..71473211eda0 100644 --- a/keyboards/keaboard/readme.md +++ b/keyboards/keaboard/readme.md @@ -8,11 +8,11 @@ A split columnular stagger 4x6 keyboard with 3 thumb keys designed by [Keith Wad Make example for this keyboard (after setting up your build environment): - make keaboard:default + make keaboard/rev1:default Flashing example for this keyboard: - make keaboard:default:flash + make keaboard/rev1:default:flash See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).