From 4301cc52c025613755f4af3e168a2a5e0fe026f1 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Thu, 12 May 2022 19:58:10 -0700 Subject: [PATCH 01/37] Initial commit for Mugen 75. --- .../anjheos/mugen/keymaps/default/keymap.c | 27 ++ keyboards/anjheos/mugen_prototype/config.h | 37 +++ keyboards/anjheos/mugen_prototype/info.json | 309 ++++++++++++++++++ .../mugen_prototype/keymaps/ansi/keymap.c | 20 ++ .../mugen_prototype/keymaps/iso/keymap.c | 39 +++ .../mugen_prototype/keymaps/via/keymap.c | 63 ++++ .../mugen_prototype/keymaps/via/readme.md | 1 + .../mugen_prototype/keymaps/via/rules.mk | 2 + .../anjheos/mugen_prototype/mugen_prototype.c | 17 + .../anjheos/mugen_prototype/mugen_prototype.h | 94 ++++++ keyboards/anjheos/mugen_prototype/readme.md | 27 ++ keyboards/anjheos/mugen_prototype/rules.mk | 3 + 12 files changed, 639 insertions(+) create mode 100644 keyboards/anjheos/mugen/keymaps/default/keymap.c create mode 100644 keyboards/anjheos/mugen_prototype/config.h create mode 100644 keyboards/anjheos/mugen_prototype/info.json create mode 100644 keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c create mode 100644 keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c create mode 100644 keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c create mode 100644 keyboards/anjheos/mugen_prototype/keymaps/via/readme.md create mode 100644 keyboards/anjheos/mugen_prototype/keymaps/via/rules.mk create mode 100644 keyboards/anjheos/mugen_prototype/mugen_prototype.c create mode 100644 keyboards/anjheos/mugen_prototype/mugen_prototype.h create mode 100644 keyboards/anjheos/mugen_prototype/readme.md create mode 100644 keyboards/anjheos/mugen_prototype/rules.mk diff --git a/keyboards/anjheos/mugen/keymaps/default/keymap.c b/keyboards/anjheos/mugen/keymaps/default/keymap.c new file mode 100644 index 000000000000..92fbfead5028 --- /dev/null +++ b/keyboards/anjheos/mugen/keymaps/default/keymap.c @@ -0,0 +1,27 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ + * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PSc│Pse│Del│ + * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ + * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│ + * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ + * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │PgU│ + * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ + * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │PgD│ + * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ + * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ + * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ + * │Ctrl│GUI │Alt │ │Alt│GUI│Ctl│ ← │ ↓ │ → │ + * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ + */ + [0] = LAYOUT_75_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ) +}; diff --git a/keyboards/anjheos/mugen_prototype/config.h b/keyboards/anjheos/mugen_prototype/config.h new file mode 100644 index 000000000000..95ed757b187a --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/config.h @@ -0,0 +1,37 @@ +// Copyright 2022 Anjheos (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define PRODUCT Mugen 75 Prototype + +#define MATRIX_ROWS 6 +#define MATRIX_COLS 15 + +#define MATRIX_ROW_PINS { A9, A8, B14, B12, A2, A4 } +#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A5, A6, B7, B6, B5, B4, B3, A15, A3 } +#define UNUSED_PINS { B8, B9, B13, B15, A10, A13, A14 } +#define ENCODER_PAD_A { C14 } +#define ENCODER_PAD_B { C13 } +#define ENCODER_DIRECTION_FLIP +#define ENCODER_RESOLUTION 4 + + +#define LOCKING_SUPPORT_ENABLE + +#define LOCKING_RESYNC_ENABLE +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/anjheos/mugen_prototype/info.json b/keyboards/anjheos/mugen_prototype/info.json new file mode 100644 index 000000000000..ebe7714ae611 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/info.json @@ -0,0 +1,309 @@ +{ + "manufacturer": "Anjheos", + "keyboard_name": "anjheos/mugen_prototype", + "maintainer": "Anjheos", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "B7", "B6", "B5", "B4", "B3", "A15", "A3"], + "rows": ["A9", "A8", "B14", "B12", "A2", "A4"] + }, + "processor": "STM32F303", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x4168" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 1.25, "y": 0 }, + { "label": "F2", "x": 2.25, "y": 0 }, + { "label": "F3", "x": 3.25, "y": 0 }, + { "label": "F4", "x": 4.25, "y": 0 }, + { "label": "F5", "x": 5.5, "y": 0 }, + { "label": "F6", "x": 6.5, "y": 0 }, + { "label": "F7", "x": 7.5, "y": 0 }, + { "label": "F8", "x": 8.5, "y": 0 }, + { "label": "F9", "x": 9.75, "y": 0 }, + { "label": "F10", "x": 10.75, "y": 0 }, + { "label": "F11", "x": 11.75, "y": 0 }, + { "label": "F12", "x": 12.75, "y": 0 }, + { "label": "PrtSc", "x": 14, "y": 0 }, + { "label": "Delete", "x": 15.25, "y": 0.5 }, + + + { "label": "~", "x": 0, "y": 1.25 }, + { "label": "!", "x": 1, "y": 1.25 }, + { "label": "@", "x": 2, "y": 1.25 }, + { "label": "#", "x": 3, "y": 1.25 }, + { "label": "$", "x": 4, "y": 1.25 }, + { "label": "%", "x": 5, "y": 1.25 }, + { "label": "^", "x": 6, "y": 1.25 }, + { "label": "&", "x": 7, "y": 1.25 }, + { "label": "*", "x": 8, "y": 1.25 }, + { "label": "(", "x": 9, "y": 1.25 }, + { "label": ")", "x": 10, "y": 1.25 }, + { "label": "_", "x": 11, "y": 1.25 }, + { "label": "+", "x": 12, "y": 1.25 }, + { "label": "BckSpc", "x": 13, "y": 1.25}, + { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "x": 15.25, "y": 1.25 }, + + { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "x": 1.5, "y": 2.25 }, + { "label": "W", "x": 2.5, "y": 2.25 }, + { "label": "E", "x": 3.5, "y": 2.25 }, + { "label": "R", "x": 4.5, "y": 2.25 }, + { "label": "T", "x": 5.5, "y": 2.25 }, + { "label": "Y", "x": 6.5, "y": 2.25 }, + { "label": "U", "x": 7.5, "y": 2.25 }, + { "label": "I", "x": 8.5, "y": 2.25 }, + { "label": "O", "x": 9.5, "y": 2.25 }, + { "label": "P", "x": 10.5, "y": 2.25 }, + { "label": "{", "x": 11.5, "y": 2.25 }, + { "label": "}", "x": 12.5, "y": 2.25 }, + { "label": "|", "w": 1.5, "x": 13.5, "y": 2.25 }, + { "label": "Page Up", "x": 15.25, "y": 2.25 }, + + { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "x": 1.75, "y": 3.25 }, + { "label": "S", "x": 2.75, "y": 3.25 }, + { "label": "D", "x": 3.75, "y": 3.25 }, + { "label": "F", "x": 4.75, "y": 3.25 }, + { "label": "G", "x": 5.75, "y": 3.25 }, + { "label": "H", "x": 6.75, "y": 3.25 }, + { "label": "J", "x": 7.75, "y": 3.25 }, + { "label": "K", "x": 8.75, "y": 3.25 }, + { "label": "L", "x": 9.75, "y": 3.25 }, + { "label": ":", "x": 10.75, "y": 3.25 }, + { "label": "@", "x": 11.75, "y": 3.25 }, + { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25 }, + { "label": "Page Down", "x": 15.25, "y": 3.25 }, + + { "label": "Shift", "w": 2.25, "x": 0, "y": 4.25 }, + { "label": "|", "x": 1.25, "y": 4.25 }, + { "label": "Z", "x": 2.25, "y": 4.25 }, + { "label": "X", "x": 3.25, "y": 4.25 }, + { "label": "C", "x": 4.25, "y": 4.25 }, + { "label": "V", "x": 5.25, "y": 4.25 }, + { "label": "B", "x": 6.25, "y": 4.25 }, + { "label": "N", "x": 7.25, "y": 4.25 }, + { "label": "M", "x": 8.25, "y": 4.25 }, + { "label": "<", "x": 9.25, "y": 4.25 }, + { "label": ">", "x": 10.25, "y": 4.25 }, + { "label": "?", "x": 11.25, "y": 4.25 }, + { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, + { "label": "End", "x": 15.25, "y": 4.25 }, + + { "label": "\u2191", "x": 14, "y": 4.5 }, + { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "Fn", "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, + { "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "Alt", "w": 1.25, "x": 10, "y": 5.25 }, + { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, + { "label": "\u2190", "x": 13, "y": 5.5 }, + { "label": "\u2193", "x": 14, "y": 5.5 }, + { "label": "\u2192", "x": 15, "y": 5.5 } + ] + }, + + "LAYOUT_ansi": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 1.25, "y": 0 }, + { "label": "F2", "x": 2.25, "y": 0 }, + { "label": "F3", "x": 3.25, "y": 0 }, + { "label": "F4", "x": 4.25, "y": 0 }, + { "label": "F5", "x": 5.5, "y": 0 }, + { "label": "F6", "x": 6.5, "y": 0 }, + { "label": "F7", "x": 7.5, "y": 0 }, + { "label": "F8", "x": 8.5, "y": 0 }, + { "label": "F9", "x": 9.75, "y": 0 }, + { "label": "F10", "x": 10.75, "y": 0 }, + { "label": "F11", "x": 11.75, "y": 0 }, + { "label": "F12", "x": 12.75, "y": 0 }, + { "label": "PrtSc", "x": 14, "y": 0 }, + { "label": "Delete", "x": 15.25, "y": 0 }, + + { "label": "~", "x": 0, "y": 1.25 }, + { "label": "!", "x": 1, "y": 1.25 }, + { "label": "@", "x": 2, "y": 1.25 }, + { "label": "#", "x": 3, "y": 1.25 }, + { "label": "$", "x": 4, "y": 1.25 }, + { "label": "%", "x": 5, "y": 1.25 }, + { "label": "^", "x": 6, "y": 1.25 }, + { "label": "&", "x": 7, "y": 1.25 }, + { "label": "*", "x": 8, "y": 1.25 }, + { "label": "(", "x": 9, "y": 1.25 }, + { "label": ")", "x": 10, "y": 1.25 }, + { "label": "_", "x": 11, "y": 1.25 }, + { "label": "+", "x": 12, "y": 1.25 }, + { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "x": 15.25, "y": 1.25 }, + + { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "x": 1.5, "y": 2.25 }, + { "label": "W", "x": 2.5, "y": 2.25 }, + { "label": "E", "x": 3.5, "y": 2.25 }, + { "label": "R", "x": 4.5, "y": 2.25 }, + { "label": "T", "x": 5.5, "y": 2.25 }, + { "label": "Y", "x": 6.5, "y": 2.25 }, + { "label": "U", "x": 7.5, "y": 2.25 }, + { "label": "I", "x": 8.5, "y": 2.25 }, + { "label": "O", "x": 9.5, "y": 2.25 }, + { "label": "P", "x": 10.5, "y": 2.25 }, + { "label": "{", "x": 11.5, "y": 2.25 }, + { "label": "}", "x": 12.5, "y": 2.25 }, + { "label": "|", "w": 1.5, "x": 13.5, "y": 2.25 }, + { "label": "Page Up", "x": 15.25, "y": 2.25 }, + + { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "x": 1.75, "y": 3.25 }, + { "label": "S", "x": 2.75, "y": 3.25 }, + { "label": "D", "x": 3.75, "y": 3.25 }, + { "label": "F", "x": 4.75, "y": 3.25 }, + { "label": "G", "x": 5.75, "y": 3.25 }, + { "label": "H", "x": 6.75, "y": 3.25 }, + { "label": "J", "x": 7.75, "y": 3.25 }, + { "label": "K", "x": 8.75, "y": 3.25 }, + { "label": "L", "x": 9.75, "y": 3.25 }, + { "label": ":", "x": 10.75, "y": 3.25 }, + { "label": "\"", "x": 11.75, "y": 3.25 }, + { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25 }, + { "label": "Page Down", "x": 15.25, "y": 3.25 }, + + { "label": "Shift", "w": 2.25, "x": 0, "y": 4.25 }, + { "label": "Z", "x": 2.25, "y": 4.25 }, + { "label": "X", "x": 3.25, "y": 4.25 }, + { "label": "C", "x": 4.25, "y": 4.25 }, + { "label": "V", "x": 5.25, "y": 4.25 }, + { "label": "B", "x": 6.25, "y": 4.25 }, + { "label": "N", "x": 7.25, "y": 4.25 }, + { "label": "M", "x": 8.25, "y": 4.25 }, + { "label": "<", "x": 9.25, "y": 4.25 }, + { "label": ">", "x": 10.25, "y": 4.25 }, + { "label": "?", "x": 11.25, "y": 4.25 }, + { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, + { "label": "End", "x": 15.25, "y": 4.25 }, + + { "label": "\u2191", "x": 14, "y": 4.5 }, + { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "Fn", "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, + { "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "Alt", "w": 1.25, "x": 10, "y": 5.25 }, + { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, + { "label": "\u2190", "x": 13, "y": 5.5 }, + { "label": "\u2193", "x": 14, "y": 5.5 }, + { "label": "\u2192", "x": 15, "y": 5.5 } + ] + }, + + "LAYOUT_iso": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 1.25, "y": 0 }, + { "label": "F2", "x": 2.25, "y": 0 }, + { "label": "F3", "x": 3.25, "y": 0 }, + { "label": "F4", "x": 4.25, "y": 0 }, + { "label": "F5", "x": 5.5, "y": 0 }, + { "label": "F6", "x": 6.5, "y": 0 }, + { "label": "F7", "x": 7.5, "y": 0 }, + { "label": "F8", "x": 8.5, "y": 0 }, + { "label": "F9", "x": 9.75, "y": 0 }, + { "label": "F10", "x": 10.75, "y": 0 }, + { "label": "F11", "x": 11.75, "y": 0 }, + { "label": "F12", "x": 12.75, "y": 0 }, + { "label": "PrtSc", "x": 14, "y": 0 }, + { "label": "Delete", "x": 15.25, "y": 0 }, + + { "label": "\u00ac", "x": 0, "y": 1.25 }, + { "label": "!", "x": 1, "y": 1.25 }, + { "label": "\"", "x": 2, "y": 1.25 }, + { "label": "\u00a3", "x": 3, "y": 1.25 }, + { "label": "$", "x": 4, "y": 1.25 }, + { "label": "%", "x": 5, "y": 1.25 }, + { "label": "^", "x": 6, "y": 1.25 }, + { "label": "&", "x": 7, "y": 1.25 }, + { "label": "*", "x": 8, "y": 1.25 }, + { "label": "(", "x": 9, "y": 1.25 }, + { "label": ")", "x": 10, "y": 1.25 }, + { "label": "_", "x": 11, "y": 1.25 }, + { "label": "+", "x": 12, "y": 1.25 }, + { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "x": 15.25, "y": 1.25 }, + + { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "x": 1.5, "y": 2.25 }, + { "label": "W", "x": 2.5, "y": 2.25 }, + { "label": "E", "x": 3.5, "y": 2.25 }, + { "label": "R", "x": 4.5, "y": 2.25 }, + { "label": "T", "x": 5.5, "y": 2.25 }, + { "label": "Y", "x": 6.5, "y": 2.25 }, + { "label": "U", "x": 7.5, "y": 2.25 }, + { "label": "I", "x": 8.5, "y": 2.25 }, + { "label": "O", "x": 9.5, "y": 2.25 }, + { "label": "P", "x": 10.5, "y": 2.25 }, + { "label": "{", "x": 11.5, "y": 2.25 }, + { "label": "}", "x": 12.5, "y": 2.25 }, + { "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25 }, + { "label": "PgUp", "x": 15.25, "y": 2.25 }, + + { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "x": 1.75, "y": 3.25 }, + { "label": "S", "x": 2.75, "y": 3.25 }, + { "label": "D", "x": 3.75, "y": 3.25 }, + { "label": "F", "x": 4.75, "y": 3.25 }, + { "label": "G", "x": 5.75, "y": 3.25 }, + { "label": "H", "x": 6.75, "y": 3.25 }, + { "label": "J", "x": 7.75, "y": 3.25 }, + { "label": "K", "x": 8.75, "y": 3.25 }, + { "label": "L", "x": 9.75, "y": 3.25 }, + { "label": ":", "x": 10.75, "y": 3.25 }, + { "label": "@", "x": 11.75, "y": 3.25 }, + { "label": "~", "x": 12.75, "y": 3.25 }, + { "label": "PgDn", "x": 15.25, "y": 3.25 }, + + { "label": "Shift", "w": 1.25, "x": 0, "y": 4.25 }, + { "label": "|", "x": 1.25, "y": 4.25 }, + { "label": "Z", "x": 2.25, "y": 4.25 }, + { "label": "X", "x": 3.25, "y": 4.25 }, + { "label": "C", "x": 4.25, "y": 4.25 }, + { "label": "V", "x": 5.25, "y": 4.25 }, + { "label": "B", "x": 6.25, "y": 4.25 }, + { "label": "N", "x": 7.25, "y": 4.25 }, + { "label": "M", "x": 8.25, "y": 4.25 }, + { "label": "<", "x": 9.25, "y": 4.25 }, + { "label": ">", "x": 10.25, "y": 4.25 }, + { "label": "?", "x": 11.25, "y": 4.25 }, + { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, + { "label": "End", "x": 15.25, "y": 4.25 }, + { "label": "\u2191", "x": 14, "y": 4.5 }, + + { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "Fn", "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, + { "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25 }, + { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, + { "label": "\u2190", "x": 13, "y": 5.5 }, + { "label": "\u2193", "x": 14, "y": 5.5 }, + { "label": "\u2192", "x": 15, "y": 5.5 } + ] + } + + + } +} \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c new file mode 100644 index 000000000000..8cc64431112a --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c @@ -0,0 +1,20 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, + _______, _______, _______, _______, _______, _______, KC_MPRV, _______, KC_MNXT) +}; diff --git a/keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c new file mode 100644 index 000000000000..85134d220d72 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c @@ -0,0 +1,39 @@ +/* Copyright 2022 Anjheos + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_iso( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + +[1] = LAYOUT_iso( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, + _______, _______, _______, _______, _______, _______, KC_MPRV, _______, KC_MNXT) + +}; + + diff --git a/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c new file mode 100644 index 000000000000..e5365ea75747 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c @@ -0,0 +1,63 @@ +/* Copyright 2020 Anjheos + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + + [1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, + _______, _______, MO(2), _______, _______, _______, KC_MPRV, _______, KC_MNXT), + + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, MO(3), _______, _______, _______, _______, _______, _______, _______), + + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______) + +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (clockwise) { + tap_code_delay(KC_1, 10); + } else { + tap_code_delay(KC_2, 10); + } + + return false; +} \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/keymaps/via/readme.md b/keyboards/anjheos/mugen_prototype/keymaps/via/readme.md new file mode 100644 index 000000000000..f1561469e854 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/keymaps/via/readme.md @@ -0,0 +1 @@ +# The VIA and Vial keymap for the Mugen 75 Prototype diff --git a/keyboards/anjheos/mugen_prototype/keymaps/via/rules.mk b/keyboards/anjheos/mugen_prototype/keymaps/via/rules.mk new file mode 100644 index 000000000000..4f7618e9b211 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes diff --git a/keyboards/anjheos/mugen_prototype/mugen_prototype.c b/keyboards/anjheos/mugen_prototype/mugen_prototype.c new file mode 100644 index 000000000000..52304aface70 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/mugen_prototype.c @@ -0,0 +1,17 @@ +/* Copyright 2020 Anjheos + * + * 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 "mugen_prototype.h" diff --git a/keyboards/anjheos/mugen_prototype/mugen_prototype.h b/keyboards/anjheos/mugen_prototype/mugen_prototype.h new file mode 100644 index 000000000000..134c340fbee6 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/mugen_prototype.h @@ -0,0 +1,94 @@ +/* Copyright 2020 Anjheos + * + * 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 "quantum.h" + +#define XXX KC_NO + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k3d, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ + k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ + { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ +} + +#define LAYOUT_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ + k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ + k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \ + { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ + { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ +} + +#define LAYOUT_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ + k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ + { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ +} +/* +#define LAYOUT_split_bs( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k3d, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ + k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ + k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ + { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ + { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ +} +*/ diff --git a/keyboards/anjheos/mugen_prototype/readme.md b/keyboards/anjheos/mugen_prototype/readme.md new file mode 100644 index 000000000000..774dd36a1d82 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/readme.md @@ -0,0 +1,27 @@ +# anjheos/mugen_prototype + +![anjheos/mugen_prototype](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Anjheos](https://github.com/Anjheos) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make anjheos/mugen_prototype:default + +Flashing example for this keyboard: + + make anjheos/mugen_prototype: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 in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/anjheos/mugen_prototype/rules.mk b/keyboards/anjheos/mugen_prototype/rules.mk new file mode 100644 index 000000000000..9007415b42e6 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/rules.mk @@ -0,0 +1,3 @@ +# This file intentionally left blank +EXTRAKEY_ENABLE = yes +MOUSEKEY_ENABLE = yes \ No newline at end of file From dcee560b455938948a17bb2b48ea3cf8cb532664 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Sat, 14 May 2022 22:25:47 -0700 Subject: [PATCH 02/37] Added Mugen 75 standard layouts. --- keyboards/anjheos/mugen/config.h | 20 ++ keyboards/anjheos/mugen/info.json | 309 ++++++++++++++++++ keyboards/anjheos/mugen/keymaps/ansi/keymap.c | 36 ++ .../anjheos/mugen/keymaps/default/keymap.c | 27 -- keyboards/anjheos/mugen/keymaps/iso/keymap.c | 39 +++ keyboards/anjheos/mugen/keymaps/via/keymap.c | 65 ++++ keyboards/anjheos/mugen/keymaps/via/readme.md | 1 + keyboards/anjheos/mugen/keymaps/via/rules.mk | 2 + keyboards/anjheos/mugen/keymaps/vial/config.h | 7 + keyboards/anjheos/mugen/keymaps/vial/keymap.c | 65 ++++ .../anjheos/mugen/keymaps/vial/readme.md | 1 + keyboards/anjheos/mugen/keymaps/vial/rules.mk | 5 + keyboards/anjheos/mugen/mugen.c | 33 ++ keyboards/anjheos/mugen/mugen.h | 78 +++++ keyboards/anjheos/mugen/readme.md | 27 ++ keyboards/anjheos/mugen/rules.mk | 1 + keyboards/anjheos/mugen_prototype/config.h | 18 +- .../mugen_prototype/keymaps/via/keymap.c | 10 +- .../anjheos/mugen_prototype/mugen_prototype.c | 18 +- .../anjheos/mugen_prototype/mugen_prototype.h | 20 +- 20 files changed, 716 insertions(+), 66 deletions(-) create mode 100644 keyboards/anjheos/mugen/config.h create mode 100644 keyboards/anjheos/mugen/info.json create mode 100644 keyboards/anjheos/mugen/keymaps/ansi/keymap.c delete mode 100644 keyboards/anjheos/mugen/keymaps/default/keymap.c create mode 100644 keyboards/anjheos/mugen/keymaps/iso/keymap.c create mode 100644 keyboards/anjheos/mugen/keymaps/via/keymap.c create mode 100644 keyboards/anjheos/mugen/keymaps/via/readme.md create mode 100644 keyboards/anjheos/mugen/keymaps/via/rules.mk create mode 100644 keyboards/anjheos/mugen/keymaps/vial/config.h create mode 100644 keyboards/anjheos/mugen/keymaps/vial/keymap.c create mode 100644 keyboards/anjheos/mugen/keymaps/vial/readme.md create mode 100644 keyboards/anjheos/mugen/keymaps/vial/rules.mk create mode 100644 keyboards/anjheos/mugen/mugen.c create mode 100644 keyboards/anjheos/mugen/mugen.h create mode 100644 keyboards/anjheos/mugen/readme.md create mode 100644 keyboards/anjheos/mugen/rules.mk diff --git a/keyboards/anjheos/mugen/config.h b/keyboards/anjheos/mugen/config.h new file mode 100644 index 000000000000..ca2491983404 --- /dev/null +++ b/keyboards/anjheos/mugen/config.h @@ -0,0 +1,20 @@ +// Copyright 2022 Anjheos (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include "config_common.h" + +#define PRODUCT Mugen 75 Ver 1.0 + + +#define ENCODER_PAD_A { C14 } +#define ENCODER_PAD_B { C13 } +#define ENCODER_RESOLUTION 4 + + +#define LOCKING_SUPPORT_ENABLE + +#define LOCKING_RESYNC_ENABLE + + diff --git a/keyboards/anjheos/mugen/info.json b/keyboards/anjheos/mugen/info.json new file mode 100644 index 000000000000..69530089d6b7 --- /dev/null +++ b/keyboards/anjheos/mugen/info.json @@ -0,0 +1,309 @@ +{ + "manufacturer": "Anjheos", + "keyboard_name": "anjheos/mugen", + "maintainer": "Anjheos", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "B7", "B6", "B5", "B4", "B3", "A15", "A3"], + "rows": ["A9", "A8", "B14", "B12", "A2", "A4"] + }, + "processor": "STM32F303", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x4168" + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 1.25, "y": 0 }, + { "label": "F2", "x": 2.25, "y": 0 }, + { "label": "F3", "x": 3.25, "y": 0 }, + { "label": "F4", "x": 4.25, "y": 0 }, + { "label": "F5", "x": 5.5, "y": 0 }, + { "label": "F6", "x": 6.5, "y": 0 }, + { "label": "F7", "x": 7.5, "y": 0 }, + { "label": "F8", "x": 8.5, "y": 0 }, + { "label": "F9", "x": 9.75, "y": 0 }, + { "label": "F10", "x": 10.75, "y": 0 }, + { "label": "F11", "x": 11.75, "y": 0 }, + { "label": "F12", "x": 12.75, "y": 0 }, + { "label": "PrtSc", "x": 14, "y": 0 }, + { "label": "Delete", "x": 15.25, "y": 0.5 }, + + + { "label": "~", "x": 0, "y": 1.25 }, + { "label": "!", "x": 1, "y": 1.25 }, + { "label": "@", "x": 2, "y": 1.25 }, + { "label": "#", "x": 3, "y": 1.25 }, + { "label": "$", "x": 4, "y": 1.25 }, + { "label": "%", "x": 5, "y": 1.25 }, + { "label": "^", "x": 6, "y": 1.25 }, + { "label": "&", "x": 7, "y": 1.25 }, + { "label": "*", "x": 8, "y": 1.25 }, + { "label": "(", "x": 9, "y": 1.25 }, + { "label": ")", "x": 10, "y": 1.25 }, + { "label": "_", "x": 11, "y": 1.25 }, + { "label": "+", "x": 12, "y": 1.25 }, + { "label": "BckSpc", "x": 13, "y": 1.25}, + { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "x": 15.25, "y": 1.25 }, + + { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "x": 1.5, "y": 2.25 }, + { "label": "W", "x": 2.5, "y": 2.25 }, + { "label": "E", "x": 3.5, "y": 2.25 }, + { "label": "R", "x": 4.5, "y": 2.25 }, + { "label": "T", "x": 5.5, "y": 2.25 }, + { "label": "Y", "x": 6.5, "y": 2.25 }, + { "label": "U", "x": 7.5, "y": 2.25 }, + { "label": "I", "x": 8.5, "y": 2.25 }, + { "label": "O", "x": 9.5, "y": 2.25 }, + { "label": "P", "x": 10.5, "y": 2.25 }, + { "label": "{", "x": 11.5, "y": 2.25 }, + { "label": "}", "x": 12.5, "y": 2.25 }, + { "label": "|", "w": 1.5, "x": 13.5, "y": 2.25 }, + { "label": "Page Up", "x": 15.25, "y": 2.25 }, + + { "label": "Fn", "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "x": 1.75, "y": 3.25 }, + { "label": "S", "x": 2.75, "y": 3.25 }, + { "label": "D", "x": 3.75, "y": 3.25 }, + { "label": "F", "x": 4.75, "y": 3.25 }, + { "label": "G", "x": 5.75, "y": 3.25 }, + { "label": "H", "x": 6.75, "y": 3.25 }, + { "label": "J", "x": 7.75, "y": 3.25 }, + { "label": "K", "x": 8.75, "y": 3.25 }, + { "label": "L", "x": 9.75, "y": 3.25 }, + { "label": ":", "x": 10.75, "y": 3.25 }, + { "label": "@", "x": 11.75, "y": 3.25 }, + { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25 }, + { "label": "Page Down", "x": 15.25, "y": 3.25 }, + + { "label": "Shift", "w": 2.25, "x": 0, "y": 4.25 }, + { "label": "|", "x": 1.25, "y": 4.25 }, + { "label": "Z", "x": 2.25, "y": 4.25 }, + { "label": "X", "x": 3.25, "y": 4.25 }, + { "label": "C", "x": 4.25, "y": 4.25 }, + { "label": "V", "x": 5.25, "y": 4.25 }, + { "label": "B", "x": 6.25, "y": 4.25 }, + { "label": "N", "x": 7.25, "y": 4.25 }, + { "label": "M", "x": 8.25, "y": 4.25 }, + { "label": "<", "x": 9.25, "y": 4.25 }, + { "label": ">", "x": 10.25, "y": 4.25 }, + { "label": "?", "x": 11.25, "y": 4.25 }, + { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, + { "label": "End", "x": 15.25, "y": 4.25 }, + + { "label": "\u2191", "x": 14, "y": 4.5 }, + { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, + { "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "Alt", "w": 1.25, "x": 10, "y": 5.25 }, + { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, + { "label": "\u2190", "x": 13, "y": 5.5 }, + { "label": "\u2193", "x": 14, "y": 5.5 }, + { "label": "\u2192", "x": 15, "y": 5.5 } + ] + }, + + "LAYOUT_ansi": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 1.25, "y": 0 }, + { "label": "F2", "x": 2.25, "y": 0 }, + { "label": "F3", "x": 3.25, "y": 0 }, + { "label": "F4", "x": 4.25, "y": 0 }, + { "label": "F5", "x": 5.5, "y": 0 }, + { "label": "F6", "x": 6.5, "y": 0 }, + { "label": "F7", "x": 7.5, "y": 0 }, + { "label": "F8", "x": 8.5, "y": 0 }, + { "label": "F9", "x": 9.75, "y": 0 }, + { "label": "F10", "x": 10.75, "y": 0 }, + { "label": "F11", "x": 11.75, "y": 0 }, + { "label": "F12", "x": 12.75, "y": 0 }, + { "label": "PrtSc", "x": 14, "y": 0 }, + { "label": "Delete", "x": 15.25, "y": 0 }, + + { "label": "~", "x": 0, "y": 1.25 }, + { "label": "!", "x": 1, "y": 1.25 }, + { "label": "@", "x": 2, "y": 1.25 }, + { "label": "#", "x": 3, "y": 1.25 }, + { "label": "$", "x": 4, "y": 1.25 }, + { "label": "%", "x": 5, "y": 1.25 }, + { "label": "^", "x": 6, "y": 1.25 }, + { "label": "&", "x": 7, "y": 1.25 }, + { "label": "*", "x": 8, "y": 1.25 }, + { "label": "(", "x": 9, "y": 1.25 }, + { "label": ")", "x": 10, "y": 1.25 }, + { "label": "_", "x": 11, "y": 1.25 }, + { "label": "+", "x": 12, "y": 1.25 }, + { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "x": 15.25, "y": 1.25 }, + + { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "x": 1.5, "y": 2.25 }, + { "label": "W", "x": 2.5, "y": 2.25 }, + { "label": "E", "x": 3.5, "y": 2.25 }, + { "label": "R", "x": 4.5, "y": 2.25 }, + { "label": "T", "x": 5.5, "y": 2.25 }, + { "label": "Y", "x": 6.5, "y": 2.25 }, + { "label": "U", "x": 7.5, "y": 2.25 }, + { "label": "I", "x": 8.5, "y": 2.25 }, + { "label": "O", "x": 9.5, "y": 2.25 }, + { "label": "P", "x": 10.5, "y": 2.25 }, + { "label": "{", "x": 11.5, "y": 2.25 }, + { "label": "}", "x": 12.5, "y": 2.25 }, + { "label": "|", "w": 1.5, "x": 13.5, "y": 2.25 }, + { "label": "Page Up", "x": 15.25, "y": 2.25 }, + + { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "x": 1.75, "y": 3.25 }, + { "label": "S", "x": 2.75, "y": 3.25 }, + { "label": "D", "x": 3.75, "y": 3.25 }, + { "label": "F", "x": 4.75, "y": 3.25 }, + { "label": "G", "x": 5.75, "y": 3.25 }, + { "label": "H", "x": 6.75, "y": 3.25 }, + { "label": "J", "x": 7.75, "y": 3.25 }, + { "label": "K", "x": 8.75, "y": 3.25 }, + { "label": "L", "x": 9.75, "y": 3.25 }, + { "label": ":", "x": 10.75, "y": 3.25 }, + { "label": "\"", "x": 11.75, "y": 3.25 }, + { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25 }, + { "label": "Page Down", "x": 15.25, "y": 3.25 }, + + { "label": "Shift", "w": 2.25, "x": 0, "y": 4.25 }, + { "label": "Z", "x": 2.25, "y": 4.25 }, + { "label": "X", "x": 3.25, "y": 4.25 }, + { "label": "C", "x": 4.25, "y": 4.25 }, + { "label": "V", "x": 5.25, "y": 4.25 }, + { "label": "B", "x": 6.25, "y": 4.25 }, + { "label": "N", "x": 7.25, "y": 4.25 }, + { "label": "M", "x": 8.25, "y": 4.25 }, + { "label": "<", "x": 9.25, "y": 4.25 }, + { "label": ">", "x": 10.25, "y": 4.25 }, + { "label": "?", "x": 11.25, "y": 4.25 }, + { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, + { "label": "End", "x": 15.25, "y": 4.25 }, + + { "label": "\u2191", "x": 14, "y": 4.5 }, + { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "Fn", "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, + { "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "Alt", "w": 1.25, "x": 10, "y": 5.25 }, + { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, + { "label": "\u2190", "x": 13, "y": 5.5 }, + { "label": "\u2193", "x": 14, "y": 5.5 }, + { "label": "\u2192", "x": 15, "y": 5.5 } + ] + }, + + "LAYOUT_iso": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "F1", "x": 1.25, "y": 0 }, + { "label": "F2", "x": 2.25, "y": 0 }, + { "label": "F3", "x": 3.25, "y": 0 }, + { "label": "F4", "x": 4.25, "y": 0 }, + { "label": "F5", "x": 5.5, "y": 0 }, + { "label": "F6", "x": 6.5, "y": 0 }, + { "label": "F7", "x": 7.5, "y": 0 }, + { "label": "F8", "x": 8.5, "y": 0 }, + { "label": "F9", "x": 9.75, "y": 0 }, + { "label": "F10", "x": 10.75, "y": 0 }, + { "label": "F11", "x": 11.75, "y": 0 }, + { "label": "F12", "x": 12.75, "y": 0 }, + { "label": "PrtSc", "x": 14, "y": 0 }, + { "label": "Delete", "x": 15.25, "y": 0 }, + + { "label": "\u00ac", "x": 0, "y": 1.25 }, + { "label": "!", "x": 1, "y": 1.25 }, + { "label": "\"", "x": 2, "y": 1.25 }, + { "label": "\u00a3", "x": 3, "y": 1.25 }, + { "label": "$", "x": 4, "y": 1.25 }, + { "label": "%", "x": 5, "y": 1.25 }, + { "label": "^", "x": 6, "y": 1.25 }, + { "label": "&", "x": 7, "y": 1.25 }, + { "label": "*", "x": 8, "y": 1.25 }, + { "label": "(", "x": 9, "y": 1.25 }, + { "label": ")", "x": 10, "y": 1.25 }, + { "label": "_", "x": 11, "y": 1.25 }, + { "label": "+", "x": 12, "y": 1.25 }, + { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, + { "label": "Home", "x": 15.25, "y": 1.25 }, + + { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, + { "label": "Q", "x": 1.5, "y": 2.25 }, + { "label": "W", "x": 2.5, "y": 2.25 }, + { "label": "E", "x": 3.5, "y": 2.25 }, + { "label": "R", "x": 4.5, "y": 2.25 }, + { "label": "T", "x": 5.5, "y": 2.25 }, + { "label": "Y", "x": 6.5, "y": 2.25 }, + { "label": "U", "x": 7.5, "y": 2.25 }, + { "label": "I", "x": 8.5, "y": 2.25 }, + { "label": "O", "x": 9.5, "y": 2.25 }, + { "label": "P", "x": 10.5, "y": 2.25 }, + { "label": "{", "x": 11.5, "y": 2.25 }, + { "label": "}", "x": 12.5, "y": 2.25 }, + { "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25 }, + { "label": "PgUp", "x": 15.25, "y": 2.25 }, + + { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, + { "label": "A", "x": 1.75, "y": 3.25 }, + { "label": "S", "x": 2.75, "y": 3.25 }, + { "label": "D", "x": 3.75, "y": 3.25 }, + { "label": "F", "x": 4.75, "y": 3.25 }, + { "label": "G", "x": 5.75, "y": 3.25 }, + { "label": "H", "x": 6.75, "y": 3.25 }, + { "label": "J", "x": 7.75, "y": 3.25 }, + { "label": "K", "x": 8.75, "y": 3.25 }, + { "label": "L", "x": 9.75, "y": 3.25 }, + { "label": ":", "x": 10.75, "y": 3.25 }, + { "label": "@", "x": 11.75, "y": 3.25 }, + { "label": "~", "x": 12.75, "y": 3.25 }, + { "label": "PgDn", "x": 15.25, "y": 3.25 }, + + { "label": "Shift", "w": 1.25, "x": 0, "y": 4.25 }, + { "label": "|", "x": 1.25, "y": 4.25 }, + { "label": "Z", "x": 2.25, "y": 4.25 }, + { "label": "X", "x": 3.25, "y": 4.25 }, + { "label": "C", "x": 4.25, "y": 4.25 }, + { "label": "V", "x": 5.25, "y": 4.25 }, + { "label": "B", "x": 6.25, "y": 4.25 }, + { "label": "N", "x": 7.25, "y": 4.25 }, + { "label": "M", "x": 8.25, "y": 4.25 }, + { "label": "<", "x": 9.25, "y": 4.25 }, + { "label": ">", "x": 10.25, "y": 4.25 }, + { "label": "?", "x": 11.25, "y": 4.25 }, + { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, + { "label": "End", "x": 15.25, "y": 4.25 }, + { "label": "\u2191", "x": 14, "y": 4.5 }, + + { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, + { "label": "Fn", "w": 1.25, "x": 1.25, "y": 5.25 }, + { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, + { "w": 6.25, "x": 3.75, "y": 5.25 }, + { "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25 }, + { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, + { "label": "\u2190", "x": 13, "y": 5.5 }, + { "label": "\u2193", "x": 14, "y": 5.5 }, + { "label": "\u2192", "x": 15, "y": 5.5 } + ] + } + + + } +} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/ansi/keymap.c b/keyboards/anjheos/mugen/keymaps/ansi/keymap.c new file mode 100644 index 000000000000..3c9d469af5a5 --- /dev/null +++ b/keyboards/anjheos/mugen/keymaps/ansi/keymap.c @@ -0,0 +1,36 @@ +/* Copyright 2022 Anjheos + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_ansi( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + [1] = LAYOUT_ansi( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, + _______, _______, _______, _______, _______, _______, KC_MPRV, _______, KC_MNXT) +}; diff --git a/keyboards/anjheos/mugen/keymaps/default/keymap.c b/keyboards/anjheos/mugen/keymaps/default/keymap.c deleted file mode 100644 index 92fbfead5028..000000000000 --- a/keyboards/anjheos/mugen/keymaps/default/keymap.c +++ /dev/null @@ -1,27 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ - * │Esc│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│PSc│Pse│Del│ - * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤ - * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Hom│ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ \ │PgU│ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ Enter │PgD│ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │ Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ - * │Ctrl│GUI │Alt │ │Alt│GUI│Ctl│ ← │ ↓ │ → │ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ - */ - [0] = LAYOUT_75_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_PAUS, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ) -}; diff --git a/keyboards/anjheos/mugen/keymaps/iso/keymap.c b/keyboards/anjheos/mugen/keymaps/iso/keymap.c new file mode 100644 index 000000000000..6e28fb1d9051 --- /dev/null +++ b/keyboards/anjheos/mugen/keymaps/iso/keymap.c @@ -0,0 +1,39 @@ +/* Copyright 2022 Anjheos + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_iso( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_PGUP, + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + +[1] = LAYOUT_iso( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, + _______, _______, _______, _______, _______, _______, KC_MPRV, _______, KC_MNXT) + +}; + + diff --git a/keyboards/anjheos/mugen/keymaps/via/keymap.c b/keyboards/anjheos/mugen/keymaps/via/keymap.c new file mode 100644 index 000000000000..19c46dda0237 --- /dev/null +++ b/keyboards/anjheos/mugen/keymaps/via/keymap.c @@ -0,0 +1,65 @@ +/* Copyright 2022 Anjheos + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + + [1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, + _______, _______, MO(2), _______, _______, _______, KC_MPRV, _______, KC_MNXT), + + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, MO(3), _______, _______, _______, _______, _______, _______, _______), + + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______) + +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0){ + if (clockwise) { + tap_code(KC_1); + } else { + tap_code(KC_2); + } + } + + return true; +} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/via/readme.md b/keyboards/anjheos/mugen/keymaps/via/readme.md new file mode 100644 index 000000000000..26d4ffab7f0d --- /dev/null +++ b/keyboards/anjheos/mugen/keymaps/via/readme.md @@ -0,0 +1 @@ +# The VIA keymap for the Mugen 75 Prototype diff --git a/keyboards/anjheos/mugen/keymaps/via/rules.mk b/keyboards/anjheos/mugen/keymaps/via/rules.mk new file mode 100644 index 000000000000..16d33cd89fe4 --- /dev/null +++ b/keyboards/anjheos/mugen/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes + diff --git a/keyboards/anjheos/mugen/keymaps/vial/config.h b/keyboards/anjheos/mugen/keymaps/vial/config.h new file mode 100644 index 000000000000..3392d7eee35f --- /dev/null +++ b/keyboards/anjheos/mugen/keymaps/vial/config.h @@ -0,0 +1,7 @@ +/* Copyright 2022 Anjheos*/ + +/* SPDX-License-Identifier: GPL2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x8C, 0x4F, 0xA7, 0x76, 0xE4, 0x4D, 0xCF, 0x78} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/vial/keymap.c b/keyboards/anjheos/mugen/keymaps/vial/keymap.c new file mode 100644 index 000000000000..925eb20c1bb5 --- /dev/null +++ b/keyboards/anjheos/mugen/keymaps/vial/keymap.c @@ -0,0 +1,65 @@ +/* Copyright 2022 Anjheos + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + + [1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, + _______, _______, MO(2), _______, _______, _______, KC_MPRV, _______, KC_MNXT), + + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, MO(3), _______, _______, _______, _______, _______, _______, _______), + + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______) + +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0){ + if (clockwise) { + tap_code(KC_1); + } else { + tap_code(KC_2); + } + } + + return true; +} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/vial/readme.md b/keyboards/anjheos/mugen/keymaps/vial/readme.md new file mode 100644 index 000000000000..1c67ac71c5f0 --- /dev/null +++ b/keyboards/anjheos/mugen/keymaps/vial/readme.md @@ -0,0 +1 @@ +# The Vial keymap for the Mugen 75 (Soldered and Hotswap) diff --git a/keyboards/anjheos/mugen/keymaps/vial/rules.mk b/keyboards/anjheos/mugen/keymaps/vial/rules.mk new file mode 100644 index 000000000000..28c32705ba40 --- /dev/null +++ b/keyboards/anjheos/mugen/keymaps/vial/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes + +VIAL_INSECURE = yes +VIAL_ENCODERS_ENABLE = yes diff --git a/keyboards/anjheos/mugen/mugen.c b/keyboards/anjheos/mugen/mugen.c new file mode 100644 index 000000000000..773882d49624 --- /dev/null +++ b/keyboards/anjheos/mugen/mugen.c @@ -0,0 +1,33 @@ +/* Copyright 2022 Anjheos + * + * 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 "mugen.h" + +#include "quantum.h" + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (index == 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } + return true; +} +#endif diff --git a/keyboards/anjheos/mugen/mugen.h b/keyboards/anjheos/mugen/mugen.h new file mode 100644 index 000000000000..bf753958142e --- /dev/null +++ b/keyboards/anjheos/mugen/mugen.h @@ -0,0 +1,78 @@ +/* Copyright 2022 Anjheos + * + * 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 "quantum.h" + +#define XXX KC_NO + +/* This is a shortcut to help you visually see your layout. + * + * The first section contains all of the arguments representing the physical + * layout of the board and position of the keys. + * + * The second converts the arguments into a two-dimensional array which + * represents the switch matrix. + */ +#define LAYOUT_all( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k3d, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ + k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ + { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ +} + +#define LAYOUT_ansi( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ + k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ + k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \ + { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ + { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ +} + +#define LAYOUT_iso( \ + k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ + k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ + k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ + k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ + k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ + k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ + { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ + { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \ + { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ + { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ +} + diff --git a/keyboards/anjheos/mugen/readme.md b/keyboards/anjheos/mugen/readme.md new file mode 100644 index 000000000000..f6d3924b0b90 --- /dev/null +++ b/keyboards/anjheos/mugen/readme.md @@ -0,0 +1,27 @@ +# anjheos/mugen + +![anjheos/mugen](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Anjheos](https://github.com/Anjheos) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make anjheos/mugen:default + +Flashing example for this keyboard: + + make anjheos/mugen: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 in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/anjheos/mugen/rules.mk b/keyboards/anjheos/mugen/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/anjheos/mugen/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/anjheos/mugen_prototype/config.h b/keyboards/anjheos/mugen_prototype/config.h index 95ed757b187a..20b9daf1826c 100644 --- a/keyboards/anjheos/mugen_prototype/config.h +++ b/keyboards/anjheos/mugen_prototype/config.h @@ -11,27 +11,13 @@ #define MATRIX_ROW_PINS { A9, A8, B14, B12, A2, A4 } #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A5, A6, B7, B6, B5, B4, B3, A15, A3 } #define UNUSED_PINS { B8, B9, B13, B15, A10, A13, A14 } -#define ENCODER_PAD_A { C14 } -#define ENCODER_PAD_B { C13 } -#define ENCODER_DIRECTION_FLIP +#define ENCODER_PAD_A { C13 } +#define ENCODER_PAD_B { C14 } #define ENCODER_RESOLUTION 4 #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ -/* disable debug print */ -//#define NO_DEBUG -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c index e5365ea75747..2cc88aa91ff6 100644 --- a/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c +++ b/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Anjheos +/* Copyright 2022 Anjheos * * 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 @@ -53,11 +53,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0){ if (clockwise) { - tap_code_delay(KC_1, 10); + tap_code(KC_1); } else { - tap_code_delay(KC_2, 10); + tap_code(KC_2); } + } - return false; + return true; } \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/mugen_prototype.c b/keyboards/anjheos/mugen_prototype/mugen_prototype.c index 52304aface70..6ac958f3ded3 100644 --- a/keyboards/anjheos/mugen_prototype/mugen_prototype.c +++ b/keyboards/anjheos/mugen_prototype/mugen_prototype.c @@ -1,4 +1,4 @@ -/* Copyright 2020 Anjheos +/* Copyright 2022 Anjheos * * 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 @@ -15,3 +15,19 @@ */ #include "mugen_prototype.h" + +#include "quantum.h" + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { return false; } + if (index == 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } + return true; +} +#endif diff --git a/keyboards/anjheos/mugen_prototype/mugen_prototype.h b/keyboards/anjheos/mugen_prototype/mugen_prototype.h index 134c340fbee6..bf753958142e 100644 --- a/keyboards/anjheos/mugen_prototype/mugen_prototype.h +++ b/keyboards/anjheos/mugen_prototype/mugen_prototype.h @@ -1,4 +1,4 @@ -/* Copyright 2020 Anjheos +/* Copyright 2022 Anjheos * * 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 @@ -75,20 +75,4 @@ { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ } -/* -#define LAYOUT_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k3d, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ - k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ - k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ - { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ - { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ -} -*/ + From 76774476024f64997a64345ccde7837c14e09094 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Sat, 14 May 2022 22:32:17 -0700 Subject: [PATCH 03/37] Edited readme.md. --- keyboards/anjheos/mugen/readme.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/anjheos/mugen/readme.md b/keyboards/anjheos/mugen/readme.md index f6d3924b0b90..dd2576f03648 100644 --- a/keyboards/anjheos/mugen/readme.md +++ b/keyboards/anjheos/mugen/readme.md @@ -2,19 +2,19 @@ ![anjheos/mugen](imgur.com image replace me!) -*A short description of the keyboard/project* +The Mugen 75 is a top mount keyboard with an edgy side profile design. * Keyboard Maintainer: [Anjheos](https://github.com/Anjheos) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Hardware Supported: Mugen 75 with STM32F303 powered PCB +* Hardware Availability: TBD Make example for this keyboard (after setting up your build environment): - make anjheos/mugen:default + make anjheos/mugen:ansi Flashing example for this keyboard: - make anjheos/mugen:default:flash + make anjheos/mugen:ansi: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 034666eba893d3ba94038f0532b537fd32e493f4 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Tue, 17 May 2022 00:46:07 -0700 Subject: [PATCH 04/37] Updated mugen_prototype config.h --- keyboards/anjheos/mugen_prototype/config.h | 11 +--- keyboards/anjheos/mugen_prototype/info.json | 2 +- .../mugen_prototype/keymaps/vial/config.h | 7 ++ .../mugen_prototype/keymaps/vial/keymap.c | 65 +++++++++++++++++++ .../mugen_prototype/keymaps/vial/readme.md | 1 + .../mugen_prototype/keymaps/vial/rules.mk | 5 ++ keyboards/anjheos/mugen_prototype/rules.mk | 2 - 7 files changed, 82 insertions(+), 11 deletions(-) create mode 100644 keyboards/anjheos/mugen_prototype/keymaps/vial/config.h create mode 100644 keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c create mode 100644 keyboards/anjheos/mugen_prototype/keymaps/vial/readme.md create mode 100644 keyboards/anjheos/mugen_prototype/keymaps/vial/rules.mk diff --git a/keyboards/anjheos/mugen_prototype/config.h b/keyboards/anjheos/mugen_prototype/config.h index 20b9daf1826c..d6b9102dedf0 100644 --- a/keyboards/anjheos/mugen_prototype/config.h +++ b/keyboards/anjheos/mugen_prototype/config.h @@ -3,16 +3,11 @@ #pragma once -#define PRODUCT Mugen 75 Prototype +#define PRODUCT Mugen 75 Solder Prototype -#define MATRIX_ROWS 6 -#define MATRIX_COLS 15 -#define MATRIX_ROW_PINS { A9, A8, B14, B12, A2, A4 } -#define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A5, A6, B7, B6, B5, B4, B3, A15, A3 } -#define UNUSED_PINS { B8, B9, B13, B15, A10, A13, A14 } -#define ENCODER_PAD_A { C13 } -#define ENCODER_PAD_B { C14 } +#define ENCODERS_PAD_A { C14 } +#define ENCODERS_PAD_B { C13 } #define ENCODER_RESOLUTION 4 diff --git a/keyboards/anjheos/mugen_prototype/info.json b/keyboards/anjheos/mugen_prototype/info.json index ebe7714ae611..3c616cf78f29 100644 --- a/keyboards/anjheos/mugen_prototype/info.json +++ b/keyboards/anjheos/mugen_prototype/info.json @@ -20,7 +20,7 @@ "url": "", "usb": { "device_version": "1.0.0", - "pid": "0x0001", + "pid": "0x0000", "vid": "0x4168" }, "layouts": { diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/config.h b/keyboards/anjheos/mugen_prototype/keymaps/vial/config.h new file mode 100644 index 000000000000..9786b635e82b --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/keymaps/vial/config.h @@ -0,0 +1,7 @@ +/* Copyright 2022 Anjheos*/ + +/* SPDX-License-Identifier: GPL2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x31, 0xC3, 0x43, 0x59, 0x49, 0x66, 0x0C, 0x8C} \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c new file mode 100644 index 000000000000..925eb20c1bb5 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c @@ -0,0 +1,65 @@ +/* Copyright 2022 Anjheos + * + * 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 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + +[0] = LAYOUT_all( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + + + [1] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, + _______, _______, MO(2), _______, _______, _______, KC_MPRV, _______, KC_MNXT), + + [2] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, MO(3), _______, _______, _______, _______, _______, _______, _______), + + [3] = LAYOUT_all( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______) + +}; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (index == 0){ + if (clockwise) { + tap_code(KC_1); + } else { + tap_code(KC_2); + } + } + + return true; +} \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/readme.md b/keyboards/anjheos/mugen_prototype/keymaps/vial/readme.md new file mode 100644 index 000000000000..e325b4d9bd55 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/keymaps/vial/readme.md @@ -0,0 +1 @@ +# The Vial keymap for the Mugen 75 Soldered Prototype diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/rules.mk b/keyboards/anjheos/mugen_prototype/keymaps/vial/rules.mk new file mode 100644 index 000000000000..28c32705ba40 --- /dev/null +++ b/keyboards/anjheos/mugen_prototype/keymaps/vial/rules.mk @@ -0,0 +1,5 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes + +VIAL_INSECURE = yes +VIAL_ENCODERS_ENABLE = yes diff --git a/keyboards/anjheos/mugen_prototype/rules.mk b/keyboards/anjheos/mugen_prototype/rules.mk index 9007415b42e6..6e7633bfe015 100644 --- a/keyboards/anjheos/mugen_prototype/rules.mk +++ b/keyboards/anjheos/mugen_prototype/rules.mk @@ -1,3 +1 @@ # This file intentionally left blank -EXTRAKEY_ENABLE = yes -MOUSEKEY_ENABLE = yes \ No newline at end of file From 2837175201de8ffe84aa3e0f16c84b318dfe73df Mon Sep 17 00:00:00 2001 From: Anjheos Date: Thu, 19 May 2022 12:42:02 -0700 Subject: [PATCH 05/37] Added rotary encoder support to mugen and mugen_prototype. --- keyboards/anjheos/mugen/config.h | 6 +- keyboards/anjheos/mugen/info.json | 2 +- keyboards/anjheos/mugen/keymaps/ansi/keymap.c | 17 +++++ keyboards/anjheos/mugen/keymaps/iso/keymap.c | 19 ++++++ keyboards/anjheos/mugen/keymaps/via/keymap.c | 65 ------------------- keyboards/anjheos/mugen/keymaps/via/readme.md | 1 - keyboards/anjheos/mugen/keymaps/via/rules.mk | 2 - keyboards/anjheos/mugen/keymaps/vial/config.h | 6 +- keyboards/anjheos/mugen/keymaps/vial/keymap.c | 11 ---- keyboards/anjheos/mugen/mugen.c | 14 +--- keyboards/anjheos/mugen/mugen.h | 8 --- keyboards/anjheos/mugen/rules.mk | 3 +- keyboards/anjheos/mugen_prototype/config.h | 6 +- keyboards/anjheos/mugen_prototype/info.json | 2 +- .../mugen_prototype/keymaps/ansi/keymap.c | 39 ++++++++++- .../mugen_prototype/keymaps/iso/keymap.c | 17 +++++ .../mugen_prototype/keymaps/via/keymap.c | 18 +++-- .../mugen_prototype/keymaps/vial/config.h | 6 +- .../mugen_prototype/keymaps/vial/keymap.c | 12 ---- .../anjheos/mugen_prototype/mugen_prototype.c | 13 ---- keyboards/anjheos/mugen_prototype/rules.mk | 1 + 21 files changed, 123 insertions(+), 145 deletions(-) delete mode 100644 keyboards/anjheos/mugen/keymaps/via/keymap.c delete mode 100644 keyboards/anjheos/mugen/keymaps/via/readme.md delete mode 100644 keyboards/anjheos/mugen/keymaps/via/rules.mk diff --git a/keyboards/anjheos/mugen/config.h b/keyboards/anjheos/mugen/config.h index ca2491983404..0107a48e3bf4 100644 --- a/keyboards/anjheos/mugen/config.h +++ b/keyboards/anjheos/mugen/config.h @@ -8,9 +8,9 @@ #define PRODUCT Mugen 75 Ver 1.0 -#define ENCODER_PAD_A { C14 } -#define ENCODER_PAD_B { C13 } -#define ENCODER_RESOLUTION 4 +#define ENCODERS_PAD_A { C14 } +#define ENCODERS_PAD_B { C13 } +#define ENCODER_RESOLUTION 2 #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/anjheos/mugen/info.json b/keyboards/anjheos/mugen/info.json index 69530089d6b7..7ee183dde5cf 100644 --- a/keyboards/anjheos/mugen/info.json +++ b/keyboards/anjheos/mugen/info.json @@ -40,7 +40,7 @@ { "label": "F11", "x": 11.75, "y": 0 }, { "label": "F12", "x": 12.75, "y": 0 }, { "label": "PrtSc", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.25, "y": 0.5 }, + { "label": "Delete", "x": 15.25, "y": 0 }, { "label": "~", "x": 0, "y": 1.25 }, diff --git a/keyboards/anjheos/mugen/keymaps/ansi/keymap.c b/keyboards/anjheos/mugen/keymaps/ansi/keymap.c index 3c9d469af5a5..8bad4c21f89d 100644 --- a/keyboards/anjheos/mugen/keymaps/ansi/keymap.c +++ b/keyboards/anjheos/mugen/keymaps/ansi/keymap.c @@ -34,3 +34,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, _______, _______, _______, _______, _______, _______, KC_MPRV, _______, KC_MNXT) }; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (get_highest_layer(layer_state|default_layer_state) == 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } else { + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + } + return false; +} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/iso/keymap.c b/keyboards/anjheos/mugen/keymaps/iso/keymap.c index 6e28fb1d9051..794dcf716995 100644 --- a/keyboards/anjheos/mugen/keymaps/iso/keymap.c +++ b/keyboards/anjheos/mugen/keymaps/iso/keymap.c @@ -36,4 +36,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; +bool encoder_update_user(uint8_t index, bool clockwise) { + if (get_highest_layer(layer_state|default_layer_state) == 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } else { + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + } + return false; +} + + + diff --git a/keyboards/anjheos/mugen/keymaps/via/keymap.c b/keyboards/anjheos/mugen/keymaps/via/keymap.c deleted file mode 100644 index 19c46dda0237..000000000000 --- a/keyboards/anjheos/mugen/keymaps/via/keymap.c +++ /dev/null @@ -1,65 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -[0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - - [1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, - _______, _______, MO(2), _______, _______, _______, KC_MPRV, _______, KC_MNXT), - - [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, MO(3), _______, _______, _______, _______, _______, _______, _______), - - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______) - -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0){ - if (clockwise) { - tap_code(KC_1); - } else { - tap_code(KC_2); - } - } - - return true; -} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/via/readme.md b/keyboards/anjheos/mugen/keymaps/via/readme.md deleted file mode 100644 index 26d4ffab7f0d..000000000000 --- a/keyboards/anjheos/mugen/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA keymap for the Mugen 75 Prototype diff --git a/keyboards/anjheos/mugen/keymaps/via/rules.mk b/keyboards/anjheos/mugen/keymaps/via/rules.mk deleted file mode 100644 index 16d33cd89fe4..000000000000 --- a/keyboards/anjheos/mugen/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes - diff --git a/keyboards/anjheos/mugen/keymaps/vial/config.h b/keyboards/anjheos/mugen/keymaps/vial/config.h index 3392d7eee35f..36c5c7461a12 100644 --- a/keyboards/anjheos/mugen/keymaps/vial/config.h +++ b/keyboards/anjheos/mugen/keymaps/vial/config.h @@ -4,4 +4,8 @@ #pragma once -#define VIAL_KEYBOARD_UID {0x8C, 0x4F, 0xA7, 0x76, 0xE4, 0x4D, 0xCF, 0x78} \ No newline at end of file +#define VIAL_KEYBOARD_UID {0x8C, 0x4F, 0xA7, 0x76, 0xE4, 0x4D, 0xCF, 0x78} + +#define VIAL_ENCODER_DEFAULT {KC_VOLD, KC_VOLU, KC_WH_D, KC_WH_U, KC_WH_L, KC_WH_R, KC_TRNS, KC_TRNS,} + +#define VIAL_ENCODER_KEYCODE_DELAY 10 \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/vial/keymap.c b/keyboards/anjheos/mugen/keymaps/vial/keymap.c index 925eb20c1bb5..e685127b880e 100644 --- a/keyboards/anjheos/mugen/keymaps/vial/keymap.c +++ b/keyboards/anjheos/mugen/keymaps/vial/keymap.c @@ -52,14 +52,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0){ - if (clockwise) { - tap_code(KC_1); - } else { - tap_code(KC_2); - } - } - - return true; -} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/mugen.c b/keyboards/anjheos/mugen/mugen.c index 773882d49624..3dd4ed2c1206 100644 --- a/keyboards/anjheos/mugen/mugen.c +++ b/keyboards/anjheos/mugen/mugen.c @@ -18,16 +18,4 @@ #include "quantum.h" -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif + diff --git a/keyboards/anjheos/mugen/mugen.h b/keyboards/anjheos/mugen/mugen.h index bf753958142e..4fca9103279e 100644 --- a/keyboards/anjheos/mugen/mugen.h +++ b/keyboards/anjheos/mugen/mugen.h @@ -20,14 +20,6 @@ #define XXX KC_NO -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ #define LAYOUT_all( \ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k3d, k1d, k1e, \ diff --git a/keyboards/anjheos/mugen/rules.mk b/keyboards/anjheos/mugen/rules.mk index 6e7633bfe015..42c0c48fe586 100644 --- a/keyboards/anjheos/mugen/rules.mk +++ b/keyboards/anjheos/mugen/rules.mk @@ -1 +1,2 @@ -# This file intentionally left blank +# Copyright 2022 Anjheos (@Anjheos) +ENCODER_ENABLE = yes diff --git a/keyboards/anjheos/mugen_prototype/config.h b/keyboards/anjheos/mugen_prototype/config.h index d6b9102dedf0..a6fda6e0fe30 100644 --- a/keyboards/anjheos/mugen_prototype/config.h +++ b/keyboards/anjheos/mugen_prototype/config.h @@ -6,9 +6,9 @@ #define PRODUCT Mugen 75 Solder Prototype -#define ENCODERS_PAD_A { C14 } -#define ENCODERS_PAD_B { C13 } -#define ENCODER_RESOLUTION 4 +#define ENCODERS_PAD_A { C13 } +#define ENCODERS_PAD_B { C14 } +#define ENCODER_RESOLUTION 2 #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/anjheos/mugen_prototype/info.json b/keyboards/anjheos/mugen_prototype/info.json index 3c616cf78f29..a7f69d04ee31 100644 --- a/keyboards/anjheos/mugen_prototype/info.json +++ b/keyboards/anjheos/mugen_prototype/info.json @@ -40,7 +40,7 @@ { "label": "F11", "x": 11.75, "y": 0 }, { "label": "F12", "x": 12.75, "y": 0 }, { "label": "PrtSc", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.25, "y": 0.5 }, + { "label": "Delete", "x": 15.25, "y": 0 }, { "label": "~", "x": 0, "y": 1.25 }, diff --git a/keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c index 8cc64431112a..8bad4c21f89d 100644 --- a/keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c +++ b/keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c @@ -1,14 +1,30 @@ +/* Copyright 2022 Anjheos + * + * 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 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), + KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, @@ -18,3 +34,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, _______, _______, _______, _______, _______, _______, KC_MPRV, _______, KC_MNXT) }; + +bool encoder_update_user(uint8_t index, bool clockwise) { + if (get_highest_layer(layer_state|default_layer_state) == 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } else { + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + } + return false; +} \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c index 85134d220d72..94f3990bb4fe 100644 --- a/keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c +++ b/keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c @@ -36,4 +36,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; +bool encoder_update_user(uint8_t index, bool clockwise) { + if (get_highest_layer(layer_state|default_layer_state) == 0) { + if (clockwise) { + tap_code_delay(KC_VOLU, 10); + } else { + tap_code_delay(KC_VOLD, 10); + } + } else { + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); + } + } + return false; +} + diff --git a/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c index 2cc88aa91ff6..7ced5f30b65f 100644 --- a/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c +++ b/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c @@ -53,13 +53,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0){ + if (get_highest_layer(layer_state|default_layer_state) == 0) { if (clockwise) { - tap_code(KC_1); + tap_code_delay(KC_VOLU, 10); } else { - tap_code(KC_2); + tap_code_delay(KC_VOLD, 10); + } + } else { + if (clockwise) { + tap_code(KC_WH_U); + } else { + tap_code(KC_WH_D); } } - - return true; -} \ No newline at end of file + return false; +} + diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/config.h b/keyboards/anjheos/mugen_prototype/keymaps/vial/config.h index 9786b635e82b..6f7a1eb95b8a 100644 --- a/keyboards/anjheos/mugen_prototype/keymaps/vial/config.h +++ b/keyboards/anjheos/mugen_prototype/keymaps/vial/config.h @@ -4,4 +4,8 @@ #pragma once -#define VIAL_KEYBOARD_UID {0x31, 0xC3, 0x43, 0x59, 0x49, 0x66, 0x0C, 0x8C} \ No newline at end of file +#define VIAL_KEYBOARD_UID {0x31, 0xC3, 0x43, 0x59, 0x49, 0x66, 0x0C, 0x8C} + +#define VIAL_ENCODER_DEFAULT {KC_VOLD, KC_VOLU, KC_WH_D, KC_WH_U, KC_WH_L, KC_WH_R, KC_TRNS, KC_TRNS,} + +#define VIAL_ENCODER_KEYCODE_DELAY 10 \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c index 925eb20c1bb5..fd2536f216bc 100644 --- a/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c +++ b/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c @@ -51,15 +51,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______) }; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (index == 0){ - if (clockwise) { - tap_code(KC_1); - } else { - tap_code(KC_2); - } - } - - return true; -} \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/mugen_prototype.c b/keyboards/anjheos/mugen_prototype/mugen_prototype.c index 6ac958f3ded3..5fbcbd74cfe7 100644 --- a/keyboards/anjheos/mugen_prototype/mugen_prototype.c +++ b/keyboards/anjheos/mugen_prototype/mugen_prototype.c @@ -18,16 +18,3 @@ #include "quantum.h" -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif diff --git a/keyboards/anjheos/mugen_prototype/rules.mk b/keyboards/anjheos/mugen_prototype/rules.mk index 6e7633bfe015..33e0a2208f39 100644 --- a/keyboards/anjheos/mugen_prototype/rules.mk +++ b/keyboards/anjheos/mugen_prototype/rules.mk @@ -1 +1,2 @@ # This file intentionally left blank +ENCODER_ENABLE = yes \ No newline at end of file From c0385492490cf64746be93463652638e2174cdc0 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Thu, 19 May 2022 12:58:50 -0700 Subject: [PATCH 06/37] Setup secure unlock combination for Vial. --- keyboards/anjheos/mugen/keymaps/vial/config.h | 5 ++++- keyboards/anjheos/mugen/keymaps/vial/rules.mk | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/anjheos/mugen/keymaps/vial/config.h b/keyboards/anjheos/mugen/keymaps/vial/config.h index 36c5c7461a12..abbfd4013964 100644 --- a/keyboards/anjheos/mugen/keymaps/vial/config.h +++ b/keyboards/anjheos/mugen/keymaps/vial/config.h @@ -8,4 +8,7 @@ #define VIAL_ENCODER_DEFAULT {KC_VOLD, KC_VOLU, KC_WH_D, KC_WH_U, KC_WH_L, KC_WH_R, KC_TRNS, KC_TRNS,} -#define VIAL_ENCODER_KEYCODE_DELAY 10 \ No newline at end of file +#define VIAL_ENCODER_KEYCODE_DELAY 10 + +#define VIAL_UNLOCK_COMBO_ROWS {0, 0} +#define VIAL_UNLOCK_COMBO_COLS {0, 14} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/vial/rules.mk b/keyboards/anjheos/mugen/keymaps/vial/rules.mk index 28c32705ba40..b38ac274091f 100644 --- a/keyboards/anjheos/mugen/keymaps/vial/rules.mk +++ b/keyboards/anjheos/mugen/keymaps/vial/rules.mk @@ -1,5 +1,4 @@ VIA_ENABLE = yes VIAL_ENABLE = yes -VIAL_INSECURE = yes VIAL_ENCODERS_ENABLE = yes From fb28ab03b7e5abaf039d3ca4a7588afe9214e22b Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 23 May 2022 15:14:47 -0700 Subject: [PATCH 07/37] Added Reset in Keymap for easier flashing. --- keyboards/anjheos/mugen/keymaps/vial/keymap.c | 4 ++-- keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/keyboards/anjheos/mugen/keymaps/vial/keymap.c b/keyboards/anjheos/mugen/keymaps/vial/keymap.c index e685127b880e..076c8666dfe3 100644 --- a/keyboards/anjheos/mugen/keymaps/vial/keymap.c +++ b/keyboards/anjheos/mugen/keymaps/vial/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_INS, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, MO(2), _______, _______, _______, KC_MPRV, _______, KC_MNXT), [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c index fd2536f216bc..b71659e095e0 100644 --- a/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c +++ b/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c @@ -26,8 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, +[1] = LAYOUT_all( + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_INS, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, MO(2), _______, _______, _______, KC_MPRV, _______, KC_MNXT), [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 07182cd0622af41777ae8ed090364803affa30c9 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Thu, 19 Jan 2023 19:42:52 -0800 Subject: [PATCH 08/37] Added PT-60J PCB Firmware to Prototypist. --- .../prototypist/pt60j/keymaps/via/keymap.c | 35 +++ .../prototypist/pt60j/keymaps/via/pt_60j.json | 295 ++++++++++++++++++ .../prototypist/pt60j/keymaps/via/rules.mk | 2 + .../prototypist/pt60j/keymaps/via/via.json | 38 +++ 4 files changed, 370 insertions(+) create mode 100644 keyboards/prototypist/pt60j/keymaps/via/keymap.c create mode 100644 keyboards/prototypist/pt60j/keymaps/via/pt_60j.json create mode 100644 keyboards/prototypist/pt60j/keymaps/via/rules.mk create mode 100644 keyboards/prototypist/pt60j/keymaps/via/via.json diff --git a/keyboards/prototypist/pt60j/keymaps/via/keymap.c b/keyboards/prototypist/pt60j/keymaps/via/keymap.c new file mode 100644 index 000000000000..63771dd20d44 --- /dev/null +++ b/keyboards/prototypist/pt60j/keymaps/via/keymap.c @@ -0,0 +1,35 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_default( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_default( + EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_default( + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, MO(3) + ), + + [3] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/prototypist/pt60j/keymaps/via/pt_60j.json b/keyboards/prototypist/pt60j/keymaps/via/pt_60j.json new file mode 100644 index 000000000000..c5064d502cee --- /dev/null +++ b/keyboards/prototypist/pt60j/keymaps/via/pt_60j.json @@ -0,0 +1,295 @@ +{ + "name": "PT-60J", + "vendorProductId": 1347682304, + "macros": ["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""], + "layers": [ + [ + "KC_ESC", + "KC_1", + "KC_2", + "KC_3", + "KC_4", + "KC_5", + "KC_6", + "KC_7", + "KC_8", + "KC_9", + "KC_0", + "KC_MINS", + "KC_EQL", + "KC_BSPC", + "KC_TAB", + "KC_Q", + "KC_W", + "KC_E", + "KC_R", + "KC_T", + "KC_Y", + "KC_U", + "KC_I", + "KC_O", + "KC_P", + "KC_LBRC", + "KC_RBRC", + "KC_ENT", + "KC_LGUI", + "KC_A", + "KC_S", + "KC_D", + "KC_F", + "KC_G", + "KC_H", + "KC_J", + "KC_K", + "KC_L", + "KC_SCLN", + "KC_QUOT", + "KC_NUHS", + "KC_DEL", + "KC_LSFT", + "KC_NUBS", + "KC_Z", + "KC_X", + "KC_C", + "KC_V", + "KC_B", + "KC_N", + "KC_M", + "KC_COMM", + "KC_DOT", + "KC_SLSH", + "KC_RSFT", + "MO(1)", + "KC_LCTL", + "KC_LGUI", + "KC_LALT", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_SPC", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_RALT", + "KC_RGUI", + "KC_APP", + "KC_RCTL" + ], + [ + "KC_GRV", + "KC_F1", + "KC_F2", + "KC_F3", + "KC_F4", + "KC_F5", + "KC_F6", + "KC_F7", + "KC_F8", + "KC_F9", + "KC_F10", + "KC_F11", + "KC_F12", + "KC_F13", + "KC_Q", + "KC_W", + "KC_E", + "KC_R", + "KC_T", + "KC_Y", + "KC_U", + "KC_I", + "KC_O", + "KC_P", + "KC_LBRC", + "KC_RBRC", + "KC_ENT", + "KC_CAPS", + "KC_A", + "KC_S", + "KC_D", + "KC_F", + "KC_G", + "KC_H", + "KC_J", + "KC_K", + "KC_L", + "KC_SCLN", + "KC_QUOT", + "KC_NUHS", + "KC_DEL", + "KC_TAB", + "KC_LSFT", + "KC_NUBS", + "KC_Z", + "KC_X", + "KC_C", + "KC_V", + "KC_B", + "KC_N", + "KC_M", + "KC_COMM", + "KC_DOT", + "KC_SLSH", + "KC_RSFT", + "KC_TRNS", + "KC_LCTL", + "KC_LGUI", + "KC_LALT", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_SPC", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_RALT", + "KC_RGUI", + "KC_APP", + "KC_RCTL" + ], + [ + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "0x2b2a", + "KC_ENT", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "KC_NO", + "0x2900", + "KC_NO", + "KC_NO", + "S(A(LWIN(SWIN(RSFT(ALGR(RWIN(KC_SPC)))))))", + "0x2034", + "0x2221", + "0x3424", + "0x2726", + "0x2e25", + "0x2d36", + "0x3837", + "S(A(LWIN(SWIN(RSFT(ALGR(RWIN(KC_0)))))))", + "0x201f", + "0x2221", + "0x2423", + "0x2625", + "0x3333", + "0x2e36", + "0x3837", + "A(KC_2)", + "S(A(KC_B))", + "LWIN(KC_D)", + "S(LWIN(SWIN(KC_F)))", + "A(LWIN(KC_H))", + "S(A(LWIN(SWIN(KC_J))))", + "(KC_L", + "S(RSFT(KC_N))", + "A(ALGR(KC_P))", + "S(A(RSFT(ALGR(KC_R))))", + "LWIN(RWIN(KC_T))", + "S(LWIN(SWIN(RSFT(RWIN(KC_V)))))", + "A(LWIN(ALGR(RWIN(KC_X))))", + "0x2f1d", + "0x3031", + "0x2d23", + "A(KC_GRV)", + "S(A(KC_B))", + "LWIN(KC_D)", + "S(LWIN(SWIN(KC_F)))", + "A(LWIN(KC_H))", + "S(A(LWIN(SWIN(KC_J))))" + ], + [ + "(KC_L", + "S(RSFT(KC_N))", + "A(ALGR(KC_P))", + "S(A(RSFT(ALGR(KC_R))))", + "LWIN(RWIN(KC_T))", + "S(LWIN(SWIN(RSFT(RWIN(KC_V)))))", + "A(LWIN(ALGR(RWIN(KC_X))))", + "0x2f1d", + "0x3031", + "LT(12,KC_GRV)", + "KC_NO", + "KC_NO", + "C(S(A(LCA(MEH(LWIN(SWIN(LCAG(HYPR(KC_FIND)))))))))", + "0xd400", + "0xffff", + "0xc7ff", + "KC_NO", + "MT(MOD_LGUI | MOD_RGUI,KC_NO)", + "KC_LALT", + "0xe9", + "0xea", + "KC_WWW_HOME", + "KC_WWW_BACK", + "KC_WWW_FORWARD", + "KC_FN13", + "C(KC_LNUM)", + "KC_FN12", + "C(KC_HENK)", + "C(KC_LANG3)", + "C(KC_LANG5)", + "KC_DLR", + "KC_CIRC", + "KC_AMPR", + "KC_ASTR", + "KC_LPRN", + "KC_RPRN", + "S(KC_BSPC)", + "KC_MYCM", + "KC_WWW_SEARCH", + "KC_F20", + "KC_F21", + "KC_LALT", + "0xe9", + "0xea", + "KC_WWW_HOME", + "KC_WWW_BACK", + "KC_WWW_FORWARD", + "KC_FN13", + "C(KC_LNUM)", + "KC_FN12", + "C(KC_HENK)", + "C(KC_LANG3)", + "C(KC_LANG5)", + "KC_DLR", + "KC_CIRC", + "KC_AMPR", + "KC_ASTR", + "KC_LPRN", + "KC_RPRN", + "S(KC_BSPC)", + "KC_MYCM", + "KC_WWW_SEARCH", + "KC_F20", + "KC_F21", + "KC_NO", + "A(KC_I)", + "LT(8,KC_NO)", + "A(KC_K)", + "LT(8,KC_NO)", + "KC_E" + ] + ] +} \ No newline at end of file diff --git a/keyboards/prototypist/pt60j/keymaps/via/rules.mk b/keyboards/prototypist/pt60j/keymaps/via/rules.mk new file mode 100644 index 000000000000..4f7618e9b211 --- /dev/null +++ b/keyboards/prototypist/pt60j/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes diff --git a/keyboards/prototypist/pt60j/keymaps/via/via.json b/keyboards/prototypist/pt60j/keymaps/via/via.json new file mode 100644 index 000000000000..cc86db6e9105 --- /dev/null +++ b/keyboards/prototypist/pt60j/keymaps/via/via.json @@ -0,0 +1,38 @@ +{ + "name": "PT-60J", + "vendorId": "0x5054", + "productId": "0x0001", + "lighting": "none", + "matrix": {"rows": 5, "cols": 14}, + "layouts": { + "labels": [ + "Split Backspace", + "ISO/ANSI", + "Full Right Shift", + "Full Left Shift", + ["Bottom Row", "7U", "7U WKL", "6.25U", "10U", "10U WKL"] + ], + + "keymap": [ + + [{"x":2.5,"c":"#777777"},"0,0",{"c":"#cccccc"},"0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12",{"c":"#aaaaaa","w":2},"0,13\n\n\n0,0",{"x":0.5},"0,13\n\n\n0,1","2,13\n\n\n0,1"], + [{"x":2.5,"c":"#cccccc","w":1.5},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"x":0.25,"c":"#777777","w":1.25,"h":2,"w2":1.5,"h2":1,"x2":-0.25},"1,13\n\n\n1,0",{"x":1,"c":"#aaaaaa","w":1.5},"1,13\n\n\n1,1"], + [{"x":2.5,"w":1.75},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12\n\n\n1,0",{"x":1.5,"c":"#777777","w":2.25},"2,12\n\n\n1,1"], + [{"c":"#aaaaaa","w":2.25},"3,0\n\n\n3,1",{"x":0.25,"w":1.25},"3,0\n\n\n3,0",{"c":"#cccccc"},"3,1\n\n\n3,0","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#aaaaaa","w":1.75},"3,12\n\n\n2,0","3,13\n\n\n2,0",{"x":0.25,"w":2.75},"3,12\n\n\n2,1"], + [{"x":2.5,"w":1.5},"4,0\n\n\n4,0","4,1\n\n\n4,0",{"w":1.5},"4,2\n\n\n4,0",{"w":7},"4,6\n\n\n4,0",{"w":1.5},"4,11\n\n\n4,0","4,12\n\n\n4,0",{"w":1.5},"4,13\n\n\n4,0"], + [{"y":0.25,"x":2.5,"w":1.5},"4,0\n\n\n4,1",{"x":1,"w":1.5},"4,2\n\n\n4,1",{"w":7},"4,6\n\n\n4,1",{"w":1.5},"4,11\n\n\n4,1",{"x":1,"w":1.5},"4,13\n\n\n4,1"], + [{"x":2.5,"w":1.25},"4,0\n\n\n4,2",{"w":1.25},"4,1\n\n\n4,2",{"w":1.25},"4,2\n\n\n4,2",{"w":6.25},"4,6\n\n\n4,2",{"w":1.25},"4,10\n\n\n4,2",{"w":1.25},"4,11\n\n\n4,2",{"w":1.25},"4,12\n\n\n4,2",{"w":1.25},"4,13\n\n\n4,2"], + [{"x":2.5,"w":1.5},"4,0\n\n\n4,3","4,1\n\n\n4,3",{"w":10},"4,6\n\n\n4,3","4,12\n\n\n4,3",{"w":1.5},"4,13\n\n\n4,3"], + [{"x":2.5,"w":1.5},"4,0\n\n\n4,4",{"x":1,"w":10},"4,6\n\n\n4,4",{"x":1,"w":1.5},"4,13\n\n\n4,4"] + + + + + + + ] + + + + } +} \ No newline at end of file From 3f6303cedeae4df4f54f59353fa6e6d418422698 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Thu, 19 Jan 2023 20:24:30 -0800 Subject: [PATCH 09/37] Adding PT-60J PCB Firmware. --- keyboards/prototypist/pt60j/config.h | 22 +++++ keyboards/prototypist/pt60j/info.json | 97 +++++++++++++++++++ .../pt60j/keymaps/default_ansi/keymap.c | 19 ++++ .../pt60j/keymaps/default_iso/keymap.c | 19 ++++ keyboards/prototypist/pt60j/readme.md | 27 ++++++ keyboards/prototypist/pt60j/rules.mk | 3 + 6 files changed, 187 insertions(+) create mode 100644 keyboards/prototypist/pt60j/config.h create mode 100644 keyboards/prototypist/pt60j/info.json create mode 100644 keyboards/prototypist/pt60j/keymaps/default_ansi/keymap.c create mode 100644 keyboards/prototypist/pt60j/keymaps/default_iso/keymap.c create mode 100644 keyboards/prototypist/pt60j/readme.md create mode 100644 keyboards/prototypist/pt60j/rules.mk diff --git a/keyboards/prototypist/pt60j/config.h b/keyboards/prototypist/pt60j/config.h new file mode 100644 index 000000000000..81431cd158b7 --- /dev/null +++ b/keyboards/prototypist/pt60j/config.h @@ -0,0 +1,22 @@ +// Copyright 2023 Josh (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#define BOOTMAGIC_LITE_ROW 0 +#define BOOTMAGIC_LITE_COLUMN 0 +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/prototypist/pt60j/info.json b/keyboards/prototypist/pt60j/info.json new file mode 100644 index 000000000000..1e2cd359c72b --- /dev/null +++ b/keyboards/prototypist/pt60j/info.json @@ -0,0 +1,97 @@ +{ + "manufacturer": "Prototypist", + "keyboard_name": "PT-60J", + "maintainer": "Anjheos", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B12", "B14", "A8", "A9", "A15", "B3", "B7", "B4", "B5", "B6", "A4", "A5", "A6", "A7" ], + "rows": ["B0", "B1", "B2", "B10", "B11"] + }, + "processor": "STM32F303", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x5054" + }, + "layouts": { + "LAYOUT_default": { + "layout": [ + { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, + { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, + { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 }, + { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 }, + { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 }, + { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 }, + { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 }, + { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 }, + { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 }, + { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 }, + { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 }, + { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 }, + { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 }, + { "matrix": [ 0, 13], "label": "Back", "x": 13, "y": 0 }, + { "matrix": [ 2, 13], "label": "Delete", "x": 14, "y": 0 }, + { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 }, + { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 }, + { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 }, + { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 }, + { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 }, + { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 }, + { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 }, + { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 }, + { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 }, + { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, + { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, + { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, + { "matrix": [ 1, 13], "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 }, + { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, + { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, + { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 }, + { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 }, + { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 }, + { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 }, + { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 }, + { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 }, + { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 }, + { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 }, + { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, + { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 }, + + { "matrix": [ 3, 0], "label": "Shift", "w": 1.5, "x": 0, "y": 3 }, + { "matrix": [ 3, 1], "label": "|", "x": 1.5, "y": 3 }, + { "matrix": [ 3, 2], "label": "Z", "x": 2.5, "y": 3 }, + { "matrix": [ 3, 3], "label": "X", "x": 3.5, "y": 3 }, + { "matrix": [ 3, 4], "label": "C", "x": 4.5, "y": 3 }, + { "matrix": [ 3, 5], "label": "V", "x": 5.5, "y": 3 }, + { "matrix": [ 3, 6], "label": "B", "x": 6.5, "y": 3 }, + { "matrix": [ 3, 7], "label": "N", "x": 7.5, "y": 3 }, + { "matrix": [ 3, 8], "label": "M", "x": 8.5, "y": 3 }, + { "matrix": [ 3, 9], "label": "<", "x": 9.5, "y": 3 }, + { "matrix": [ 3, 10], "label": ">", "x": 10.5, "y": 3 }, + { "matrix": [ 3, 11], "label": "?", "x": 11.5, "y": 3 }, + { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.5, "y": 3 }, + { "matrix": [ 3, 13], "label": "Fn", "x": 13.75, "y": 3 }, + { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/prototypist/pt60j/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60j/keymaps/default_ansi/keymap.c new file mode 100644 index 000000000000..cc81b144c7a2 --- /dev/null +++ b/keyboards/prototypist/pt60j/keymaps/default_ansi/keymap.c @@ -0,0 +1,19 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_default( + EE_CLR, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, KC_DEL, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_default( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, KC_DEL, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ) +}; diff --git a/keyboards/prototypist/pt60j/keymaps/default_iso/keymap.c b/keyboards/prototypist/pt60j/keymaps/default_iso/keymap.c new file mode 100644 index 000000000000..89840eca95ee --- /dev/null +++ b/keyboards/prototypist/pt60j/keymaps/default_iso/keymap.c @@ -0,0 +1,19 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_default( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_DEL, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_default( + KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_DEL, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ) +}; diff --git a/keyboards/prototypist/pt60j/readme.md b/keyboards/prototypist/pt60j/readme.md new file mode 100644 index 000000000000..f537c729286f --- /dev/null +++ b/keyboards/prototypist/pt60j/readme.md @@ -0,0 +1,27 @@ +# prototypist/pt60j + +![prototypist/pt60j](imgur.com image replace me!) + +*A short description of the keyboard/project* + +* Keyboard Maintainer: [Josh](https://github.com/Anjheos) +* Hardware Supported: *The PCBs, controllers supported* +* Hardware Availability: *Links to where you can find this hardware* + +Make example for this keyboard (after setting up your build environment): + + make prototypist/pt60j:default + +Flashing example for this keyboard: + + make prototypist/pt60j: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 in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/prototypist/pt60j/rules.mk b/keyboards/prototypist/pt60j/rules.mk new file mode 100644 index 000000000000..923f12be87ff --- /dev/null +++ b/keyboards/prototypist/pt60j/rules.mk @@ -0,0 +1,3 @@ +BOOTMAGIC_ENABLE = yes + + From 6f3f9346aa637a83a97b317a7efc34ed096385d3 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Thu, 19 Jan 2023 20:37:05 -0800 Subject: [PATCH 10/37] Added extra information. --- keyboards/prototypist/pt60j/readme.md | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/keyboards/prototypist/pt60j/readme.md b/keyboards/prototypist/pt60j/readme.md index f537c729286f..adffb56126d0 100644 --- a/keyboards/prototypist/pt60j/readme.md +++ b/keyboards/prototypist/pt60j/readme.md @@ -2,19 +2,25 @@ ![prototypist/pt60j](imgur.com image replace me!) -*A short description of the keyboard/project* +*Proto[Typist] Keyboards' first ever in-house universal 60% PCB designed by Josh (Anjheos). +Features various physical layouts available to fit multiple regional and bottom row layouts. +Default layout is in ISO.* -* Keyboard Maintainer: [Josh](https://github.com/Anjheos) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* +* Keyboard Maintainer: [Josh @ Prototypist](https://github.com/Anjheos) +* Hardware Supported: *PT-60J PCB and PT-60C PCB* +* Hardware Availability: *prototypist.net* Make example for this keyboard (after setting up your build environment): - make prototypist/pt60j:default + make prototypist/pt60j:via + make prototypist/pt60j:default_ansi + make prototypist/pt60j:default_iso Flashing example for this keyboard: - make prototypist/pt60j:default:flash + make prototypist/pt60j:via:flash + make prototypist/pt60j:default_ansi:flash + make prototypist/pt60j:default_iso: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). @@ -23,5 +29,5 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `RESET` if it is available +* **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`**` +* **Keycode in layout**: Press the key mapped to `RESET` if it is available. From 49af5a8692137c36b2dfee62bb8780cf8bdb7479 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Thu, 19 Jan 2023 21:08:53 -0800 Subject: [PATCH 11/37] Updated keymaps for ANSI, ISO and VIA. --- keyboards/prototypist/pt60/config.h | 20 ++++ keyboards/prototypist/pt60/info.json | 97 +++++++++++++++++++ .../pt60/keymaps/default_ansi/keymap.c | 35 +++++++ .../pt60/keymaps/default_iso/keymap.c | 35 +++++++ .../prototypist/pt60/keymaps/via/keymap.c | 35 +++++++ .../prototypist/pt60/keymaps/via/rules.mk | 2 + keyboards/prototypist/pt60/readme.md | 33 +++++++ keyboards/prototypist/pt60/rules.mk | 3 + 8 files changed, 260 insertions(+) create mode 100644 keyboards/prototypist/pt60/config.h create mode 100644 keyboards/prototypist/pt60/info.json create mode 100644 keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c create mode 100644 keyboards/prototypist/pt60/keymaps/default_iso/keymap.c create mode 100644 keyboards/prototypist/pt60/keymaps/via/keymap.c create mode 100644 keyboards/prototypist/pt60/keymaps/via/rules.mk create mode 100644 keyboards/prototypist/pt60/readme.md create mode 100644 keyboards/prototypist/pt60/rules.mk diff --git a/keyboards/prototypist/pt60/config.h b/keyboards/prototypist/pt60/config.h new file mode 100644 index 000000000000..928420ad0411 --- /dev/null +++ b/keyboards/prototypist/pt60/config.h @@ -0,0 +1,20 @@ +// Copyright 2023 Josh (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json new file mode 100644 index 000000000000..884b86008d54 --- /dev/null +++ b/keyboards/prototypist/pt60/info.json @@ -0,0 +1,97 @@ +{ + "manufacturer": "Prototypist", + "keyboard_name": "PT-60", + "maintainer": "Anjheos", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B12", "B14", "A8", "A9", "A15", "B3", "B7", "B4", "B5", "B6", "A4", "A5", "A6", "A7" ], + "rows": ["B0", "B1", "B2", "B10", "B11"] + }, + "processor": "STM32F303", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x5054" + }, + "layouts": { + "LAYOUT_default": { + "layout": [ + { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, + { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, + { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 }, + { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 }, + { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 }, + { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 }, + { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 }, + { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 }, + { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 }, + { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 }, + { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 }, + { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 }, + { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 }, + { "matrix": [ 0, 13], "label": "Back", "x": 13, "y": 0 }, + { "matrix": [ 2, 13], "label": "Delete", "x": 14, "y": 0 }, + { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 }, + { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 }, + { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 }, + { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 }, + { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 }, + { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 }, + { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 }, + { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 }, + { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 }, + { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, + { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, + { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, + { "matrix": [ 1, 13], "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 }, + { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, + { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, + { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 }, + { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 }, + { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 }, + { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 }, + { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 }, + { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 }, + { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 }, + { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 }, + { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, + { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 }, + + { "matrix": [ 3, 0], "label": "Shift", "w": 1.5, "x": 0, "y": 3 }, + { "matrix": [ 3, 1], "label": "|", "x": 1.5, "y": 3 }, + { "matrix": [ 3, 2], "label": "Z", "x": 2.5, "y": 3 }, + { "matrix": [ 3, 3], "label": "X", "x": 3.5, "y": 3 }, + { "matrix": [ 3, 4], "label": "C", "x": 4.5, "y": 3 }, + { "matrix": [ 3, 5], "label": "V", "x": 5.5, "y": 3 }, + { "matrix": [ 3, 6], "label": "B", "x": 6.5, "y": 3 }, + { "matrix": [ 3, 7], "label": "N", "x": 7.5, "y": 3 }, + { "matrix": [ 3, 8], "label": "M", "x": 8.5, "y": 3 }, + { "matrix": [ 3, 9], "label": "<", "x": 9.5, "y": 3 }, + { "matrix": [ 3, 10], "label": ">", "x": 10.5, "y": 3 }, + { "matrix": [ 3, 11], "label": "?", "x": 11.5, "y": 3 }, + { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.5, "y": 3 }, + { "matrix": [ 3, 13], "label": "Fn", "x": 13.75, "y": 3 }, + { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c new file mode 100644 index 000000000000..63771dd20d44 --- /dev/null +++ b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c @@ -0,0 +1,35 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_default( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_default( + EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_default( + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, MO(3) + ), + + [3] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/prototypist/pt60/keymaps/default_iso/keymap.c b/keyboards/prototypist/pt60/keymaps/default_iso/keymap.c new file mode 100644 index 000000000000..0f35bcb987ad --- /dev/null +++ b/keyboards/prototypist/pt60/keymaps/default_iso/keymap.c @@ -0,0 +1,35 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_default( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_default( + EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_default( + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, MO(3) + ), + + [3] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/prototypist/pt60/keymaps/via/keymap.c b/keyboards/prototypist/pt60/keymaps/via/keymap.c new file mode 100644 index 000000000000..63771dd20d44 --- /dev/null +++ b/keyboards/prototypist/pt60/keymaps/via/keymap.c @@ -0,0 +1,35 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_default( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + ), + + [1] = LAYOUT_default( + EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ), + + [2] = LAYOUT_default( + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, + QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, MO(3) + ), + + [3] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______ + ) +}; diff --git a/keyboards/prototypist/pt60/keymaps/via/rules.mk b/keyboards/prototypist/pt60/keymaps/via/rules.mk new file mode 100644 index 000000000000..4f7618e9b211 --- /dev/null +++ b/keyboards/prototypist/pt60/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md new file mode 100644 index 000000000000..0c74c25c330b --- /dev/null +++ b/keyboards/prototypist/pt60/readme.md @@ -0,0 +1,33 @@ +# prototypist/pt60 + +![prototypist/pt60](imgur.com image replace me!) + +*Proto[Typist] Keyboards' first ever in-house universal 60% PCB designed by Josh (Anjheos). +Features various physical layouts available to fit multiple regional and bottom row layouts. +Default layout is in ISO.* + +* Keyboard Maintainer: [Josh @ Prototypist](https://github.com/Anjheos) +* Hardware Supported: *PT-60J PCB and PT-60C PCB* +* Hardware Availability: *prototypist.net* + +Make example for this keyboard (after setting up your build environment): + + make prototypist/pt60j:via + make prototypist/pt60j:default_ansi + make prototypist/pt60j:default_iso + +Flashing example for this keyboard: + + make prototypist/pt60j:via:flash + make prototypist/pt60j:default_ansi:flash + make prototypist/pt60j:default_iso: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 in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`**` +* **Keycode in layout**: Press the key mapped to `RESET` if it is available. diff --git a/keyboards/prototypist/pt60/rules.mk b/keyboards/prototypist/pt60/rules.mk new file mode 100644 index 000000000000..b28b04f64312 --- /dev/null +++ b/keyboards/prototypist/pt60/rules.mk @@ -0,0 +1,3 @@ + + + From 67253ddaf407bb73b8ac0817dbfa9a76ab3d0006 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Thu, 19 Jan 2023 21:10:49 -0800 Subject: [PATCH 12/37] Updated keymaps for ANSI, ISO and VIA. --- keyboards/prototypist/pt60j/config.h | 22 -- keyboards/prototypist/pt60j/info.json | 97 ------ .../pt60j/keymaps/default_ansi/keymap.c | 19 -- .../pt60j/keymaps/default_iso/keymap.c | 19 -- .../prototypist/pt60j/keymaps/via/keymap.c | 35 --- .../prototypist/pt60j/keymaps/via/pt_60j.json | 295 ------------------ .../prototypist/pt60j/keymaps/via/rules.mk | 2 - .../prototypist/pt60j/keymaps/via/via.json | 38 --- keyboards/prototypist/pt60j/readme.md | 33 -- keyboards/prototypist/pt60j/rules.mk | 3 - 10 files changed, 563 deletions(-) delete mode 100644 keyboards/prototypist/pt60j/config.h delete mode 100644 keyboards/prototypist/pt60j/info.json delete mode 100644 keyboards/prototypist/pt60j/keymaps/default_ansi/keymap.c delete mode 100644 keyboards/prototypist/pt60j/keymaps/default_iso/keymap.c delete mode 100644 keyboards/prototypist/pt60j/keymaps/via/keymap.c delete mode 100644 keyboards/prototypist/pt60j/keymaps/via/pt_60j.json delete mode 100644 keyboards/prototypist/pt60j/keymaps/via/rules.mk delete mode 100644 keyboards/prototypist/pt60j/keymaps/via/via.json delete mode 100644 keyboards/prototypist/pt60j/readme.md delete mode 100644 keyboards/prototypist/pt60j/rules.mk diff --git a/keyboards/prototypist/pt60j/config.h b/keyboards/prototypist/pt60j/config.h deleted file mode 100644 index 81431cd158b7..000000000000 --- a/keyboards/prototypist/pt60j/config.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2023 Josh (@Anjheos) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 0 -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/prototypist/pt60j/info.json b/keyboards/prototypist/pt60j/info.json deleted file mode 100644 index 1e2cd359c72b..000000000000 --- a/keyboards/prototypist/pt60j/info.json +++ /dev/null @@ -1,97 +0,0 @@ -{ - "manufacturer": "Prototypist", - "keyboard_name": "PT-60J", - "maintainer": "Anjheos", - "bootloader": "stm32-dfu", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "cols": ["B12", "B14", "A8", "A9", "A15", "B3", "B7", "B4", "B5", "B6", "A4", "A5", "A6", "A7" ], - "rows": ["B0", "B1", "B2", "B10", "B11"] - }, - "processor": "STM32F303", - "url": "", - "usb": { - "device_version": "1.0.0", - "pid": "0x0001", - "vid": "0x5054" - }, - "layouts": { - "LAYOUT_default": { - "layout": [ - { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, - { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, - { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 }, - { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 }, - { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 }, - { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 }, - { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 }, - { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 }, - { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 }, - { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 }, - { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 }, - { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 }, - { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 }, - { "matrix": [ 0, 13], "label": "Back", "x": 13, "y": 0 }, - { "matrix": [ 2, 13], "label": "Delete", "x": 14, "y": 0 }, - { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 }, - { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 }, - { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 }, - { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 }, - { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 }, - { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 }, - { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 }, - { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 }, - { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 }, - { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, - { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, - { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, - { "matrix": [ 1, 13], "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 }, - { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, - { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, - { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 }, - { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 }, - { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 }, - { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 }, - { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 }, - { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 }, - { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 }, - { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 }, - { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, - { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 }, - - { "matrix": [ 3, 0], "label": "Shift", "w": 1.5, "x": 0, "y": 3 }, - { "matrix": [ 3, 1], "label": "|", "x": 1.5, "y": 3 }, - { "matrix": [ 3, 2], "label": "Z", "x": 2.5, "y": 3 }, - { "matrix": [ 3, 3], "label": "X", "x": 3.5, "y": 3 }, - { "matrix": [ 3, 4], "label": "C", "x": 4.5, "y": 3 }, - { "matrix": [ 3, 5], "label": "V", "x": 5.5, "y": 3 }, - { "matrix": [ 3, 6], "label": "B", "x": 6.5, "y": 3 }, - { "matrix": [ 3, 7], "label": "N", "x": 7.5, "y": 3 }, - { "matrix": [ 3, 8], "label": "M", "x": 8.5, "y": 3 }, - { "matrix": [ 3, 9], "label": "<", "x": 9.5, "y": 3 }, - { "matrix": [ 3, 10], "label": ">", "x": 10.5, "y": 3 }, - { "matrix": [ 3, 11], "label": "?", "x": 11.5, "y": 3 }, - { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.5, "y": 3 }, - { "matrix": [ 3, 13], "label": "Fn", "x": 13.75, "y": 3 }, - { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, - { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, - { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, - { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, - { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, - { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, - { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } - ] - } - } -} \ No newline at end of file diff --git a/keyboards/prototypist/pt60j/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60j/keymaps/default_ansi/keymap.c deleted file mode 100644 index cc81b144c7a2..000000000000 --- a/keyboards/prototypist/pt60j/keymaps/default_ansi/keymap.c +++ /dev/null @@ -1,19 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( - EE_CLR, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, KC_DEL, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL - ), - - [1] = LAYOUT_default( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, KC_DEL, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL - ) -}; diff --git a/keyboards/prototypist/pt60j/keymaps/default_iso/keymap.c b/keyboards/prototypist/pt60j/keymaps/default_iso/keymap.c deleted file mode 100644 index 89840eca95ee..000000000000 --- a/keyboards/prototypist/pt60j/keymaps/default_iso/keymap.c +++ /dev/null @@ -1,19 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( - KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, - KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_DEL, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL - ), - - [1] = LAYOUT_default( - KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_DEL, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, _______, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL - ) -}; diff --git a/keyboards/prototypist/pt60j/keymaps/via/keymap.c b/keyboards/prototypist/pt60j/keymaps/via/keymap.c deleted file mode 100644 index 63771dd20d44..000000000000 --- a/keyboards/prototypist/pt60j/keymaps/via/keymap.c +++ /dev/null @@ -1,35 +0,0 @@ -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, - KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL - ), - - [1] = LAYOUT_default( - EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, - KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ), - - [2] = LAYOUT_default( - _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, MO(3) - ), - - [3] = LAYOUT_default( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______ - ) -}; diff --git a/keyboards/prototypist/pt60j/keymaps/via/pt_60j.json b/keyboards/prototypist/pt60j/keymaps/via/pt_60j.json deleted file mode 100644 index c5064d502cee..000000000000 --- a/keyboards/prototypist/pt60j/keymaps/via/pt_60j.json +++ /dev/null @@ -1,295 +0,0 @@ -{ - "name": "PT-60J", - "vendorProductId": 1347682304, - "macros": ["", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""], - "layers": [ - [ - "KC_ESC", - "KC_1", - "KC_2", - "KC_3", - "KC_4", - "KC_5", - "KC_6", - "KC_7", - "KC_8", - "KC_9", - "KC_0", - "KC_MINS", - "KC_EQL", - "KC_BSPC", - "KC_TAB", - "KC_Q", - "KC_W", - "KC_E", - "KC_R", - "KC_T", - "KC_Y", - "KC_U", - "KC_I", - "KC_O", - "KC_P", - "KC_LBRC", - "KC_RBRC", - "KC_ENT", - "KC_LGUI", - "KC_A", - "KC_S", - "KC_D", - "KC_F", - "KC_G", - "KC_H", - "KC_J", - "KC_K", - "KC_L", - "KC_SCLN", - "KC_QUOT", - "KC_NUHS", - "KC_DEL", - "KC_LSFT", - "KC_NUBS", - "KC_Z", - "KC_X", - "KC_C", - "KC_V", - "KC_B", - "KC_N", - "KC_M", - "KC_COMM", - "KC_DOT", - "KC_SLSH", - "KC_RSFT", - "MO(1)", - "KC_LCTL", - "KC_LGUI", - "KC_LALT", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_SPC", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_RALT", - "KC_RGUI", - "KC_APP", - "KC_RCTL" - ], - [ - "KC_GRV", - "KC_F1", - "KC_F2", - "KC_F3", - "KC_F4", - "KC_F5", - "KC_F6", - "KC_F7", - "KC_F8", - "KC_F9", - "KC_F10", - "KC_F11", - "KC_F12", - "KC_F13", - "KC_Q", - "KC_W", - "KC_E", - "KC_R", - "KC_T", - "KC_Y", - "KC_U", - "KC_I", - "KC_O", - "KC_P", - "KC_LBRC", - "KC_RBRC", - "KC_ENT", - "KC_CAPS", - "KC_A", - "KC_S", - "KC_D", - "KC_F", - "KC_G", - "KC_H", - "KC_J", - "KC_K", - "KC_L", - "KC_SCLN", - "KC_QUOT", - "KC_NUHS", - "KC_DEL", - "KC_TAB", - "KC_LSFT", - "KC_NUBS", - "KC_Z", - "KC_X", - "KC_C", - "KC_V", - "KC_B", - "KC_N", - "KC_M", - "KC_COMM", - "KC_DOT", - "KC_SLSH", - "KC_RSFT", - "KC_TRNS", - "KC_LCTL", - "KC_LGUI", - "KC_LALT", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_SPC", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_RALT", - "KC_RGUI", - "KC_APP", - "KC_RCTL" - ], - [ - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "0x2b2a", - "KC_ENT", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "KC_NO", - "0x2900", - "KC_NO", - "KC_NO", - "S(A(LWIN(SWIN(RSFT(ALGR(RWIN(KC_SPC)))))))", - "0x2034", - "0x2221", - "0x3424", - "0x2726", - "0x2e25", - "0x2d36", - "0x3837", - "S(A(LWIN(SWIN(RSFT(ALGR(RWIN(KC_0)))))))", - "0x201f", - "0x2221", - "0x2423", - "0x2625", - "0x3333", - "0x2e36", - "0x3837", - "A(KC_2)", - "S(A(KC_B))", - "LWIN(KC_D)", - "S(LWIN(SWIN(KC_F)))", - "A(LWIN(KC_H))", - "S(A(LWIN(SWIN(KC_J))))", - "(KC_L", - "S(RSFT(KC_N))", - "A(ALGR(KC_P))", - "S(A(RSFT(ALGR(KC_R))))", - "LWIN(RWIN(KC_T))", - "S(LWIN(SWIN(RSFT(RWIN(KC_V)))))", - "A(LWIN(ALGR(RWIN(KC_X))))", - "0x2f1d", - "0x3031", - "0x2d23", - "A(KC_GRV)", - "S(A(KC_B))", - "LWIN(KC_D)", - "S(LWIN(SWIN(KC_F)))", - "A(LWIN(KC_H))", - "S(A(LWIN(SWIN(KC_J))))" - ], - [ - "(KC_L", - "S(RSFT(KC_N))", - "A(ALGR(KC_P))", - "S(A(RSFT(ALGR(KC_R))))", - "LWIN(RWIN(KC_T))", - "S(LWIN(SWIN(RSFT(RWIN(KC_V)))))", - "A(LWIN(ALGR(RWIN(KC_X))))", - "0x2f1d", - "0x3031", - "LT(12,KC_GRV)", - "KC_NO", - "KC_NO", - "C(S(A(LCA(MEH(LWIN(SWIN(LCAG(HYPR(KC_FIND)))))))))", - "0xd400", - "0xffff", - "0xc7ff", - "KC_NO", - "MT(MOD_LGUI | MOD_RGUI,KC_NO)", - "KC_LALT", - "0xe9", - "0xea", - "KC_WWW_HOME", - "KC_WWW_BACK", - "KC_WWW_FORWARD", - "KC_FN13", - "C(KC_LNUM)", - "KC_FN12", - "C(KC_HENK)", - "C(KC_LANG3)", - "C(KC_LANG5)", - "KC_DLR", - "KC_CIRC", - "KC_AMPR", - "KC_ASTR", - "KC_LPRN", - "KC_RPRN", - "S(KC_BSPC)", - "KC_MYCM", - "KC_WWW_SEARCH", - "KC_F20", - "KC_F21", - "KC_LALT", - "0xe9", - "0xea", - "KC_WWW_HOME", - "KC_WWW_BACK", - "KC_WWW_FORWARD", - "KC_FN13", - "C(KC_LNUM)", - "KC_FN12", - "C(KC_HENK)", - "C(KC_LANG3)", - "C(KC_LANG5)", - "KC_DLR", - "KC_CIRC", - "KC_AMPR", - "KC_ASTR", - "KC_LPRN", - "KC_RPRN", - "S(KC_BSPC)", - "KC_MYCM", - "KC_WWW_SEARCH", - "KC_F20", - "KC_F21", - "KC_NO", - "A(KC_I)", - "LT(8,KC_NO)", - "A(KC_K)", - "LT(8,KC_NO)", - "KC_E" - ] - ] -} \ No newline at end of file diff --git a/keyboards/prototypist/pt60j/keymaps/via/rules.mk b/keyboards/prototypist/pt60j/keymaps/via/rules.mk deleted file mode 100644 index 4f7618e9b211..000000000000 --- a/keyboards/prototypist/pt60j/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -VIAL_ENABLE = yes diff --git a/keyboards/prototypist/pt60j/keymaps/via/via.json b/keyboards/prototypist/pt60j/keymaps/via/via.json deleted file mode 100644 index cc86db6e9105..000000000000 --- a/keyboards/prototypist/pt60j/keymaps/via/via.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "name": "PT-60J", - "vendorId": "0x5054", - "productId": "0x0001", - "lighting": "none", - "matrix": {"rows": 5, "cols": 14}, - "layouts": { - "labels": [ - "Split Backspace", - "ISO/ANSI", - "Full Right Shift", - "Full Left Shift", - ["Bottom Row", "7U", "7U WKL", "6.25U", "10U", "10U WKL"] - ], - - "keymap": [ - - [{"x":2.5,"c":"#777777"},"0,0",{"c":"#cccccc"},"0,1","0,2","0,3","0,4","0,5","0,6","0,7","0,8","0,9","0,10","0,11","0,12",{"c":"#aaaaaa","w":2},"0,13\n\n\n0,0",{"x":0.5},"0,13\n\n\n0,1","2,13\n\n\n0,1"], - [{"x":2.5,"c":"#cccccc","w":1.5},"1,0","1,1","1,2","1,3","1,4","1,5","1,6","1,7","1,8","1,9","1,10","1,11","1,12",{"x":0.25,"c":"#777777","w":1.25,"h":2,"w2":1.5,"h2":1,"x2":-0.25},"1,13\n\n\n1,0",{"x":1,"c":"#aaaaaa","w":1.5},"1,13\n\n\n1,1"], - [{"x":2.5,"w":1.75},"2,0",{"c":"#cccccc"},"2,1","2,2","2,3","2,4","2,5","2,6","2,7","2,8","2,9","2,10","2,11","2,12\n\n\n1,0",{"x":1.5,"c":"#777777","w":2.25},"2,12\n\n\n1,1"], - [{"c":"#aaaaaa","w":2.25},"3,0\n\n\n3,1",{"x":0.25,"w":1.25},"3,0\n\n\n3,0",{"c":"#cccccc"},"3,1\n\n\n3,0","3,2","3,3","3,4","3,5","3,6","3,7","3,8","3,9","3,10","3,11",{"c":"#aaaaaa","w":1.75},"3,12\n\n\n2,0","3,13\n\n\n2,0",{"x":0.25,"w":2.75},"3,12\n\n\n2,1"], - [{"x":2.5,"w":1.5},"4,0\n\n\n4,0","4,1\n\n\n4,0",{"w":1.5},"4,2\n\n\n4,0",{"w":7},"4,6\n\n\n4,0",{"w":1.5},"4,11\n\n\n4,0","4,12\n\n\n4,0",{"w":1.5},"4,13\n\n\n4,0"], - [{"y":0.25,"x":2.5,"w":1.5},"4,0\n\n\n4,1",{"x":1,"w":1.5},"4,2\n\n\n4,1",{"w":7},"4,6\n\n\n4,1",{"w":1.5},"4,11\n\n\n4,1",{"x":1,"w":1.5},"4,13\n\n\n4,1"], - [{"x":2.5,"w":1.25},"4,0\n\n\n4,2",{"w":1.25},"4,1\n\n\n4,2",{"w":1.25},"4,2\n\n\n4,2",{"w":6.25},"4,6\n\n\n4,2",{"w":1.25},"4,10\n\n\n4,2",{"w":1.25},"4,11\n\n\n4,2",{"w":1.25},"4,12\n\n\n4,2",{"w":1.25},"4,13\n\n\n4,2"], - [{"x":2.5,"w":1.5},"4,0\n\n\n4,3","4,1\n\n\n4,3",{"w":10},"4,6\n\n\n4,3","4,12\n\n\n4,3",{"w":1.5},"4,13\n\n\n4,3"], - [{"x":2.5,"w":1.5},"4,0\n\n\n4,4",{"x":1,"w":10},"4,6\n\n\n4,4",{"x":1,"w":1.5},"4,13\n\n\n4,4"] - - - - - - - ] - - - - } -} \ No newline at end of file diff --git a/keyboards/prototypist/pt60j/readme.md b/keyboards/prototypist/pt60j/readme.md deleted file mode 100644 index adffb56126d0..000000000000 --- a/keyboards/prototypist/pt60j/readme.md +++ /dev/null @@ -1,33 +0,0 @@ -# prototypist/pt60j - -![prototypist/pt60j](imgur.com image replace me!) - -*Proto[Typist] Keyboards' first ever in-house universal 60% PCB designed by Josh (Anjheos). -Features various physical layouts available to fit multiple regional and bottom row layouts. -Default layout is in ISO.* - -* Keyboard Maintainer: [Josh @ Prototypist](https://github.com/Anjheos) -* Hardware Supported: *PT-60J PCB and PT-60C PCB* -* Hardware Availability: *prototypist.net* - -Make example for this keyboard (after setting up your build environment): - - make prototypist/pt60j:via - make prototypist/pt60j:default_ansi - make prototypist/pt60j:default_iso - -Flashing example for this keyboard: - - make prototypist/pt60j:via:flash - make prototypist/pt60j:default_ansi:flash - make prototypist/pt60j:default_iso: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 in 3 ways: - -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`**` -* **Keycode in layout**: Press the key mapped to `RESET` if it is available. diff --git a/keyboards/prototypist/pt60j/rules.mk b/keyboards/prototypist/pt60j/rules.mk deleted file mode 100644 index 923f12be87ff..000000000000 --- a/keyboards/prototypist/pt60j/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -BOOTMAGIC_ENABLE = yes - - From 79daf5d1de2bbec1d29d47161885f3d03e0e0b4f Mon Sep 17 00:00:00 2001 From: Anjheos Date: Thu, 19 Jan 2023 23:03:33 -0800 Subject: [PATCH 13/37] Adjusted VIA.json and readme.md. --- keyboards/prototypist/pt60/info.json | 2 +- .../pt60/keymaps/default_ansi/keymap.c | 4 +- keyboards/prototypist/pt60/readme.md | 12 +- keyboards/prototypist/pt80/config.h | 20 +++ keyboards/prototypist/pt80/info.json | 123 ++++++++++++++++++ .../pt80/keymaps/default_ansi/keymap.c | 44 +++++++ .../pt80/keymaps/default_iso/keymap.c | 44 +++++++ .../prototypist/pt80/keymaps/via/keymap.c | 44 +++++++ .../prototypist/pt80/keymaps/via/rules.mk | 2 + keyboards/prototypist/pt80/readme.md | 33 +++++ keyboards/prototypist/pt80/rules.mk | 1 + 11 files changed, 320 insertions(+), 9 deletions(-) create mode 100644 keyboards/prototypist/pt80/config.h create mode 100644 keyboards/prototypist/pt80/info.json create mode 100644 keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c create mode 100644 keyboards/prototypist/pt80/keymaps/default_iso/keymap.c create mode 100644 keyboards/prototypist/pt80/keymaps/via/keymap.c create mode 100644 keyboards/prototypist/pt80/keymaps/via/rules.mk create mode 100644 keyboards/prototypist/pt80/readme.md create mode 100644 keyboards/prototypist/pt80/rules.mk diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index 884b86008d54..13fadf40fbe8 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -1,5 +1,5 @@ { - "manufacturer": "Prototypist", + "manufacturer": "ProtoTypist", "keyboard_name": "PT-60", "maintainer": "Anjheos", "bootloader": "stm32-dfu", diff --git a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c index 63771dd20d44..5a7d2a072a4d 100644 --- a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c @@ -3,8 +3,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_default( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, - KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md index 0c74c25c330b..0ec2e973a2f4 100644 --- a/keyboards/prototypist/pt60/readme.md +++ b/keyboards/prototypist/pt60/readme.md @@ -12,15 +12,15 @@ Default layout is in ISO.* Make example for this keyboard (after setting up your build environment): - make prototypist/pt60j:via - make prototypist/pt60j:default_ansi - make prototypist/pt60j:default_iso + make prototypist/pt60:via + make prototypist/pt60:default_ansi + make prototypist/pt60:default_iso Flashing example for this keyboard: - make prototypist/pt60j:via:flash - make prototypist/pt60j:default_ansi:flash - make prototypist/pt60j:default_iso:flash + make prototypist/pt60:via:flash + make prototypist/pt60:default_ansi:flash + make prototypist/pt60:default_iso: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). diff --git a/keyboards/prototypist/pt80/config.h b/keyboards/prototypist/pt80/config.h new file mode 100644 index 000000000000..396ce8f00d5a --- /dev/null +++ b/keyboards/prototypist/pt80/config.h @@ -0,0 +1,20 @@ +// Copyright 2023 Anjheos (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json new file mode 100644 index 000000000000..f360c355ac01 --- /dev/null +++ b/keyboards/prototypist/pt80/info.json @@ -0,0 +1,123 @@ +{ + "manufacturer": "ProtoTypist", + "keyboard_name": "PT-80", + "maintainer": "Anjheos", + "bootloader": "stm32-dfu", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["B7", "B6", "B5", "B4", "B3", "B0", "A7", "B1", "B2", "B10", "A6", "A5", "A4", "A3", "C13", "A2", "C14"], + "rows": ["B14", "A8", "A9", "B13", "B11", "B12"] + }, + "processor": "STM32F303", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0x5054" + }, + "layouts": { + "LAYOUT_default": { + "layout": [ + { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 }, + { "matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0 }, + { "matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0 }, + { "matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0 }, + { "matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0 }, + { "matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0 }, + { "matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0 }, + { "matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0 }, + { "matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0 }, + { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 }, + { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 }, + { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 }, + { "matrix": [0, 13], "label": "F13", "x": 14, "y": 0 }, + { "matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0 }, + { "matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0 }, + { "matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0 }, + { "matrix": [1, 0], "label": "\u00ac", "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "label": "!", "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "label": "\"", "x": 2, "y": 1.25 }, + { "matrix": [1, 3], "label": "\u00a3", "x": 3, "y": 1.25 }, + { "matrix": [1, 4], "label": "$", "x": 4, "y": 1.25 }, + { "matrix": [1, 5], "label": "%", "x": 5, "y": 1.25 }, + { "matrix": [1, 6], "label": "^", "x": 6, "y": 1.25 }, + { "matrix": [1, 7], "label": "&", "x": 7, "y": 1.25 }, + { "matrix": [1, 8], "label": "*", "x": 8, "y": 1.25 }, + { "matrix": [1, 9], "label": "(", "x": 9, "y": 1.25 }, + { "matrix": [1, 10], "label": ")", "x": 10, "y": 1.25 }, + { "matrix": [1, 11], "label": "_", "x": 11, "y": 1.25 }, + { "matrix": [1, 12], "label": "+", "x": 12, "y": 1.25 }, + { "matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25 }, + { "matrix": [3, 13], "label": "Del", "x": 14, "y": 1.25 }, + { "matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25 }, + { "matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25 }, + { "matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25 }, + { "matrix": [2, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, + { "matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25 }, + { "matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25 }, + { "matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25 }, + { "matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25 }, + { "matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25 }, + { "matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25 }, + { "matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25 }, + { "matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25 }, + { "matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25 }, + { "matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25 }, + { "matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25 }, + { "matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25 }, + { "matrix": [2, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25 }, + { "matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25 }, + { "matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25 }, + { "matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25 }, + { "matrix": [3, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, + { "matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25 }, + { "matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25 }, + { "matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25 }, + { "matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25 }, + { "matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25 }, + { "matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25 }, + { "matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25 }, + { "matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25 }, + { "matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25 }, + { "matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25 }, + { "matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25 }, + { "matrix": [3, 12], "label": "~", "x": 12.75, "y": 3.25 }, + { "matrix": [4, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 4.25 }, + { "matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25 }, + { "matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25 }, + { "matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25 }, + { "matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25 }, + { "matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25 }, + { "matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25 }, + { "matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25 }, + { "matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25 }, + { "matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25 }, + { "matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25 }, + { "matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25 }, + { "matrix": [4, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 4.25 }, + { "matrix": [4, 13], "label": "Fn", "x": 14, "y": 4.25 }, + { "matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25 }, + { "matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, + { "matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25 }, + { "matrix": [5, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, + { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 }, + { "matrix": [5, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25 }, + { "matrix": [5, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 5.25 }, + { "matrix": [5, 12], "label": "Menu", "w": 1.25, "x": 12.5, "y": 5.25 }, + { "matrix": [5, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 5.25 }, + { "matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25 }, + { "matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25 }, + { "matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25 } + ] + } + } +} \ No newline at end of file diff --git a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c new file mode 100644 index 000000000000..89eca5c0b281 --- /dev/null +++ b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c @@ -0,0 +1,44 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_default( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_default( + QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, + + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT + ), + + [2] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ + ), + + [3] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) + +}; diff --git a/keyboards/prototypist/pt80/keymaps/default_iso/keymap.c b/keyboards/prototypist/pt80/keymaps/default_iso/keymap.c new file mode 100644 index 000000000000..aca0b70215d4 --- /dev/null +++ b/keyboards/prototypist/pt80/keymaps/default_iso/keymap.c @@ -0,0 +1,44 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_default( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_default( + QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, + + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT + ), + + [2] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ + ), + + [3] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) + +}; diff --git a/keyboards/prototypist/pt80/keymaps/via/keymap.c b/keyboards/prototypist/pt80/keymaps/via/keymap.c new file mode 100644 index 000000000000..d30b9cd0b03c --- /dev/null +++ b/keyboards/prototypist/pt80/keymaps/via/keymap.c @@ -0,0 +1,44 @@ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_default( + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, + KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + ), + + [1] = LAYOUT_default( + QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, + + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT + ), + + [2] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ + ), + + [3] = LAYOUT_default( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + ) + +}; diff --git a/keyboards/prototypist/pt80/keymaps/via/rules.mk b/keyboards/prototypist/pt80/keymaps/via/rules.mk new file mode 100644 index 000000000000..4f7618e9b211 --- /dev/null +++ b/keyboards/prototypist/pt80/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +VIAL_ENABLE = yes diff --git a/keyboards/prototypist/pt80/readme.md b/keyboards/prototypist/pt80/readme.md new file mode 100644 index 000000000000..83f42a146ac3 --- /dev/null +++ b/keyboards/prototypist/pt80/readme.md @@ -0,0 +1,33 @@ +# prototypist/pt80 + +![prototypist/pt80](imgur.com image replace me!) + +*Proto[Typist] Keyboards' first ever in-house universal TKL PCB designed by Josh (Anjheos). +Features various physical layouts available to fit multiple regional, F-row and bottom row layouts. +Default layout is in ISO.* + +* Keyboard Maintainer: [Josh @ Prototypist](https://github.com/Anjheos) +* Hardware Supported: *PT-80J PCB and PT-80C PCB* +* Hardware Availability: *prototypist.net* + +Make example for this keyboard (after setting up your build environment): + + make prototypist/pt80:via + make prototypist/pt80:default_ansi + make prototypist/pt80:default_iso + +Flashing example for this keyboard: + + make prototypist/pt80:via:flash + make prototypist/pt80:default_ansi:flash + make prototypist/pt80:default_iso: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 in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`**` +* **Keycode in layout**: Press the key mapped to `RESET` if it is available. \ No newline at end of file diff --git a/keyboards/prototypist/pt80/rules.mk b/keyboards/prototypist/pt80/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/prototypist/pt80/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 9939b2c186b1f29bd4f6029234e0c4de93ac2be3 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 14:30:31 -0800 Subject: [PATCH 14/37] Added Hardware Image. --- keyboards/prototypist/pt60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md index 0ec2e973a2f4..5cd50bbd90d7 100644 --- a/keyboards/prototypist/pt60/readme.md +++ b/keyboards/prototypist/pt60/readme.md @@ -1,6 +1,6 @@ # prototypist/pt60 -![prototypist/pt60](imgur.com image replace me!) +![prototypist/pt60](https://imgur.com/Iu3QwxR) *Proto[Typist] Keyboards' first ever in-house universal 60% PCB designed by Josh (Anjheos). Features various physical layouts available to fit multiple regional and bottom row layouts. From d9fea1897ae3509c5ba4b01c0c5abb0892c3ca0d Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 14:31:44 -0800 Subject: [PATCH 15/37] Added Hardware Image. --- keyboards/prototypist/pt60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md index 5cd50bbd90d7..6fec7bd82240 100644 --- a/keyboards/prototypist/pt60/readme.md +++ b/keyboards/prototypist/pt60/readme.md @@ -1,6 +1,6 @@ # prototypist/pt60 -![prototypist/pt60](https://imgur.com/Iu3QwxR) +![prototypist/pt60](https://imgur.com/Iu3QwxR.png) *Proto[Typist] Keyboards' first ever in-house universal 60% PCB designed by Josh (Anjheos). Features various physical layouts available to fit multiple regional and bottom row layouts. From 29f9f4b1fd87caa429603a603b8febc49c488f7f Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 14:34:39 -0800 Subject: [PATCH 16/37] Added Hardware Image. --- keyboards/prototypist/pt60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md index 6fec7bd82240..5457c2a321ee 100644 --- a/keyboards/prototypist/pt60/readme.md +++ b/keyboards/prototypist/pt60/readme.md @@ -8,7 +8,7 @@ Default layout is in ISO.* * Keyboard Maintainer: [Josh @ Prototypist](https://github.com/Anjheos) * Hardware Supported: *PT-60J PCB and PT-60C PCB* -* Hardware Availability: *prototypist.net* +* Hardware Availability: [Proto[Typist]](prototypist.net) Make example for this keyboard (after setting up your build environment): From 3482dadca48aebbb6437ff0ac0bb72d87446e236 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 14:37:14 -0800 Subject: [PATCH 17/37] Added Hardware Image. --- keyboards/prototypist/pt60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md index 5457c2a321ee..63f84c0020d7 100644 --- a/keyboards/prototypist/pt60/readme.md +++ b/keyboards/prototypist/pt60/readme.md @@ -8,7 +8,7 @@ Default layout is in ISO.* * Keyboard Maintainer: [Josh @ Prototypist](https://github.com/Anjheos) * Hardware Supported: *PT-60J PCB and PT-60C PCB* -* Hardware Availability: [Proto[Typist]](prototypist.net) +* Hardware Availability: [Proto[Typist]](https://prototypist.net) Make example for this keyboard (after setting up your build environment): From fa4f3a28cf4f7fbffc44870bf269ef3b7a5835ea Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 14:39:17 -0800 Subject: [PATCH 18/37] Added Hardware Image. --- keyboards/prototypist/pt80/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/prototypist/pt80/readme.md b/keyboards/prototypist/pt80/readme.md index 83f42a146ac3..d468507d0325 100644 --- a/keyboards/prototypist/pt80/readme.md +++ b/keyboards/prototypist/pt80/readme.md @@ -1,6 +1,6 @@ # prototypist/pt80 -![prototypist/pt80](imgur.com image replace me!) +![prototypist/pt80](https://i.imgur.com/voa3ivJ.png) *Proto[Typist] Keyboards' first ever in-house universal TKL PCB designed by Josh (Anjheos). Features various physical layouts available to fit multiple regional, F-row and bottom row layouts. @@ -8,7 +8,7 @@ Default layout is in ISO.* * Keyboard Maintainer: [Josh @ Prototypist](https://github.com/Anjheos) * Hardware Supported: *PT-80J PCB and PT-80C PCB* -* Hardware Availability: *prototypist.net* +* Hardware Availability: [Proto[Typist]](https://prototypist.net) Make example for this keyboard (after setting up your build environment): From 02d30aeb2f210d2293ca24d689681d2495a95fcc Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 17:36:45 -0800 Subject: [PATCH 19/37] Updated License Headers. --- keyboards/prototypist/pt60/info.json | 2 +- keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c | 3 +++ keyboards/prototypist/pt60/keymaps/default_iso/keymap.c | 3 +++ keyboards/prototypist/pt60/keymaps/via/keymap.c | 3 +++ keyboards/prototypist/pt80/config.h | 2 +- keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c | 3 +++ keyboards/prototypist/pt80/keymaps/default_iso/keymap.c | 3 +++ keyboards/prototypist/pt80/keymaps/via/keymap.c | 3 +++ 8 files changed, 20 insertions(+), 2 deletions(-) diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index 13fadf40fbe8..949db015f027 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -1,5 +1,5 @@ { - "manufacturer": "ProtoTypist", + "manufacturer": "Proto[Typist]", "keyboard_name": "PT-60", "maintainer": "Anjheos", "bootloader": "stm32-dfu", diff --git a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c index 5a7d2a072a4d..dde2f90e0dab 100644 --- a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2021 Josh (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/prototypist/pt60/keymaps/default_iso/keymap.c b/keyboards/prototypist/pt60/keymaps/default_iso/keymap.c index 0f35bcb987ad..08bb92e8b012 100644 --- a/keyboards/prototypist/pt60/keymaps/default_iso/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default_iso/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2021 Josh (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/prototypist/pt60/keymaps/via/keymap.c b/keyboards/prototypist/pt60/keymaps/via/keymap.c index 63771dd20d44..210eaf67fc0d 100644 --- a/keyboards/prototypist/pt60/keymaps/via/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/via/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2021 Josh (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/prototypist/pt80/config.h b/keyboards/prototypist/pt80/config.h index 396ce8f00d5a..8f18c4738937 100644 --- a/keyboards/prototypist/pt80/config.h +++ b/keyboards/prototypist/pt80/config.h @@ -1,4 +1,4 @@ -// Copyright 2023 Anjheos (@Anjheos) +// Copyright 2021 Josh (@Anjheos) // SPDX-License-Identifier: GPL-2.0-or-later #pragma once diff --git a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c index 89eca5c0b281..275021dba99c 100644 --- a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2021 Josh (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/prototypist/pt80/keymaps/default_iso/keymap.c b/keyboards/prototypist/pt80/keymaps/default_iso/keymap.c index aca0b70215d4..5b090d285f0d 100644 --- a/keyboards/prototypist/pt80/keymaps/default_iso/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default_iso/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2021 Josh (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/prototypist/pt80/keymaps/via/keymap.c b/keyboards/prototypist/pt80/keymaps/via/keymap.c index d30b9cd0b03c..bdf0e6144b86 100644 --- a/keyboards/prototypist/pt80/keymaps/via/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/via/keymap.c @@ -1,3 +1,6 @@ +// Copyright 2021 Josh (@Anjheos) +// SPDX-License-Identifier: GPL-2.0-or-later + #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { From 614957077d55f6cd4f5128ebbe4dd992775bfb8a Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 17:41:39 -0800 Subject: [PATCH 20/37] Clean up firmware. --- keyboards/anjheos/mugen/config.h | 20 -- keyboards/anjheos/mugen/info.json | 309 ------------------ keyboards/anjheos/mugen/keymaps/ansi/keymap.c | 53 --- keyboards/anjheos/mugen/keymaps/iso/keymap.c | 58 ---- keyboards/anjheos/mugen/keymaps/vial/config.h | 14 - keyboards/anjheos/mugen/keymaps/vial/keymap.c | 54 --- .../anjheos/mugen/keymaps/vial/readme.md | 1 - keyboards/anjheos/mugen/keymaps/vial/rules.mk | 4 - keyboards/anjheos/mugen/mugen.c | 21 -- keyboards/anjheos/mugen/mugen.h | 70 ---- keyboards/anjheos/mugen/readme.md | 27 -- keyboards/anjheos/mugen/rules.mk | 2 - keyboards/anjheos/mugen_prototype/config.h | 18 - keyboards/anjheos/mugen_prototype/info.json | 309 ------------------ .../mugen_prototype/keymaps/ansi/keymap.c | 53 --- .../mugen_prototype/keymaps/iso/keymap.c | 56 ---- .../mugen_prototype/keymaps/via/keymap.c | 71 ---- .../mugen_prototype/keymaps/via/readme.md | 1 - .../mugen_prototype/keymaps/via/rules.mk | 2 - .../mugen_prototype/keymaps/vial/config.h | 11 - .../mugen_prototype/keymaps/vial/keymap.c | 53 --- .../mugen_prototype/keymaps/vial/readme.md | 1 - .../mugen_prototype/keymaps/vial/rules.mk | 5 - .../anjheos/mugen_prototype/mugen_prototype.c | 20 -- .../anjheos/mugen_prototype/mugen_prototype.h | 78 ----- keyboards/anjheos/mugen_prototype/readme.md | 27 -- keyboards/anjheos/mugen_prototype/rules.mk | 2 - 27 files changed, 1340 deletions(-) delete mode 100644 keyboards/anjheos/mugen/config.h delete mode 100644 keyboards/anjheos/mugen/info.json delete mode 100644 keyboards/anjheos/mugen/keymaps/ansi/keymap.c delete mode 100644 keyboards/anjheos/mugen/keymaps/iso/keymap.c delete mode 100644 keyboards/anjheos/mugen/keymaps/vial/config.h delete mode 100644 keyboards/anjheos/mugen/keymaps/vial/keymap.c delete mode 100644 keyboards/anjheos/mugen/keymaps/vial/readme.md delete mode 100644 keyboards/anjheos/mugen/keymaps/vial/rules.mk delete mode 100644 keyboards/anjheos/mugen/mugen.c delete mode 100644 keyboards/anjheos/mugen/mugen.h delete mode 100644 keyboards/anjheos/mugen/readme.md delete mode 100644 keyboards/anjheos/mugen/rules.mk delete mode 100644 keyboards/anjheos/mugen_prototype/config.h delete mode 100644 keyboards/anjheos/mugen_prototype/info.json delete mode 100644 keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c delete mode 100644 keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c delete mode 100644 keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c delete mode 100644 keyboards/anjheos/mugen_prototype/keymaps/via/readme.md delete mode 100644 keyboards/anjheos/mugen_prototype/keymaps/via/rules.mk delete mode 100644 keyboards/anjheos/mugen_prototype/keymaps/vial/config.h delete mode 100644 keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c delete mode 100644 keyboards/anjheos/mugen_prototype/keymaps/vial/readme.md delete mode 100644 keyboards/anjheos/mugen_prototype/keymaps/vial/rules.mk delete mode 100644 keyboards/anjheos/mugen_prototype/mugen_prototype.c delete mode 100644 keyboards/anjheos/mugen_prototype/mugen_prototype.h delete mode 100644 keyboards/anjheos/mugen_prototype/readme.md delete mode 100644 keyboards/anjheos/mugen_prototype/rules.mk diff --git a/keyboards/anjheos/mugen/config.h b/keyboards/anjheos/mugen/config.h deleted file mode 100644 index 0107a48e3bf4..000000000000 --- a/keyboards/anjheos/mugen/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2022 Anjheos (@Anjheos) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "config_common.h" - -#define PRODUCT Mugen 75 Ver 1.0 - - -#define ENCODERS_PAD_A { C14 } -#define ENCODERS_PAD_B { C13 } -#define ENCODER_RESOLUTION 2 - - -#define LOCKING_SUPPORT_ENABLE - -#define LOCKING_RESYNC_ENABLE - - diff --git a/keyboards/anjheos/mugen/info.json b/keyboards/anjheos/mugen/info.json deleted file mode 100644 index 7ee183dde5cf..000000000000 --- a/keyboards/anjheos/mugen/info.json +++ /dev/null @@ -1,309 +0,0 @@ -{ - "manufacturer": "Anjheos", - "keyboard_name": "anjheos/mugen", - "maintainer": "Anjheos", - "bootloader": "stm32-dfu", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "B7", "B6", "B5", "B4", "B3", "A15", "A3"], - "rows": ["A9", "A8", "B14", "B12", "A2", "A4"] - }, - "processor": "STM32F303", - "url": "", - "usb": { - "device_version": "1.0.0", - "pid": "0x0001", - "vid": "0x4168" - }, - "layouts": { - "LAYOUT_all": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 7.5, "y": 0 }, - { "label": "F8", "x": 8.5, "y": 0 }, - { "label": "F9", "x": 9.75, "y": 0 }, - { "label": "F10", "x": 10.75, "y": 0 }, - { "label": "F11", "x": 11.75, "y": 0 }, - { "label": "F12", "x": 12.75, "y": 0 }, - { "label": "PrtSc", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.25, "y": 0 }, - - - { "label": "~", "x": 0, "y": 1.25 }, - { "label": "!", "x": 1, "y": 1.25 }, - { "label": "@", "x": 2, "y": 1.25 }, - { "label": "#", "x": 3, "y": 1.25 }, - { "label": "$", "x": 4, "y": 1.25 }, - { "label": "%", "x": 5, "y": 1.25 }, - { "label": "^", "x": 6, "y": 1.25 }, - { "label": "&", "x": 7, "y": 1.25 }, - { "label": "*", "x": 8, "y": 1.25 }, - { "label": "(", "x": 9, "y": 1.25 }, - { "label": ")", "x": 10, "y": 1.25 }, - { "label": "_", "x": 11, "y": 1.25 }, - { "label": "+", "x": 12, "y": 1.25 }, - { "label": "BckSpc", "x": 13, "y": 1.25}, - { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, - { "label": "Home", "x": 15.25, "y": 1.25 }, - - { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "x": 1.5, "y": 2.25 }, - { "label": "W", "x": 2.5, "y": 2.25 }, - { "label": "E", "x": 3.5, "y": 2.25 }, - { "label": "R", "x": 4.5, "y": 2.25 }, - { "label": "T", "x": 5.5, "y": 2.25 }, - { "label": "Y", "x": 6.5, "y": 2.25 }, - { "label": "U", "x": 7.5, "y": 2.25 }, - { "label": "I", "x": 8.5, "y": 2.25 }, - { "label": "O", "x": 9.5, "y": 2.25 }, - { "label": "P", "x": 10.5, "y": 2.25 }, - { "label": "{", "x": 11.5, "y": 2.25 }, - { "label": "}", "x": 12.5, "y": 2.25 }, - { "label": "|", "w": 1.5, "x": 13.5, "y": 2.25 }, - { "label": "Page Up", "x": 15.25, "y": 2.25 }, - - { "label": "Fn", "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "x": 1.75, "y": 3.25 }, - { "label": "S", "x": 2.75, "y": 3.25 }, - { "label": "D", "x": 3.75, "y": 3.25 }, - { "label": "F", "x": 4.75, "y": 3.25 }, - { "label": "G", "x": 5.75, "y": 3.25 }, - { "label": "H", "x": 6.75, "y": 3.25 }, - { "label": "J", "x": 7.75, "y": 3.25 }, - { "label": "K", "x": 8.75, "y": 3.25 }, - { "label": "L", "x": 9.75, "y": 3.25 }, - { "label": ":", "x": 10.75, "y": 3.25 }, - { "label": "@", "x": 11.75, "y": 3.25 }, - { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25 }, - { "label": "Page Down", "x": 15.25, "y": 3.25 }, - - { "label": "Shift", "w": 2.25, "x": 0, "y": 4.25 }, - { "label": "|", "x": 1.25, "y": 4.25 }, - { "label": "Z", "x": 2.25, "y": 4.25 }, - { "label": "X", "x": 3.25, "y": 4.25 }, - { "label": "C", "x": 4.25, "y": 4.25 }, - { "label": "V", "x": 5.25, "y": 4.25 }, - { "label": "B", "x": 6.25, "y": 4.25 }, - { "label": "N", "x": 7.25, "y": 4.25 }, - { "label": "M", "x": 8.25, "y": 4.25 }, - { "label": "<", "x": 9.25, "y": 4.25 }, - { "label": ">", "x": 10.25, "y": 4.25 }, - { "label": "?", "x": 11.25, "y": 4.25 }, - { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, - { "label": "End", "x": 15.25, "y": 4.25 }, - - { "label": "\u2191", "x": 14, "y": 4.5 }, - { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, - { "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "Alt", "w": 1.25, "x": 10, "y": 5.25 }, - { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, - { "label": "\u2190", "x": 13, "y": 5.5 }, - { "label": "\u2193", "x": 14, "y": 5.5 }, - { "label": "\u2192", "x": 15, "y": 5.5 } - ] - }, - - "LAYOUT_ansi": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 7.5, "y": 0 }, - { "label": "F8", "x": 8.5, "y": 0 }, - { "label": "F9", "x": 9.75, "y": 0 }, - { "label": "F10", "x": 10.75, "y": 0 }, - { "label": "F11", "x": 11.75, "y": 0 }, - { "label": "F12", "x": 12.75, "y": 0 }, - { "label": "PrtSc", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.25, "y": 0 }, - - { "label": "~", "x": 0, "y": 1.25 }, - { "label": "!", "x": 1, "y": 1.25 }, - { "label": "@", "x": 2, "y": 1.25 }, - { "label": "#", "x": 3, "y": 1.25 }, - { "label": "$", "x": 4, "y": 1.25 }, - { "label": "%", "x": 5, "y": 1.25 }, - { "label": "^", "x": 6, "y": 1.25 }, - { "label": "&", "x": 7, "y": 1.25 }, - { "label": "*", "x": 8, "y": 1.25 }, - { "label": "(", "x": 9, "y": 1.25 }, - { "label": ")", "x": 10, "y": 1.25 }, - { "label": "_", "x": 11, "y": 1.25 }, - { "label": "+", "x": 12, "y": 1.25 }, - { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, - { "label": "Home", "x": 15.25, "y": 1.25 }, - - { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "x": 1.5, "y": 2.25 }, - { "label": "W", "x": 2.5, "y": 2.25 }, - { "label": "E", "x": 3.5, "y": 2.25 }, - { "label": "R", "x": 4.5, "y": 2.25 }, - { "label": "T", "x": 5.5, "y": 2.25 }, - { "label": "Y", "x": 6.5, "y": 2.25 }, - { "label": "U", "x": 7.5, "y": 2.25 }, - { "label": "I", "x": 8.5, "y": 2.25 }, - { "label": "O", "x": 9.5, "y": 2.25 }, - { "label": "P", "x": 10.5, "y": 2.25 }, - { "label": "{", "x": 11.5, "y": 2.25 }, - { "label": "}", "x": 12.5, "y": 2.25 }, - { "label": "|", "w": 1.5, "x": 13.5, "y": 2.25 }, - { "label": "Page Up", "x": 15.25, "y": 2.25 }, - - { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "x": 1.75, "y": 3.25 }, - { "label": "S", "x": 2.75, "y": 3.25 }, - { "label": "D", "x": 3.75, "y": 3.25 }, - { "label": "F", "x": 4.75, "y": 3.25 }, - { "label": "G", "x": 5.75, "y": 3.25 }, - { "label": "H", "x": 6.75, "y": 3.25 }, - { "label": "J", "x": 7.75, "y": 3.25 }, - { "label": "K", "x": 8.75, "y": 3.25 }, - { "label": "L", "x": 9.75, "y": 3.25 }, - { "label": ":", "x": 10.75, "y": 3.25 }, - { "label": "\"", "x": 11.75, "y": 3.25 }, - { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25 }, - { "label": "Page Down", "x": 15.25, "y": 3.25 }, - - { "label": "Shift", "w": 2.25, "x": 0, "y": 4.25 }, - { "label": "Z", "x": 2.25, "y": 4.25 }, - { "label": "X", "x": 3.25, "y": 4.25 }, - { "label": "C", "x": 4.25, "y": 4.25 }, - { "label": "V", "x": 5.25, "y": 4.25 }, - { "label": "B", "x": 6.25, "y": 4.25 }, - { "label": "N", "x": 7.25, "y": 4.25 }, - { "label": "M", "x": 8.25, "y": 4.25 }, - { "label": "<", "x": 9.25, "y": 4.25 }, - { "label": ">", "x": 10.25, "y": 4.25 }, - { "label": "?", "x": 11.25, "y": 4.25 }, - { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, - { "label": "End", "x": 15.25, "y": 4.25 }, - - { "label": "\u2191", "x": 14, "y": 4.5 }, - { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Fn", "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, - { "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "Alt", "w": 1.25, "x": 10, "y": 5.25 }, - { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, - { "label": "\u2190", "x": 13, "y": 5.5 }, - { "label": "\u2193", "x": 14, "y": 5.5 }, - { "label": "\u2192", "x": 15, "y": 5.5 } - ] - }, - - "LAYOUT_iso": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 7.5, "y": 0 }, - { "label": "F8", "x": 8.5, "y": 0 }, - { "label": "F9", "x": 9.75, "y": 0 }, - { "label": "F10", "x": 10.75, "y": 0 }, - { "label": "F11", "x": 11.75, "y": 0 }, - { "label": "F12", "x": 12.75, "y": 0 }, - { "label": "PrtSc", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.25, "y": 0 }, - - { "label": "\u00ac", "x": 0, "y": 1.25 }, - { "label": "!", "x": 1, "y": 1.25 }, - { "label": "\"", "x": 2, "y": 1.25 }, - { "label": "\u00a3", "x": 3, "y": 1.25 }, - { "label": "$", "x": 4, "y": 1.25 }, - { "label": "%", "x": 5, "y": 1.25 }, - { "label": "^", "x": 6, "y": 1.25 }, - { "label": "&", "x": 7, "y": 1.25 }, - { "label": "*", "x": 8, "y": 1.25 }, - { "label": "(", "x": 9, "y": 1.25 }, - { "label": ")", "x": 10, "y": 1.25 }, - { "label": "_", "x": 11, "y": 1.25 }, - { "label": "+", "x": 12, "y": 1.25 }, - { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, - { "label": "Home", "x": 15.25, "y": 1.25 }, - - { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "x": 1.5, "y": 2.25 }, - { "label": "W", "x": 2.5, "y": 2.25 }, - { "label": "E", "x": 3.5, "y": 2.25 }, - { "label": "R", "x": 4.5, "y": 2.25 }, - { "label": "T", "x": 5.5, "y": 2.25 }, - { "label": "Y", "x": 6.5, "y": 2.25 }, - { "label": "U", "x": 7.5, "y": 2.25 }, - { "label": "I", "x": 8.5, "y": 2.25 }, - { "label": "O", "x": 9.5, "y": 2.25 }, - { "label": "P", "x": 10.5, "y": 2.25 }, - { "label": "{", "x": 11.5, "y": 2.25 }, - { "label": "}", "x": 12.5, "y": 2.25 }, - { "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25 }, - { "label": "PgUp", "x": 15.25, "y": 2.25 }, - - { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "x": 1.75, "y": 3.25 }, - { "label": "S", "x": 2.75, "y": 3.25 }, - { "label": "D", "x": 3.75, "y": 3.25 }, - { "label": "F", "x": 4.75, "y": 3.25 }, - { "label": "G", "x": 5.75, "y": 3.25 }, - { "label": "H", "x": 6.75, "y": 3.25 }, - { "label": "J", "x": 7.75, "y": 3.25 }, - { "label": "K", "x": 8.75, "y": 3.25 }, - { "label": "L", "x": 9.75, "y": 3.25 }, - { "label": ":", "x": 10.75, "y": 3.25 }, - { "label": "@", "x": 11.75, "y": 3.25 }, - { "label": "~", "x": 12.75, "y": 3.25 }, - { "label": "PgDn", "x": 15.25, "y": 3.25 }, - - { "label": "Shift", "w": 1.25, "x": 0, "y": 4.25 }, - { "label": "|", "x": 1.25, "y": 4.25 }, - { "label": "Z", "x": 2.25, "y": 4.25 }, - { "label": "X", "x": 3.25, "y": 4.25 }, - { "label": "C", "x": 4.25, "y": 4.25 }, - { "label": "V", "x": 5.25, "y": 4.25 }, - { "label": "B", "x": 6.25, "y": 4.25 }, - { "label": "N", "x": 7.25, "y": 4.25 }, - { "label": "M", "x": 8.25, "y": 4.25 }, - { "label": "<", "x": 9.25, "y": 4.25 }, - { "label": ">", "x": 10.25, "y": 4.25 }, - { "label": "?", "x": 11.25, "y": 4.25 }, - { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, - { "label": "End", "x": 15.25, "y": 4.25 }, - { "label": "\u2191", "x": 14, "y": 4.5 }, - - { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Fn", "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, - { "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25 }, - { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, - { "label": "\u2190", "x": 13, "y": 5.5 }, - { "label": "\u2193", "x": 14, "y": 5.5 }, - { "label": "\u2192", "x": 15, "y": 5.5 } - ] - } - - - } -} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/ansi/keymap.c b/keyboards/anjheos/mugen/keymaps/ansi/keymap.c deleted file mode 100644 index 8bad4c21f89d..000000000000 --- a/keyboards/anjheos/mugen/keymaps/ansi/keymap.c +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [1] = LAYOUT_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, - _______, _______, _______, _______, _______, _______, KC_MPRV, _______, KC_MNXT) -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (get_highest_layer(layer_state|default_layer_state) == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } else { - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } - } - return false; -} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/iso/keymap.c b/keyboards/anjheos/mugen/keymaps/iso/keymap.c deleted file mode 100644 index 794dcf716995..000000000000 --- a/keyboards/anjheos/mugen/keymaps/iso/keymap.c +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -[0] = LAYOUT_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_PGUP, - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGDN, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - -[1] = LAYOUT_iso( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, - _______, _______, _______, _______, _______, _______, KC_MPRV, _______, KC_MNXT) - -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (get_highest_layer(layer_state|default_layer_state) == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } else { - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } - } - return false; -} - - - - diff --git a/keyboards/anjheos/mugen/keymaps/vial/config.h b/keyboards/anjheos/mugen/keymaps/vial/config.h deleted file mode 100644 index abbfd4013964..000000000000 --- a/keyboards/anjheos/mugen/keymaps/vial/config.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright 2022 Anjheos*/ - -/* SPDX-License-Identifier: GPL2.0-or-later */ - -#pragma once - -#define VIAL_KEYBOARD_UID {0x8C, 0x4F, 0xA7, 0x76, 0xE4, 0x4D, 0xCF, 0x78} - -#define VIAL_ENCODER_DEFAULT {KC_VOLD, KC_VOLU, KC_WH_D, KC_WH_U, KC_WH_L, KC_WH_R, KC_TRNS, KC_TRNS,} - -#define VIAL_ENCODER_KEYCODE_DELAY 10 - -#define VIAL_UNLOCK_COMBO_ROWS {0, 0} -#define VIAL_UNLOCK_COMBO_COLS {0, 14} \ No newline at end of file diff --git a/keyboards/anjheos/mugen/keymaps/vial/keymap.c b/keyboards/anjheos/mugen/keymaps/vial/keymap.c deleted file mode 100644 index 076c8666dfe3..000000000000 --- a/keyboards/anjheos/mugen/keymaps/vial/keymap.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -[0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - - [1] = LAYOUT_all( - _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_INS, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, - _______, _______, MO(2), _______, _______, _______, KC_MPRV, _______, KC_MNXT), - - [2] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, MO(3), _______, _______, _______, _______, _______, _______, _______), - - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______) - -}; - diff --git a/keyboards/anjheos/mugen/keymaps/vial/readme.md b/keyboards/anjheos/mugen/keymaps/vial/readme.md deleted file mode 100644 index 1c67ac71c5f0..000000000000 --- a/keyboards/anjheos/mugen/keymaps/vial/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The Vial keymap for the Mugen 75 (Soldered and Hotswap) diff --git a/keyboards/anjheos/mugen/keymaps/vial/rules.mk b/keyboards/anjheos/mugen/keymaps/vial/rules.mk deleted file mode 100644 index b38ac274091f..000000000000 --- a/keyboards/anjheos/mugen/keymaps/vial/rules.mk +++ /dev/null @@ -1,4 +0,0 @@ -VIA_ENABLE = yes -VIAL_ENABLE = yes - -VIAL_ENCODERS_ENABLE = yes diff --git a/keyboards/anjheos/mugen/mugen.c b/keyboards/anjheos/mugen/mugen.c deleted file mode 100644 index 3dd4ed2c1206..000000000000 --- a/keyboards/anjheos/mugen/mugen.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 "mugen.h" - -#include "quantum.h" - - diff --git a/keyboards/anjheos/mugen/mugen.h b/keyboards/anjheos/mugen/mugen.h deleted file mode 100644 index 4fca9103279e..000000000000 --- a/keyboards/anjheos/mugen/mugen.h +++ /dev/null @@ -1,70 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k3d, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ - k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ - { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ -} - -#define LAYOUT_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ - k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ - k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \ - { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ - { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ -} - -#define LAYOUT_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ - k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ - { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ -} - diff --git a/keyboards/anjheos/mugen/readme.md b/keyboards/anjheos/mugen/readme.md deleted file mode 100644 index dd2576f03648..000000000000 --- a/keyboards/anjheos/mugen/readme.md +++ /dev/null @@ -1,27 +0,0 @@ -# anjheos/mugen - -![anjheos/mugen](imgur.com image replace me!) - -The Mugen 75 is a top mount keyboard with an edgy side profile design. - -* Keyboard Maintainer: [Anjheos](https://github.com/Anjheos) -* Hardware Supported: Mugen 75 with STM32F303 powered PCB -* Hardware Availability: TBD - -Make example for this keyboard (after setting up your build environment): - - make anjheos/mugen:ansi - -Flashing example for this keyboard: - - make anjheos/mugen:ansi: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 in 3 ways: - -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/anjheos/mugen/rules.mk b/keyboards/anjheos/mugen/rules.mk deleted file mode 100644 index 42c0c48fe586..000000000000 --- a/keyboards/anjheos/mugen/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright 2022 Anjheos (@Anjheos) -ENCODER_ENABLE = yes diff --git a/keyboards/anjheos/mugen_prototype/config.h b/keyboards/anjheos/mugen_prototype/config.h deleted file mode 100644 index a6fda6e0fe30..000000000000 --- a/keyboards/anjheos/mugen_prototype/config.h +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2022 Anjheos (@Anjheos) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define PRODUCT Mugen 75 Solder Prototype - - -#define ENCODERS_PAD_A { C13 } -#define ENCODERS_PAD_B { C14 } -#define ENCODER_RESOLUTION 2 - - -#define LOCKING_SUPPORT_ENABLE - -#define LOCKING_RESYNC_ENABLE - - diff --git a/keyboards/anjheos/mugen_prototype/info.json b/keyboards/anjheos/mugen_prototype/info.json deleted file mode 100644 index a7f69d04ee31..000000000000 --- a/keyboards/anjheos/mugen_prototype/info.json +++ /dev/null @@ -1,309 +0,0 @@ -{ - "manufacturer": "Anjheos", - "keyboard_name": "anjheos/mugen_prototype", - "maintainer": "Anjheos", - "bootloader": "stm32-dfu", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A5", "A6", "B7", "B6", "B5", "B4", "B3", "A15", "A3"], - "rows": ["A9", "A8", "B14", "B12", "A2", "A4"] - }, - "processor": "STM32F303", - "url": "", - "usb": { - "device_version": "1.0.0", - "pid": "0x0000", - "vid": "0x4168" - }, - "layouts": { - "LAYOUT_all": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 7.5, "y": 0 }, - { "label": "F8", "x": 8.5, "y": 0 }, - { "label": "F9", "x": 9.75, "y": 0 }, - { "label": "F10", "x": 10.75, "y": 0 }, - { "label": "F11", "x": 11.75, "y": 0 }, - { "label": "F12", "x": 12.75, "y": 0 }, - { "label": "PrtSc", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.25, "y": 0 }, - - - { "label": "~", "x": 0, "y": 1.25 }, - { "label": "!", "x": 1, "y": 1.25 }, - { "label": "@", "x": 2, "y": 1.25 }, - { "label": "#", "x": 3, "y": 1.25 }, - { "label": "$", "x": 4, "y": 1.25 }, - { "label": "%", "x": 5, "y": 1.25 }, - { "label": "^", "x": 6, "y": 1.25 }, - { "label": "&", "x": 7, "y": 1.25 }, - { "label": "*", "x": 8, "y": 1.25 }, - { "label": "(", "x": 9, "y": 1.25 }, - { "label": ")", "x": 10, "y": 1.25 }, - { "label": "_", "x": 11, "y": 1.25 }, - { "label": "+", "x": 12, "y": 1.25 }, - { "label": "BckSpc", "x": 13, "y": 1.25}, - { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, - { "label": "Home", "x": 15.25, "y": 1.25 }, - - { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "x": 1.5, "y": 2.25 }, - { "label": "W", "x": 2.5, "y": 2.25 }, - { "label": "E", "x": 3.5, "y": 2.25 }, - { "label": "R", "x": 4.5, "y": 2.25 }, - { "label": "T", "x": 5.5, "y": 2.25 }, - { "label": "Y", "x": 6.5, "y": 2.25 }, - { "label": "U", "x": 7.5, "y": 2.25 }, - { "label": "I", "x": 8.5, "y": 2.25 }, - { "label": "O", "x": 9.5, "y": 2.25 }, - { "label": "P", "x": 10.5, "y": 2.25 }, - { "label": "{", "x": 11.5, "y": 2.25 }, - { "label": "}", "x": 12.5, "y": 2.25 }, - { "label": "|", "w": 1.5, "x": 13.5, "y": 2.25 }, - { "label": "Page Up", "x": 15.25, "y": 2.25 }, - - { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "x": 1.75, "y": 3.25 }, - { "label": "S", "x": 2.75, "y": 3.25 }, - { "label": "D", "x": 3.75, "y": 3.25 }, - { "label": "F", "x": 4.75, "y": 3.25 }, - { "label": "G", "x": 5.75, "y": 3.25 }, - { "label": "H", "x": 6.75, "y": 3.25 }, - { "label": "J", "x": 7.75, "y": 3.25 }, - { "label": "K", "x": 8.75, "y": 3.25 }, - { "label": "L", "x": 9.75, "y": 3.25 }, - { "label": ":", "x": 10.75, "y": 3.25 }, - { "label": "@", "x": 11.75, "y": 3.25 }, - { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25 }, - { "label": "Page Down", "x": 15.25, "y": 3.25 }, - - { "label": "Shift", "w": 2.25, "x": 0, "y": 4.25 }, - { "label": "|", "x": 1.25, "y": 4.25 }, - { "label": "Z", "x": 2.25, "y": 4.25 }, - { "label": "X", "x": 3.25, "y": 4.25 }, - { "label": "C", "x": 4.25, "y": 4.25 }, - { "label": "V", "x": 5.25, "y": 4.25 }, - { "label": "B", "x": 6.25, "y": 4.25 }, - { "label": "N", "x": 7.25, "y": 4.25 }, - { "label": "M", "x": 8.25, "y": 4.25 }, - { "label": "<", "x": 9.25, "y": 4.25 }, - { "label": ">", "x": 10.25, "y": 4.25 }, - { "label": "?", "x": 11.25, "y": 4.25 }, - { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, - { "label": "End", "x": 15.25, "y": 4.25 }, - - { "label": "\u2191", "x": 14, "y": 4.5 }, - { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Fn", "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, - { "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "Alt", "w": 1.25, "x": 10, "y": 5.25 }, - { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, - { "label": "\u2190", "x": 13, "y": 5.5 }, - { "label": "\u2193", "x": 14, "y": 5.5 }, - { "label": "\u2192", "x": 15, "y": 5.5 } - ] - }, - - "LAYOUT_ansi": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 7.5, "y": 0 }, - { "label": "F8", "x": 8.5, "y": 0 }, - { "label": "F9", "x": 9.75, "y": 0 }, - { "label": "F10", "x": 10.75, "y": 0 }, - { "label": "F11", "x": 11.75, "y": 0 }, - { "label": "F12", "x": 12.75, "y": 0 }, - { "label": "PrtSc", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.25, "y": 0 }, - - { "label": "~", "x": 0, "y": 1.25 }, - { "label": "!", "x": 1, "y": 1.25 }, - { "label": "@", "x": 2, "y": 1.25 }, - { "label": "#", "x": 3, "y": 1.25 }, - { "label": "$", "x": 4, "y": 1.25 }, - { "label": "%", "x": 5, "y": 1.25 }, - { "label": "^", "x": 6, "y": 1.25 }, - { "label": "&", "x": 7, "y": 1.25 }, - { "label": "*", "x": 8, "y": 1.25 }, - { "label": "(", "x": 9, "y": 1.25 }, - { "label": ")", "x": 10, "y": 1.25 }, - { "label": "_", "x": 11, "y": 1.25 }, - { "label": "+", "x": 12, "y": 1.25 }, - { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, - { "label": "Home", "x": 15.25, "y": 1.25 }, - - { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "x": 1.5, "y": 2.25 }, - { "label": "W", "x": 2.5, "y": 2.25 }, - { "label": "E", "x": 3.5, "y": 2.25 }, - { "label": "R", "x": 4.5, "y": 2.25 }, - { "label": "T", "x": 5.5, "y": 2.25 }, - { "label": "Y", "x": 6.5, "y": 2.25 }, - { "label": "U", "x": 7.5, "y": 2.25 }, - { "label": "I", "x": 8.5, "y": 2.25 }, - { "label": "O", "x": 9.5, "y": 2.25 }, - { "label": "P", "x": 10.5, "y": 2.25 }, - { "label": "{", "x": 11.5, "y": 2.25 }, - { "label": "}", "x": 12.5, "y": 2.25 }, - { "label": "|", "w": 1.5, "x": 13.5, "y": 2.25 }, - { "label": "Page Up", "x": 15.25, "y": 2.25 }, - - { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "x": 1.75, "y": 3.25 }, - { "label": "S", "x": 2.75, "y": 3.25 }, - { "label": "D", "x": 3.75, "y": 3.25 }, - { "label": "F", "x": 4.75, "y": 3.25 }, - { "label": "G", "x": 5.75, "y": 3.25 }, - { "label": "H", "x": 6.75, "y": 3.25 }, - { "label": "J", "x": 7.75, "y": 3.25 }, - { "label": "K", "x": 8.75, "y": 3.25 }, - { "label": "L", "x": 9.75, "y": 3.25 }, - { "label": ":", "x": 10.75, "y": 3.25 }, - { "label": "\"", "x": 11.75, "y": 3.25 }, - { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25 }, - { "label": "Page Down", "x": 15.25, "y": 3.25 }, - - { "label": "Shift", "w": 2.25, "x": 0, "y": 4.25 }, - { "label": "Z", "x": 2.25, "y": 4.25 }, - { "label": "X", "x": 3.25, "y": 4.25 }, - { "label": "C", "x": 4.25, "y": 4.25 }, - { "label": "V", "x": 5.25, "y": 4.25 }, - { "label": "B", "x": 6.25, "y": 4.25 }, - { "label": "N", "x": 7.25, "y": 4.25 }, - { "label": "M", "x": 8.25, "y": 4.25 }, - { "label": "<", "x": 9.25, "y": 4.25 }, - { "label": ">", "x": 10.25, "y": 4.25 }, - { "label": "?", "x": 11.25, "y": 4.25 }, - { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, - { "label": "End", "x": 15.25, "y": 4.25 }, - - { "label": "\u2191", "x": 14, "y": 4.5 }, - { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Fn", "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, - { "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "Alt", "w": 1.25, "x": 10, "y": 5.25 }, - { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, - { "label": "\u2190", "x": 13, "y": 5.5 }, - { "label": "\u2193", "x": 14, "y": 5.5 }, - { "label": "\u2192", "x": 15, "y": 5.5 } - ] - }, - - "LAYOUT_iso": { - "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 1.25, "y": 0 }, - { "label": "F2", "x": 2.25, "y": 0 }, - { "label": "F3", "x": 3.25, "y": 0 }, - { "label": "F4", "x": 4.25, "y": 0 }, - { "label": "F5", "x": 5.5, "y": 0 }, - { "label": "F6", "x": 6.5, "y": 0 }, - { "label": "F7", "x": 7.5, "y": 0 }, - { "label": "F8", "x": 8.5, "y": 0 }, - { "label": "F9", "x": 9.75, "y": 0 }, - { "label": "F10", "x": 10.75, "y": 0 }, - { "label": "F11", "x": 11.75, "y": 0 }, - { "label": "F12", "x": 12.75, "y": 0 }, - { "label": "PrtSc", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.25, "y": 0 }, - - { "label": "\u00ac", "x": 0, "y": 1.25 }, - { "label": "!", "x": 1, "y": 1.25 }, - { "label": "\"", "x": 2, "y": 1.25 }, - { "label": "\u00a3", "x": 3, "y": 1.25 }, - { "label": "$", "x": 4, "y": 1.25 }, - { "label": "%", "x": 5, "y": 1.25 }, - { "label": "^", "x": 6, "y": 1.25 }, - { "label": "&", "x": 7, "y": 1.25 }, - { "label": "*", "x": 8, "y": 1.25 }, - { "label": "(", "x": 9, "y": 1.25 }, - { "label": ")", "x": 10, "y": 1.25 }, - { "label": "_", "x": 11, "y": 1.25 }, - { "label": "+", "x": 12, "y": 1.25 }, - { "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, - { "label": "Home", "x": 15.25, "y": 1.25 }, - - { "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, - { "label": "Q", "x": 1.5, "y": 2.25 }, - { "label": "W", "x": 2.5, "y": 2.25 }, - { "label": "E", "x": 3.5, "y": 2.25 }, - { "label": "R", "x": 4.5, "y": 2.25 }, - { "label": "T", "x": 5.5, "y": 2.25 }, - { "label": "Y", "x": 6.5, "y": 2.25 }, - { "label": "U", "x": 7.5, "y": 2.25 }, - { "label": "I", "x": 8.5, "y": 2.25 }, - { "label": "O", "x": 9.5, "y": 2.25 }, - { "label": "P", "x": 10.5, "y": 2.25 }, - { "label": "{", "x": 11.5, "y": 2.25 }, - { "label": "}", "x": 12.5, "y": 2.25 }, - { "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25 }, - { "label": "PgUp", "x": 15.25, "y": 2.25 }, - - { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, - { "label": "A", "x": 1.75, "y": 3.25 }, - { "label": "S", "x": 2.75, "y": 3.25 }, - { "label": "D", "x": 3.75, "y": 3.25 }, - { "label": "F", "x": 4.75, "y": 3.25 }, - { "label": "G", "x": 5.75, "y": 3.25 }, - { "label": "H", "x": 6.75, "y": 3.25 }, - { "label": "J", "x": 7.75, "y": 3.25 }, - { "label": "K", "x": 8.75, "y": 3.25 }, - { "label": "L", "x": 9.75, "y": 3.25 }, - { "label": ":", "x": 10.75, "y": 3.25 }, - { "label": "@", "x": 11.75, "y": 3.25 }, - { "label": "~", "x": 12.75, "y": 3.25 }, - { "label": "PgDn", "x": 15.25, "y": 3.25 }, - - { "label": "Shift", "w": 1.25, "x": 0, "y": 4.25 }, - { "label": "|", "x": 1.25, "y": 4.25 }, - { "label": "Z", "x": 2.25, "y": 4.25 }, - { "label": "X", "x": 3.25, "y": 4.25 }, - { "label": "C", "x": 4.25, "y": 4.25 }, - { "label": "V", "x": 5.25, "y": 4.25 }, - { "label": "B", "x": 6.25, "y": 4.25 }, - { "label": "N", "x": 7.25, "y": 4.25 }, - { "label": "M", "x": 8.25, "y": 4.25 }, - { "label": "<", "x": 9.25, "y": 4.25 }, - { "label": ">", "x": 10.25, "y": 4.25 }, - { "label": "?", "x": 11.25, "y": 4.25 }, - { "label": "Shift", "w": 1.5, "x": 12.25, "y": 4.25 }, - { "label": "End", "x": 15.25, "y": 4.25 }, - { "label": "\u2191", "x": 14, "y": 4.5 }, - - { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, - { "label": "Fn", "w": 1.25, "x": 1.25, "y": 5.25 }, - { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, - { "w": 6.25, "x": 3.75, "y": 5.25 }, - { "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25 }, - { "label": "Ctrl", "w": 1.25, "x": 11.25, "y": 5.25 }, - { "label": "\u2190", "x": 13, "y": 5.5 }, - { "label": "\u2193", "x": 14, "y": 5.5 }, - { "label": "\u2192", "x": 15, "y": 5.5 } - ] - } - - - } -} \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c deleted file mode 100644 index 8bad4c21f89d..000000000000 --- a/keyboards/anjheos/mugen_prototype/keymaps/ansi/keymap.c +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - [1] = LAYOUT_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, - _______, _______, _______, _______, _______, _______, KC_MPRV, _______, KC_MNXT) -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (get_highest_layer(layer_state|default_layer_state) == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } else { - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } - } - return false; -} \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c deleted file mode 100644 index 94f3990bb4fe..000000000000 --- a/keyboards/anjheos/mugen_prototype/keymaps/iso/keymap.c +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -[0] = LAYOUT_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_PGDN, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - -[1] = LAYOUT_iso( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, - _______, _______, _______, _______, _______, _______, KC_MPRV, _______, KC_MNXT) - -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (get_highest_layer(layer_state|default_layer_state) == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } else { - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } - } - return false; -} - - diff --git a/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c deleted file mode 100644 index 7ced5f30b65f..000000000000 --- a/keyboards/anjheos/mugen_prototype/keymaps/via/keymap.c +++ /dev/null @@ -1,71 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -[0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - - [1] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, KC_INS, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, - _______, _______, MO(2), _______, _______, _______, KC_MPRV, _______, KC_MNXT), - - [2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, MO(3), _______, _______, _______, _______, _______, _______, _______), - - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______) - -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (get_highest_layer(layer_state|default_layer_state) == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } else { - if (clockwise) { - tap_code(KC_WH_U); - } else { - tap_code(KC_WH_D); - } - } - return false; -} - diff --git a/keyboards/anjheos/mugen_prototype/keymaps/via/readme.md b/keyboards/anjheos/mugen_prototype/keymaps/via/readme.md deleted file mode 100644 index f1561469e854..000000000000 --- a/keyboards/anjheos/mugen_prototype/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The VIA and Vial keymap for the Mugen 75 Prototype diff --git a/keyboards/anjheos/mugen_prototype/keymaps/via/rules.mk b/keyboards/anjheos/mugen_prototype/keymaps/via/rules.mk deleted file mode 100644 index 4f7618e9b211..000000000000 --- a/keyboards/anjheos/mugen_prototype/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -VIAL_ENABLE = yes diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/config.h b/keyboards/anjheos/mugen_prototype/keymaps/vial/config.h deleted file mode 100644 index 6f7a1eb95b8a..000000000000 --- a/keyboards/anjheos/mugen_prototype/keymaps/vial/config.h +++ /dev/null @@ -1,11 +0,0 @@ -/* Copyright 2022 Anjheos*/ - -/* SPDX-License-Identifier: GPL2.0-or-later */ - -#pragma once - -#define VIAL_KEYBOARD_UID {0x31, 0xC3, 0x43, 0x59, 0x49, 0x66, 0x0C, 0x8C} - -#define VIAL_ENCODER_DEFAULT {KC_VOLD, KC_VOLU, KC_WH_D, KC_WH_U, KC_WH_L, KC_WH_R, KC_TRNS, KC_TRNS,} - -#define VIAL_ENCODER_KEYCODE_DELAY 10 \ No newline at end of file diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c b/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c deleted file mode 100644 index b71659e095e0..000000000000 --- a/keyboards/anjheos/mugen_prototype/keymaps/vial/keymap.c +++ /dev/null @@ -1,53 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -[0] = LAYOUT_all( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_DEL, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_HOME, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP, - MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - -[1] = LAYOUT_all( - _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_INS, KC_MUTE, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, KC_MSTP, - _______, _______, MO(2), _______, _______, _______, KC_MPRV, _______, KC_MNXT), - - [2] = LAYOUT_all( - QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, MO(3), _______, _______, _______, _______, _______, _______, _______), - - [3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______) - -}; diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/readme.md b/keyboards/anjheos/mugen_prototype/keymaps/vial/readme.md deleted file mode 100644 index e325b4d9bd55..000000000000 --- a/keyboards/anjheos/mugen_prototype/keymaps/vial/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The Vial keymap for the Mugen 75 Soldered Prototype diff --git a/keyboards/anjheos/mugen_prototype/keymaps/vial/rules.mk b/keyboards/anjheos/mugen_prototype/keymaps/vial/rules.mk deleted file mode 100644 index 28c32705ba40..000000000000 --- a/keyboards/anjheos/mugen_prototype/keymaps/vial/rules.mk +++ /dev/null @@ -1,5 +0,0 @@ -VIA_ENABLE = yes -VIAL_ENABLE = yes - -VIAL_INSECURE = yes -VIAL_ENCODERS_ENABLE = yes diff --git a/keyboards/anjheos/mugen_prototype/mugen_prototype.c b/keyboards/anjheos/mugen_prototype/mugen_prototype.c deleted file mode 100644 index 5fbcbd74cfe7..000000000000 --- a/keyboards/anjheos/mugen_prototype/mugen_prototype.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 "mugen_prototype.h" - -#include "quantum.h" - diff --git a/keyboards/anjheos/mugen_prototype/mugen_prototype.h b/keyboards/anjheos/mugen_prototype/mugen_prototype.h deleted file mode 100644 index bf753958142e..000000000000 --- a/keyboards/anjheos/mugen_prototype/mugen_prototype.h +++ /dev/null @@ -1,78 +0,0 @@ -/* Copyright 2022 Anjheos - * - * 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 "quantum.h" - -#define XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k3d, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ - k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ - { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ -} - -#define LAYOUT_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ - k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ - k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \ - { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ - { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ -} - -#define LAYOUT_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ - k50, k51, k52, k56, k5a, k5b, k5c, k5d, k5e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ - { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e } \ -} - diff --git a/keyboards/anjheos/mugen_prototype/readme.md b/keyboards/anjheos/mugen_prototype/readme.md deleted file mode 100644 index 774dd36a1d82..000000000000 --- a/keyboards/anjheos/mugen_prototype/readme.md +++ /dev/null @@ -1,27 +0,0 @@ -# anjheos/mugen_prototype - -![anjheos/mugen_prototype](imgur.com image replace me!) - -*A short description of the keyboard/project* - -* Keyboard Maintainer: [Anjheos](https://github.com/Anjheos) -* Hardware Supported: *The PCBs, controllers supported* -* Hardware Availability: *Links to where you can find this hardware* - -Make example for this keyboard (after setting up your build environment): - - make anjheos/mugen_prototype:default - -Flashing example for this keyboard: - - make anjheos/mugen_prototype: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 in 3 ways: - -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/anjheos/mugen_prototype/rules.mk b/keyboards/anjheos/mugen_prototype/rules.mk deleted file mode 100644 index 33e0a2208f39..000000000000 --- a/keyboards/anjheos/mugen_prototype/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -# This file intentionally left blank -ENCODER_ENABLE = yes \ No newline at end of file From 3d636e842cdf80f06dfd36371115ca511d80b25f Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 17:46:00 -0800 Subject: [PATCH 21/37] Manufacturer name fixed. --- keyboards/prototypist/pt80/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json index f360c355ac01..11b014fdb6b1 100644 --- a/keyboards/prototypist/pt80/info.json +++ b/keyboards/prototypist/pt80/info.json @@ -1,5 +1,5 @@ { - "manufacturer": "ProtoTypist", + "manufacturer": "Proto[Typist]", "keyboard_name": "PT-80", "maintainer": "Anjheos", "bootloader": "stm32-dfu", From 676deae316a09763e83fcbf9c917162083c8efc5 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 18:08:27 -0800 Subject: [PATCH 22/37] Specified true default keymap per lint check. --- .../prototypist/pt60/keymaps/{default_iso => default}/keymap.c | 0 .../prototypist/pt80/keymaps/{default_iso => default}/keymap.c | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/prototypist/pt60/keymaps/{default_iso => default}/keymap.c (100%) rename keyboards/prototypist/pt80/keymaps/{default_iso => default}/keymap.c (100%) diff --git a/keyboards/prototypist/pt60/keymaps/default_iso/keymap.c b/keyboards/prototypist/pt60/keymaps/default/keymap.c similarity index 100% rename from keyboards/prototypist/pt60/keymaps/default_iso/keymap.c rename to keyboards/prototypist/pt60/keymaps/default/keymap.c diff --git a/keyboards/prototypist/pt80/keymaps/default_iso/keymap.c b/keyboards/prototypist/pt80/keymaps/default/keymap.c similarity index 100% rename from keyboards/prototypist/pt80/keymaps/default_iso/keymap.c rename to keyboards/prototypist/pt80/keymaps/default/keymap.c From 3e4ab2f4fc499dcda7237cca7f975ccba50844c5 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 18:17:01 -0800 Subject: [PATCH 23/37] Corrected Make and Flash examples in Readme.md. --- keyboards/prototypist/pt60/readme.md | 6 ++++-- keyboards/prototypist/pt80/readme.md | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md index 63f84c0020d7..fbc7ca5051fb 100644 --- a/keyboards/prototypist/pt60/readme.md +++ b/keyboards/prototypist/pt60/readme.md @@ -12,15 +12,17 @@ Default layout is in ISO.* Make example for this keyboard (after setting up your build environment): + make prototypist/pt60:default make prototypist/pt60:via make prototypist/pt60:default_ansi - make prototypist/pt60:default_iso + Flashing example for this keyboard: + make prototypist/pt60:default:flash make prototypist/pt60:via:flash make prototypist/pt60:default_ansi:flash - make prototypist/pt60:default_iso: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). diff --git a/keyboards/prototypist/pt80/readme.md b/keyboards/prototypist/pt80/readme.md index d468507d0325..b8f335b351c7 100644 --- a/keyboards/prototypist/pt80/readme.md +++ b/keyboards/prototypist/pt80/readme.md @@ -12,15 +12,17 @@ Default layout is in ISO.* Make example for this keyboard (after setting up your build environment): + make prototypist/pt80:default make prototypist/pt80:via make prototypist/pt80:default_ansi - make prototypist/pt80:default_iso + Flashing example for this keyboard: + make prototypist/pt80:default:flash make prototypist/pt80:via:flash make prototypist/pt80:default_ansi:flash - make prototypist/pt80:default_iso: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 98444e8fe6813dc629232211457f559be31b6f50 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 18:40:28 -0800 Subject: [PATCH 24/37] Implemented all suggestions from Review. --- keyboards/prototypist/pt60/config.h | 20 ------------------- keyboards/prototypist/pt60/info.json | 4 ++-- .../prototypist/pt60/keymaps/default/keymap.c | 8 ++++---- .../pt60/keymaps/default_ansi/keymap.c | 8 ++++---- .../prototypist/pt60/keymaps/via/keymap.c | 8 ++++---- .../prototypist/pt60/keymaps/via/rules.mk | 2 +- keyboards/prototypist/pt60/readme.md | 2 +- keyboards/prototypist/pt60/rules.mk | 2 +- keyboards/prototypist/pt80/config.h | 20 ------------------- keyboards/prototypist/pt80/info.json | 4 ++-- .../prototypist/pt80/keymaps/default/keymap.c | 8 ++++---- .../pt80/keymaps/default_ansi/keymap.c | 8 ++++---- .../prototypist/pt80/keymaps/via/keymap.c | 8 ++++---- keyboards/prototypist/pt80/readme.md | 2 +- 14 files changed, 32 insertions(+), 72 deletions(-) delete mode 100644 keyboards/prototypist/pt60/config.h delete mode 100644 keyboards/prototypist/pt80/config.h diff --git a/keyboards/prototypist/pt60/config.h b/keyboards/prototypist/pt60/config.h deleted file mode 100644 index 928420ad0411..000000000000 --- a/keyboards/prototypist/pt60/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2023 Josh (@Anjheos) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index 949db015f027..288921c75e79 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -21,10 +21,10 @@ "usb": { "device_version": "1.0.0", "pid": "0x0001", - "vid": "0x5054" + "vid": "0x4A46" }, "layouts": { - "LAYOUT_default": { + "LAYOUT_all": { "layout": [ { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, diff --git a/keyboards/prototypist/pt60/keymaps/default/keymap.c b/keyboards/prototypist/pt60/keymaps/default/keymap.c index 08bb92e8b012..1e85fb09b837 100644 --- a/keyboards/prototypist/pt60/keymaps/default/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( + [0] = LAYOUT_all( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), - [1] = LAYOUT_default( + [1] = LAYOUT_all( EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_default( + [2] = LAYOUT_all( _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3) ), - [3] = LAYOUT_default( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c index dde2f90e0dab..a4184935876c 100644 --- a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( + [0] = LAYOUT_all( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), - [1] = LAYOUT_default( + [1] = LAYOUT_all( EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_default( + [2] = LAYOUT_all( _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3) ), - [3] = LAYOUT_default( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt60/keymaps/via/keymap.c b/keyboards/prototypist/pt60/keymaps/via/keymap.c index 210eaf67fc0d..d710399a811e 100644 --- a/keyboards/prototypist/pt60/keymaps/via/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( + [0] = LAYOUT_all( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), - [1] = LAYOUT_default( + [1] = LAYOUT_all( EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_default( + [2] = LAYOUT_all( _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3) ), - [3] = LAYOUT_default( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt60/keymaps/via/rules.mk b/keyboards/prototypist/pt60/keymaps/via/rules.mk index 4f7618e9b211..16d33cd89fe4 100644 --- a/keyboards/prototypist/pt60/keymaps/via/rules.mk +++ b/keyboards/prototypist/pt60/keymaps/via/rules.mk @@ -1,2 +1,2 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes + diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md index fbc7ca5051fb..7ea26dcc0a5a 100644 --- a/keyboards/prototypist/pt60/readme.md +++ b/keyboards/prototypist/pt60/readme.md @@ -32,4 +32,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`**` -* **Keycode in layout**: Press the key mapped to `RESET` if it is available. +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. diff --git a/keyboards/prototypist/pt60/rules.mk b/keyboards/prototypist/pt60/rules.mk index b28b04f64312..d469a478286d 100644 --- a/keyboards/prototypist/pt60/rules.mk +++ b/keyboards/prototypist/pt60/rules.mk @@ -1,3 +1,3 @@ - +# This file intentionally left blank. diff --git a/keyboards/prototypist/pt80/config.h b/keyboards/prototypist/pt80/config.h deleted file mode 100644 index 8f18c4738937..000000000000 --- a/keyboards/prototypist/pt80/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2021 Josh (@Anjheos) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json index 11b014fdb6b1..b4b1791c8043 100644 --- a/keyboards/prototypist/pt80/info.json +++ b/keyboards/prototypist/pt80/info.json @@ -21,10 +21,10 @@ "usb": { "device_version": "1.0.0", "pid": "0x0000", - "vid": "0x5054" + "vid": "0x4A46" }, "layouts": { - "LAYOUT_default": { + "LAYOUT_all": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 }, diff --git a/keyboards/prototypist/pt80/keymaps/default/keymap.c b/keyboards/prototypist/pt80/keymaps/default/keymap.c index 5b090d285f0d..05ac3f62b943 100644 --- a/keyboards/prototypist/pt80/keymaps/default/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( + [0] = LAYOUT_all( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_default( + [1] = LAYOUT_all( QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), - [2] = LAYOUT_default( + [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), - [3] = LAYOUT_default( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c index 275021dba99c..f9f86eda9595 100644 --- a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( + [0] = LAYOUT_all( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_default( + [1] = LAYOUT_all( QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), - [2] = LAYOUT_default( + [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), - [3] = LAYOUT_default( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt80/keymaps/via/keymap.c b/keyboards/prototypist/pt80/keymaps/via/keymap.c index bdf0e6144b86..0529547ba712 100644 --- a/keyboards/prototypist/pt80/keymaps/via/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_default( + [0] = LAYOUT_all( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_default( + [1] = LAYOUT_all( QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), - [2] = LAYOUT_default( + [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), - [3] = LAYOUT_default( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt80/readme.md b/keyboards/prototypist/pt80/readme.md index b8f335b351c7..d28f2f8e6790 100644 --- a/keyboards/prototypist/pt80/readme.md +++ b/keyboards/prototypist/pt80/readme.md @@ -32,4 +32,4 @@ Enter the bootloader in 3 ways: * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard * **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`**` -* **Keycode in layout**: Press the key mapped to `RESET` if it is available. \ No newline at end of file +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. \ No newline at end of file From e9083d187556e3ffc80984fc28a08d8635d3f618 Mon Sep 17 00:00:00 2001 From: Anjheos <69339386+Anjheos@users.noreply.github.com> Date: Mon, 27 Feb 2023 20:57:04 -0800 Subject: [PATCH 25/37] Update keyboards/prototypist/pt80/keymaps/via/rules.mk Co-authored-by: Less/Rikki <86894501+lesshonor@users.noreply.github.com> --- keyboards/prototypist/pt80/keymaps/via/rules.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/prototypist/pt80/keymaps/via/rules.mk b/keyboards/prototypist/pt80/keymaps/via/rules.mk index 4f7618e9b211..1e5b99807cb7 100644 --- a/keyboards/prototypist/pt80/keymaps/via/rules.mk +++ b/keyboards/prototypist/pt80/keymaps/via/rules.mk @@ -1,2 +1 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes From 24f26b80bd70f3e2fd57b2c7de6584f8f501ed46 Mon Sep 17 00:00:00 2001 From: Anjheos <69339386+Anjheos@users.noreply.github.com> Date: Mon, 27 Feb 2023 20:58:54 -0800 Subject: [PATCH 26/37] Update keyboards/prototypist/pt60/readme.md Co-authored-by: Drashna Jaelre --- keyboards/prototypist/pt60/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md index 7ea26dcc0a5a..68c34396c158 100644 --- a/keyboards/prototypist/pt60/readme.md +++ b/keyboards/prototypist/pt60/readme.md @@ -1,6 +1,6 @@ # prototypist/pt60 -![prototypist/pt60](https://imgur.com/Iu3QwxR.png) +![prototypist/pt60](https://i.imgur.com/Iu3QwxRh.png) *Proto[Typist] Keyboards' first ever in-house universal 60% PCB designed by Josh (Anjheos). Features various physical layouts available to fit multiple regional and bottom row layouts. From f9f38f14d57e18d54b1c9968b24c4bd95c671098 Mon Sep 17 00:00:00 2001 From: Anjheos <69339386+Anjheos@users.noreply.github.com> Date: Mon, 27 Feb 2023 20:59:04 -0800 Subject: [PATCH 27/37] Update keyboards/prototypist/pt80/readme.md Co-authored-by: Drashna Jaelre --- keyboards/prototypist/pt80/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/prototypist/pt80/readme.md b/keyboards/prototypist/pt80/readme.md index d28f2f8e6790..fc9db2f84174 100644 --- a/keyboards/prototypist/pt80/readme.md +++ b/keyboards/prototypist/pt80/readme.md @@ -1,6 +1,6 @@ # prototypist/pt80 -![prototypist/pt80](https://i.imgur.com/voa3ivJ.png) +![prototypist/pt80](https://i.imgur.com/voa3ivJh.png) *Proto[Typist] Keyboards' first ever in-house universal TKL PCB designed by Josh (Anjheos). Features various physical layouts available to fit multiple regional, F-row and bottom row layouts. From 54c084ae16e8de33c2c91f7849b1795919a079d2 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 21:29:55 -0800 Subject: [PATCH 28/37] Updated info.json layouts. --- keyboards/prototypist/pt60/info.json | 140 +++++++++++++ .../prototypist/pt60/keymaps/default/keymap.c | 8 +- .../pt60/keymaps/default_ansi/keymap.c | 8 +- keyboards/prototypist/pt60/readme.md | 4 +- keyboards/prototypist/pt80/info.json | 192 ++++++++++++++++++ .../prototypist/pt80/keymaps/default/keymap.c | 8 +- .../pt80/keymaps/default_ansi/keymap.c | 8 +- .../prototypist/pt80/keymaps/via/rules.mk | 2 +- keyboards/prototypist/pt80/readme.md | 4 +- 9 files changed, 353 insertions(+), 21 deletions(-) diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index 288921c75e79..49428656f2ad 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -69,6 +69,146 @@ { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 }, + { "matrix": [ 3, 0], "label": "Shift", "w": 1.5, "x": 0, "y": 3 }, + { "matrix": [ 3, 1], "label": "|", "x": 1.5, "y": 3 }, + { "matrix": [ 3, 2], "label": "Z", "x": 2.5, "y": 3 }, + { "matrix": [ 3, 3], "label": "X", "x": 3.5, "y": 3 }, + { "matrix": [ 3, 4], "label": "C", "x": 4.5, "y": 3 }, + { "matrix": [ 3, 5], "label": "V", "x": 5.5, "y": 3 }, + { "matrix": [ 3, 6], "label": "B", "x": 6.5, "y": 3 }, + { "matrix": [ 3, 7], "label": "N", "x": 7.5, "y": 3 }, + { "matrix": [ 3, 8], "label": "M", "x": 8.5, "y": 3 }, + { "matrix": [ 3, 9], "label": "<", "x": 9.5, "y": 3 }, + { "matrix": [ 3, 10], "label": ">", "x": 10.5, "y": 3 }, + { "matrix": [ 3, 11], "label": "?", "x": 11.5, "y": 3 }, + { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.5, "y": 3 }, + { "matrix": [ 3, 13], "label": "Fn", "x": 13.75, "y": 3 }, + { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } + ] + }, + + "LAYOUT_iso": { + "layout": [ + { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, + { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, + { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 }, + { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 }, + { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 }, + { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 }, + { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 }, + { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 }, + { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 }, + { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 }, + { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 }, + { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 }, + { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 }, + { "matrix": [ 0, 13], "label": "Back", "x": 13, "y": 0 }, + { "matrix": [ 2, 13], "label": "Delete", "x": 14, "y": 0 }, + { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 }, + { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 }, + { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 }, + { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 }, + { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 }, + { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 }, + { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 }, + { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 }, + { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 }, + { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, + { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, + { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, + { "matrix": [ 1, 13], "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 }, + { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, + { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, + { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 }, + { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 }, + { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 }, + { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 }, + { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 }, + { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 }, + { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 }, + { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 }, + { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, + { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 }, + + { "matrix": [ 3, 0], "label": "Shift", "w": 1.5, "x": 0, "y": 3 }, + { "matrix": [ 3, 1], "label": "|", "x": 1.5, "y": 3 }, + { "matrix": [ 3, 2], "label": "Z", "x": 2.5, "y": 3 }, + { "matrix": [ 3, 3], "label": "X", "x": 3.5, "y": 3 }, + { "matrix": [ 3, 4], "label": "C", "x": 4.5, "y": 3 }, + { "matrix": [ 3, 5], "label": "V", "x": 5.5, "y": 3 }, + { "matrix": [ 3, 6], "label": "B", "x": 6.5, "y": 3 }, + { "matrix": [ 3, 7], "label": "N", "x": 7.5, "y": 3 }, + { "matrix": [ 3, 8], "label": "M", "x": 8.5, "y": 3 }, + { "matrix": [ 3, 9], "label": "<", "x": 9.5, "y": 3 }, + { "matrix": [ 3, 10], "label": ">", "x": 10.5, "y": 3 }, + { "matrix": [ 3, 11], "label": "?", "x": 11.5, "y": 3 }, + { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.5, "y": 3 }, + { "matrix": [ 3, 13], "label": "Fn", "x": 13.75, "y": 3 }, + { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, + { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, + { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [ 4, 6], "w": 6.25, "x": 3.75, "y": 4 }, + { "matrix": [ 4, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 4 }, + { "matrix": [ 4, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 4 }, + { "matrix": [ 4, 12], "label": "Fn", "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [ 4, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 4 } + ] + }, + + "LAYOUT_ansi": { + "layout": [ + { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, + { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, + { "matrix": [ 0, 2], "label": "\"", "x": 2, "y": 0 }, + { "matrix": [ 0, 3], "label": "\u00a3", "x": 3, "y": 0 }, + { "matrix": [ 0, 4], "label": "$", "x": 4, "y": 0 }, + { "matrix": [ 0, 5], "label": "%", "x": 5, "y": 0 }, + { "matrix": [ 0, 6], "label": "^", "x": 6, "y": 0 }, + { "matrix": [ 0, 7], "label": "&", "x": 7, "y": 0 }, + { "matrix": [ 0, 8], "label": "*", "x": 8, "y": 0 }, + { "matrix": [ 0, 9], "label": "(", "x": 9, "y": 0 }, + { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 }, + { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 }, + { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 }, + { "matrix": [ 0, 13], "label": "Back", "x": 13, "y": 0 }, + { "matrix": [ 2, 13], "label": "Delete", "x": 14, "y": 0 }, + { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, + { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 }, + { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 }, + { "matrix": [ 1, 3], "label": "E", "x": 3.5, "y": 1 }, + { "matrix": [ 1, 4], "label": "R", "x": 4.5, "y": 1 }, + { "matrix": [ 1, 5], "label": "T", "x": 5.5, "y": 1 }, + { "matrix": [ 1, 6], "label": "Y", "x": 6.5, "y": 1 }, + { "matrix": [ 1, 7], "label": "U", "x": 7.5, "y": 1 }, + { "matrix": [ 1, 8], "label": "I", "x": 8.5, "y": 1 }, + { "matrix": [ 1, 9], "label": "O", "x": 9.5, "y": 1 }, + { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, + { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, + { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, + { "matrix": [ 1, 13], "label": "|", "w": 1.25, "x": 13.75, "y": 1 }, + { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, + { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, + { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, + { "matrix": [ 2, 3], "label": "D", "x": 3.75, "y": 2 }, + { "matrix": [ 2, 4], "label": "F", "x": 4.75, "y": 2 }, + { "matrix": [ 2, 5], "label": "G", "x": 5.75, "y": 2 }, + { "matrix": [ 2, 6], "label": "H", "x": 6.75, "y": 2 }, + { "matrix": [ 2, 7], "label": "J", "x": 7.75, "y": 2 }, + { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 }, + { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 }, + { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 }, + { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, + { "matrix": [ 2, 12], "label": "Enter", "x": 12.75, "y": 2 }, + { "matrix": [ 3, 0], "label": "Shift", "w": 1.5, "x": 0, "y": 3 }, { "matrix": [ 3, 1], "label": "|", "x": 1.5, "y": 3 }, { "matrix": [ 3, 2], "label": "Z", "x": 2.5, "y": 3 }, diff --git a/keyboards/prototypist/pt60/keymaps/default/keymap.c b/keyboards/prototypist/pt60/keymaps/default/keymap.c index 1e85fb09b837..d5db26819b6d 100644 --- a/keyboards/prototypist/pt60/keymaps/default/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT_iso( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), - [1] = LAYOUT_all( + [1] = LAYOUT_iso( EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_all( + [2] = LAYOUT_iso( _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3) ), - [3] = LAYOUT_all( + [3] = LAYOUT_iso( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c index a4184935876c..90a7f6e58a7e 100644 --- a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT_ansi( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), - [1] = LAYOUT_all( + [1] = LAYOUT_ansi( EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_all( + [2] = LAYOUT_ansi( _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3) ), - [3] = LAYOUT_all( + [3] = LAYOUT_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md index 7ea26dcc0a5a..8ab90e3db278 100644 --- a/keyboards/prototypist/pt60/readme.md +++ b/keyboards/prototypist/pt60/readme.md @@ -1,13 +1,13 @@ # prototypist/pt60 -![prototypist/pt60](https://imgur.com/Iu3QwxR.png) +![prototypist/pt60](https://i.imgur.com/Iu3QwxRh.png) *Proto[Typist] Keyboards' first ever in-house universal 60% PCB designed by Josh (Anjheos). Features various physical layouts available to fit multiple regional and bottom row layouts. Default layout is in ISO.* * Keyboard Maintainer: [Josh @ Prototypist](https://github.com/Anjheos) -* Hardware Supported: *PT-60J PCB and PT-60C PCB* +* Hardware Supported: **PT-60J PCB and PT-60C PCB** * Hardware Availability: [Proto[Typist]](https://prototypist.net) Make example for this keyboard (after setting up your build environment): diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json index b4b1791c8043..6a848c37752d 100644 --- a/keyboards/prototypist/pt80/info.json +++ b/keyboards/prototypist/pt80/info.json @@ -118,6 +118,198 @@ { "matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25 }, { "matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25 } ] + }, + + "LAYOUT_iso": { + "layout": [ + { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 }, + { "matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0 }, + { "matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0 }, + { "matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0 }, + { "matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0 }, + { "matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0 }, + { "matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0 }, + { "matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0 }, + { "matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0 }, + { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 }, + { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 }, + { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 }, + { "matrix": [0, 13], "label": "F13", "x": 14, "y": 0 }, + { "matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0 }, + { "matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0 }, + { "matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0 }, + { "matrix": [1, 0], "label": "\u00ac", "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "label": "!", "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "label": "\"", "x": 2, "y": 1.25 }, + { "matrix": [1, 3], "label": "\u00a3", "x": 3, "y": 1.25 }, + { "matrix": [1, 4], "label": "$", "x": 4, "y": 1.25 }, + { "matrix": [1, 5], "label": "%", "x": 5, "y": 1.25 }, + { "matrix": [1, 6], "label": "^", "x": 6, "y": 1.25 }, + { "matrix": [1, 7], "label": "&", "x": 7, "y": 1.25 }, + { "matrix": [1, 8], "label": "*", "x": 8, "y": 1.25 }, + { "matrix": [1, 9], "label": "(", "x": 9, "y": 1.25 }, + { "matrix": [1, 10], "label": ")", "x": 10, "y": 1.25 }, + { "matrix": [1, 11], "label": "_", "x": 11, "y": 1.25 }, + { "matrix": [1, 12], "label": "+", "x": 12, "y": 1.25 }, + { "matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25 }, + { "matrix": [3, 13], "label": "Del", "x": 14, "y": 1.25 }, + { "matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25 }, + { "matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25 }, + { "matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25 }, + { "matrix": [2, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, + { "matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25 }, + { "matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25 }, + { "matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25 }, + { "matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25 }, + { "matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25 }, + { "matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25 }, + { "matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25 }, + { "matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25 }, + { "matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25 }, + { "matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25 }, + { "matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25 }, + { "matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25 }, + { "matrix": [2, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 2.25 }, + { "matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25 }, + { "matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25 }, + { "matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25 }, + { "matrix": [3, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, + { "matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25 }, + { "matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25 }, + { "matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25 }, + { "matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25 }, + { "matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25 }, + { "matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25 }, + { "matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25 }, + { "matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25 }, + { "matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25 }, + { "matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25 }, + { "matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25 }, + { "matrix": [3, 12], "label": "~", "x": 12.75, "y": 3.25 }, + { "matrix": [4, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 4.25 }, + { "matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25 }, + { "matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25 }, + { "matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25 }, + { "matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25 }, + { "matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25 }, + { "matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25 }, + { "matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25 }, + { "matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25 }, + { "matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25 }, + { "matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25 }, + { "matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25 }, + { "matrix": [4, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 4.25 }, + { "matrix": [4, 13], "label": "Fn", "x": 14, "y": 4.25 }, + { "matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25 }, + { "matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, + { "matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25 }, + { "matrix": [5, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, + { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 }, + { "matrix": [5, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25 }, + { "matrix": [5, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 5.25 }, + { "matrix": [5, 12], "label": "Menu", "w": 1.25, "x": 12.5, "y": 5.25 }, + { "matrix": [5, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 5.25 }, + { "matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25 }, + { "matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25 }, + { "matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25 } + ] + }, + + "LAYOUT_ansi": { + "layout": [ + { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, + { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 }, + { "matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0 }, + { "matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0 }, + { "matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0 }, + { "matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0 }, + { "matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0 }, + { "matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0 }, + { "matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0 }, + { "matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0 }, + { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 }, + { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 }, + { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 }, + { "matrix": [0, 13], "label": "F13", "x": 14, "y": 0 }, + { "matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0 }, + { "matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0 }, + { "matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0 }, + { "matrix": [1, 0], "label": "\u00ac", "x": 0, "y": 1.25 }, + { "matrix": [1, 1], "label": "!", "x": 1, "y": 1.25 }, + { "matrix": [1, 2], "label": "\"", "x": 2, "y": 1.25 }, + { "matrix": [1, 3], "label": "\u00a3", "x": 3, "y": 1.25 }, + { "matrix": [1, 4], "label": "$", "x": 4, "y": 1.25 }, + { "matrix": [1, 5], "label": "%", "x": 5, "y": 1.25 }, + { "matrix": [1, 6], "label": "^", "x": 6, "y": 1.25 }, + { "matrix": [1, 7], "label": "&", "x": 7, "y": 1.25 }, + { "matrix": [1, 8], "label": "*", "x": 8, "y": 1.25 }, + { "matrix": [1, 9], "label": "(", "x": 9, "y": 1.25 }, + { "matrix": [1, 10], "label": ")", "x": 10, "y": 1.25 }, + { "matrix": [1, 11], "label": "_", "x": 11, "y": 1.25 }, + { "matrix": [1, 12], "label": "+", "x": 12, "y": 1.25 }, + { "matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25 }, + { "matrix": [3, 13], "label": "Del", "x": 14, "y": 1.25 }, + { "matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25 }, + { "matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25 }, + { "matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25 }, + { "matrix": [2, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 2.25 }, + { "matrix": [2, 1], "label": "Q", "x": 1.5, "y": 2.25 }, + { "matrix": [2, 2], "label": "W", "x": 2.5, "y": 2.25 }, + { "matrix": [2, 3], "label": "E", "x": 3.5, "y": 2.25 }, + { "matrix": [2, 4], "label": "R", "x": 4.5, "y": 2.25 }, + { "matrix": [2, 5], "label": "T", "x": 5.5, "y": 2.25 }, + { "matrix": [2, 6], "label": "Y", "x": 6.5, "y": 2.25 }, + { "matrix": [2, 7], "label": "U", "x": 7.5, "y": 2.25 }, + { "matrix": [2, 8], "label": "I", "x": 8.5, "y": 2.25 }, + { "matrix": [2, 9], "label": "O", "x": 9.5, "y": 2.25 }, + { "matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25 }, + { "matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25 }, + { "matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25 }, + { "matrix": [2, 13], "label": "|", "w": 1.25, "x": 13.75, "y": 2.25 }, + { "matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25 }, + { "matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25 }, + { "matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25 }, + { "matrix": [3, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.25 }, + { "matrix": [3, 1], "label": "A", "x": 1.75, "y": 3.25 }, + { "matrix": [3, 2], "label": "S", "x": 2.75, "y": 3.25 }, + { "matrix": [3, 3], "label": "D", "x": 3.75, "y": 3.25 }, + { "matrix": [3, 4], "label": "F", "x": 4.75, "y": 3.25 }, + { "matrix": [3, 5], "label": "G", "x": 5.75, "y": 3.25 }, + { "matrix": [3, 6], "label": "H", "x": 6.75, "y": 3.25 }, + { "matrix": [3, 7], "label": "J", "x": 7.75, "y": 3.25 }, + { "matrix": [3, 8], "label": "K", "x": 8.75, "y": 3.25 }, + { "matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25 }, + { "matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25 }, + { "matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25 }, + { "matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25 }, + { "matrix": [4, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 4.25 }, + { "matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25 }, + { "matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25 }, + { "matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25 }, + { "matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25 }, + { "matrix": [4, 5], "label": "V", "x": 5.25, "y": 4.25 }, + { "matrix": [4, 6], "label": "B", "x": 6.25, "y": 4.25 }, + { "matrix": [4, 7], "label": "N", "x": 7.25, "y": 4.25 }, + { "matrix": [4, 8], "label": "M", "x": 8.25, "y": 4.25 }, + { "matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25 }, + { "matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25 }, + { "matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25 }, + { "matrix": [4, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 4.25 }, + { "matrix": [4, 13], "label": "Fn", "x": 14, "y": 4.25 }, + { "matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25 }, + { "matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, + { "matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25 }, + { "matrix": [5, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.25 }, + { "matrix": [5, 6], "w": 6.25, "x": 3.75, "y": 5.25 }, + { "matrix": [5, 10], "label": "AltGr", "w": 1.25, "x": 10, "y": 5.25 }, + { "matrix": [5, 11], "label": "Win", "w": 1.25, "x": 11.25, "y": 5.25 }, + { "matrix": [5, 12], "label": "Menu", "w": 1.25, "x": 12.5, "y": 5.25 }, + { "matrix": [5, 13], "label": "Ctrl", "w": 1.25, "x": 13.75, "y": 5.25 }, + { "matrix": [5, 14], "label": "\u2190", "x": 15.25, "y": 5.25 }, + { "matrix": [5, 15], "label": "\u2193", "x": 16.25, "y": 5.25 }, + { "matrix": [5, 16], "label": "\u2192", "x": 17.25, "y": 5.25 } + ] } } } \ No newline at end of file diff --git a/keyboards/prototypist/pt80/keymaps/default/keymap.c b/keyboards/prototypist/pt80/keymaps/default/keymap.c index 05ac3f62b943..2b71e971f6b8 100644 --- a/keyboards/prototypist/pt80/keymaps/default/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT_iso( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_all( + [1] = LAYOUT_iso( QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), - [2] = LAYOUT_all( + [2] = LAYOUT_iso( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), - [3] = LAYOUT_all( + [3] = LAYOUT_iso( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c index f9f86eda9595..9d6462ae639a 100644 --- a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT_ansi( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_all( + [1] = LAYOUT_ansi( QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), - [2] = LAYOUT_all( + [2] = LAYOUT_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), - [3] = LAYOUT_all( + [3] = LAYOUT_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt80/keymaps/via/rules.mk b/keyboards/prototypist/pt80/keymaps/via/rules.mk index 4f7618e9b211..16d33cd89fe4 100644 --- a/keyboards/prototypist/pt80/keymaps/via/rules.mk +++ b/keyboards/prototypist/pt80/keymaps/via/rules.mk @@ -1,2 +1,2 @@ VIA_ENABLE = yes -VIAL_ENABLE = yes + diff --git a/keyboards/prototypist/pt80/readme.md b/keyboards/prototypist/pt80/readme.md index d28f2f8e6790..30c3b36e0948 100644 --- a/keyboards/prototypist/pt80/readme.md +++ b/keyboards/prototypist/pt80/readme.md @@ -1,13 +1,13 @@ # prototypist/pt80 -![prototypist/pt80](https://i.imgur.com/voa3ivJ.png) +![prototypist/pt80](https://i.imgur.com/voa3ivJh.png) *Proto[Typist] Keyboards' first ever in-house universal TKL PCB designed by Josh (Anjheos). Features various physical layouts available to fit multiple regional, F-row and bottom row layouts. Default layout is in ISO.* * Keyboard Maintainer: [Josh @ Prototypist](https://github.com/Anjheos) -* Hardware Supported: *PT-80J PCB and PT-80C PCB* +* Hardware Supported: **PT-80J PCB and PT-80C PCB** * Hardware Availability: [Proto[Typist]](https://prototypist.net) Make example for this keyboard (after setting up your build environment): From 20636e51ebe5585691003c4b4dd46a6995c36c02 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Mon, 27 Feb 2023 21:37:31 -0800 Subject: [PATCH 29/37] Removed non-feature. --- keyboards/prototypist/pt80/keymaps/via/rules.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/prototypist/pt80/keymaps/via/rules.mk b/keyboards/prototypist/pt80/keymaps/via/rules.mk index 05e8b7002ea5..1e5b99807cb7 100644 --- a/keyboards/prototypist/pt80/keymaps/via/rules.mk +++ b/keyboards/prototypist/pt80/keymaps/via/rules.mk @@ -1,5 +1 @@ VIA_ENABLE = yes -<<<<<<< HEAD - -======= ->>>>>>> f9f38f14d57e18d54b1c9968b24c4bd95c671098 From f24eae7cb50fd381229e1459a4ff3c5d4bd8240e Mon Sep 17 00:00:00 2001 From: Anjheos Date: Tue, 28 Feb 2023 03:41:09 -0800 Subject: [PATCH 30/37] Fixed Layout things. --- keyboards/prototypist/pt60/info.json | 106 +++++++++--------- .../prototypist/pt60/keymaps/default/keymap.c | 16 +-- .../pt60/keymaps/default_ansi/keymap.c | 24 ++-- keyboards/prototypist/pt80/info.json | 20 ++-- .../prototypist/pt80/keymaps/default/keymap.c | 16 +-- .../pt80/keymaps/default_ansi/keymap.c | 26 ++--- 6 files changed, 104 insertions(+), 104 deletions(-) diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index 49428656f2ad..cd746478bdc5 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -54,7 +54,7 @@ { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, - { "matrix": [ 1, 13], "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 }, + { "matrix": [ 1, 13], "h": 2, "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 }, { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, @@ -69,20 +69,20 @@ { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 }, - { "matrix": [ 3, 0], "label": "Shift", "w": 1.5, "x": 0, "y": 3 }, - { "matrix": [ 3, 1], "label": "|", "x": 1.5, "y": 3 }, - { "matrix": [ 3, 2], "label": "Z", "x": 2.5, "y": 3 }, - { "matrix": [ 3, 3], "label": "X", "x": 3.5, "y": 3 }, - { "matrix": [ 3, 4], "label": "C", "x": 4.5, "y": 3 }, - { "matrix": [ 3, 5], "label": "V", "x": 5.5, "y": 3 }, - { "matrix": [ 3, 6], "label": "B", "x": 6.5, "y": 3 }, - { "matrix": [ 3, 7], "label": "N", "x": 7.5, "y": 3 }, - { "matrix": [ 3, 8], "label": "M", "x": 8.5, "y": 3 }, - { "matrix": [ 3, 9], "label": "<", "x": 9.5, "y": 3 }, - { "matrix": [ 3, 10], "label": ">", "x": 10.5, "y": 3 }, - { "matrix": [ 3, 11], "label": "?", "x": 11.5, "y": 3 }, - { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.5, "y": 3 }, - { "matrix": [ 3, 13], "label": "Fn", "x": 13.75, "y": 3 }, + { "matrix": [ 3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3 }, + { "matrix": [ 3, 1], "label": "|", "x": 1.25, "y": 3 }, + { "matrix": [ 3, 2], "label": "Z", "x": 2.25, "y": 3 }, + { "matrix": [ 3, 3], "label": "X", "x": 3.25, "y": 3 }, + { "matrix": [ 3, 4], "label": "C", "x": 4.25, "y": 3 }, + { "matrix": [ 3, 5], "label": "V", "x": 5.25, "y": 3 }, + { "matrix": [ 3, 6], "label": "B", "x": 6.25, "y": 3 }, + { "matrix": [ 3, 7], "label": "N", "x": 7.25, "y": 3 }, + { "matrix": [ 3, 8], "label": "M", "x": 8.25, "y": 3 }, + { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 }, + { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 }, + { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 }, + { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [ 3, 13], "label": "Fn", "x": 14, "y": 3 }, { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, @@ -94,7 +94,7 @@ ] }, - "LAYOUT_iso": { + "LAYOUT_60_iso": { "layout": [ { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, @@ -109,8 +109,8 @@ { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 }, { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 }, { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 }, - { "matrix": [ 0, 13], "label": "Back", "x": 13, "y": 0 }, - { "matrix": [ 2, 13], "label": "Delete", "x": 14, "y": 0 }, + { "matrix": [ 0, 13], "label": "Back", "w": 2, "x": 13, "y": 0 }, + { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 }, { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 }, @@ -124,7 +124,7 @@ { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, - { "matrix": [ 1, 13], "label": "Enter", "w": 1.25, "x": 13.75, "y": 1 }, + { "matrix": [ 1, 13], "label": "Enter", "h": 2, "w": 1.25, "x": 13.75, "y": 1 }, { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, @@ -139,20 +139,20 @@ { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, { "matrix": [ 2, 12], "label": "~", "x": 12.75, "y": 2 }, - { "matrix": [ 3, 0], "label": "Shift", "w": 1.5, "x": 0, "y": 3 }, - { "matrix": [ 3, 1], "label": "|", "x": 1.5, "y": 3 }, - { "matrix": [ 3, 2], "label": "Z", "x": 2.5, "y": 3 }, - { "matrix": [ 3, 3], "label": "X", "x": 3.5, "y": 3 }, - { "matrix": [ 3, 4], "label": "C", "x": 4.5, "y": 3 }, - { "matrix": [ 3, 5], "label": "V", "x": 5.5, "y": 3 }, - { "matrix": [ 3, 6], "label": "B", "x": 6.5, "y": 3 }, - { "matrix": [ 3, 7], "label": "N", "x": 7.5, "y": 3 }, - { "matrix": [ 3, 8], "label": "M", "x": 8.5, "y": 3 }, - { "matrix": [ 3, 9], "label": "<", "x": 9.5, "y": 3 }, - { "matrix": [ 3, 10], "label": ">", "x": 10.5, "y": 3 }, - { "matrix": [ 3, 11], "label": "?", "x": 11.5, "y": 3 }, - { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.5, "y": 3 }, - { "matrix": [ 3, 13], "label": "Fn", "x": 13.75, "y": 3 }, + { "matrix": [ 3, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 3 }, + { "matrix": [ 3, 1], "label": "|", "x": 1.25, "y": 3 }, + { "matrix": [ 3, 2], "label": "Z", "x": 2.25, "y": 3 }, + { "matrix": [ 3, 3], "label": "X", "x": 3.25, "y": 3 }, + { "matrix": [ 3, 4], "label": "C", "x": 4.25, "y": 3 }, + { "matrix": [ 3, 5], "label": "V", "x": 5.25, "y": 3 }, + { "matrix": [ 3, 6], "label": "B", "x": 6.25, "y": 3 }, + { "matrix": [ 3, 7], "label": "N", "x": 7.25, "y": 3 }, + { "matrix": [ 3, 8], "label": "M", "x": 8.25, "y": 3 }, + { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 }, + { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 }, + { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 }, + { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [ 3, 13], "label": "Fn", "x": 14, "y": 3 }, { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, @@ -164,7 +164,7 @@ ] }, - "LAYOUT_ansi": { + "LAYOUT_60_ansi": { "layout": [ { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, @@ -179,8 +179,8 @@ { "matrix": [ 0, 10], "label": ")", "x": 10, "y": 0 }, { "matrix": [ 0, 11], "label": "_", "x": 11, "y": 0 }, { "matrix": [ 0, 12], "label": "+", "x": 12, "y": 0 }, - { "matrix": [ 0, 13], "label": "Back", "x": 13, "y": 0 }, - { "matrix": [ 2, 13], "label": "Delete", "x": 14, "y": 0 }, + { "matrix": [ 0, 13], "label": "Back", "w": 2, "x": 13, "y": 0 }, + { "matrix": [ 1, 0], "label": "Tab", "w": 1.5, "x": 0, "y": 1 }, { "matrix": [ 1, 1], "label": "Q", "x": 1.5, "y": 1 }, { "matrix": [ 1, 2], "label": "W", "x": 2.5, "y": 1 }, @@ -194,7 +194,7 @@ { "matrix": [ 1, 10], "label": "P", "x": 10.5, "y": 1 }, { "matrix": [ 1, 11], "label": "{", "x": 11.5, "y": 1 }, { "matrix": [ 1, 12], "label": "}", "x": 12.5, "y": 1 }, - { "matrix": [ 1, 13], "label": "|", "w": 1.25, "x": 13.75, "y": 1 }, + { "matrix": [ 1, 13], "label": "|", "w": 1.5, "x": 13.5, "y": 1 }, { "matrix": [ 2, 0], "label": "Caps Lock", "w": 1.75, "x": 0, "y": 2 }, { "matrix": [ 2, 1], "label": "A", "x": 1.75, "y": 2 }, { "matrix": [ 2, 2], "label": "S", "x": 2.75, "y": 2 }, @@ -207,22 +207,22 @@ { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 }, { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 }, { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, - { "matrix": [ 2, 12], "label": "Enter", "x": 12.75, "y": 2 }, + { "matrix": [ 2, 12], "label": "Enter", "w": 2.25, "x": 12.75, "y": 2 }, + + { "matrix": [ 3, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 3 }, - { "matrix": [ 3, 0], "label": "Shift", "w": 1.5, "x": 0, "y": 3 }, - { "matrix": [ 3, 1], "label": "|", "x": 1.5, "y": 3 }, - { "matrix": [ 3, 2], "label": "Z", "x": 2.5, "y": 3 }, - { "matrix": [ 3, 3], "label": "X", "x": 3.5, "y": 3 }, - { "matrix": [ 3, 4], "label": "C", "x": 4.5, "y": 3 }, - { "matrix": [ 3, 5], "label": "V", "x": 5.5, "y": 3 }, - { "matrix": [ 3, 6], "label": "B", "x": 6.5, "y": 3 }, - { "matrix": [ 3, 7], "label": "N", "x": 7.5, "y": 3 }, - { "matrix": [ 3, 8], "label": "M", "x": 8.5, "y": 3 }, - { "matrix": [ 3, 9], "label": "<", "x": 9.5, "y": 3 }, - { "matrix": [ 3, 10], "label": ">", "x": 10.5, "y": 3 }, - { "matrix": [ 3, 11], "label": "?", "x": 11.5, "y": 3 }, - { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.5, "y": 3 }, - { "matrix": [ 3, 13], "label": "Fn", "x": 13.75, "y": 3 }, + { "matrix": [ 3, 2], "label": "Z", "x": 2.25, "y": 3 }, + { "matrix": [ 3, 3], "label": "X", "x": 3.25, "y": 3 }, + { "matrix": [ 3, 4], "label": "C", "x": 4.25, "y": 3 }, + { "matrix": [ 3, 5], "label": "V", "x": 5.25, "y": 3 }, + { "matrix": [ 3, 6], "label": "B", "x": 6.25, "y": 3 }, + { "matrix": [ 3, 7], "label": "N", "x": 7.25, "y": 3 }, + { "matrix": [ 3, 8], "label": "M", "x": 8.25, "y": 3 }, + { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 }, + { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 }, + { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 }, + { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [ 3, 13], "label": "Fn", "x": 14, "y": 3 }, { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, @@ -234,4 +234,4 @@ ] } } -} \ No newline at end of file +} diff --git a/keyboards/prototypist/pt60/keymaps/default/keymap.c b/keyboards/prototypist/pt60/keymaps/default/keymap.c index d5db26819b6d..215869ad0363 100644 --- a/keyboards/prototypist/pt60/keymaps/default/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default/keymap.c @@ -4,32 +4,32 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + [0] = LAYOUT_60_iso( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), - [1] = LAYOUT_iso( - EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, + [1] = LAYOUT_60_iso( + EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_iso( - _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, + [2] = LAYOUT_60_iso( + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(3) ), - [3] = LAYOUT_iso( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + [3] = LAYOUT_60_iso( + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c index 90a7f6e58a7e..0bba531c7e1e 100644 --- a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c @@ -4,35 +4,35 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, + [0] = LAYOUT_60_ansi( + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), - [1] = LAYOUT_ansi( - EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, + [1] = LAYOUT_60_ansi( + EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_ansi( - _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, + [2] = LAYOUT_60_ansi( + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(3) ), - [3] = LAYOUT_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + [3] = LAYOUT_60_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json index 6a848c37752d..dcffd5870ee8 100644 --- a/keyboards/prototypist/pt80/info.json +++ b/keyboards/prototypist/pt80/info.json @@ -120,7 +120,7 @@ ] }, - "LAYOUT_iso": { + "LAYOUT_tkl_iso": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 }, @@ -152,8 +152,8 @@ { "matrix": [1, 10], "label": ")", "x": 10, "y": 1.25 }, { "matrix": [1, 11], "label": "_", "x": 11, "y": 1.25 }, { "matrix": [1, 12], "label": "+", "x": 12, "y": 1.25 }, - { "matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25 }, - { "matrix": [3, 13], "label": "Del", "x": 14, "y": 1.25 }, + { "matrix": [1, 13], "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, + { "matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25 }, { "matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25 }, { "matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25 }, @@ -216,7 +216,7 @@ ] }, - "LAYOUT_ansi": { + "LAYOUT_tkl_ansi": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 }, @@ -248,8 +248,8 @@ { "matrix": [1, 10], "label": ")", "x": 10, "y": 1.25 }, { "matrix": [1, 11], "label": "_", "x": 11, "y": 1.25 }, { "matrix": [1, 12], "label": "+", "x": 12, "y": 1.25 }, - { "matrix": [1, 13], "label": "Backspace", "x": 13, "y": 1.25 }, - { "matrix": [3, 13], "label": "Del", "x": 14, "y": 1.25 }, + { "matrix": [1, 13], "label": "Backspace", "w": 2, "x": 13, "y": 1.25 }, + { "matrix": [1, 14], "label": "Insert", "x": 15.25, "y": 1.25 }, { "matrix": [1, 15], "label": "Home", "x": 16.25, "y": 1.25 }, { "matrix": [1, 16], "label": "PgUp", "x": 17.25, "y": 1.25 }, @@ -266,7 +266,7 @@ { "matrix": [2, 10], "label": "P", "x": 10.5, "y": 2.25 }, { "matrix": [2, 11], "label": "{", "x": 11.5, "y": 2.25 }, { "matrix": [2, 12], "label": "}", "x": 12.5, "y": 2.25 }, - { "matrix": [2, 13], "label": "|", "w": 1.25, "x": 13.75, "y": 2.25 }, + { "matrix": [2, 13], "label": "|", "w": 1.5, "x": 13.5, "y": 2.25 }, { "matrix": [2, 14], "label": "Delete", "x": 15.25, "y": 2.25 }, { "matrix": [2, 15], "label": "End", "x": 16.25, "y": 2.25 }, { "matrix": [2, 16], "label": "PgDn", "x": 17.25, "y": 2.25 }, @@ -282,9 +282,9 @@ { "matrix": [3, 9], "label": "L", "x": 9.75, "y": 3.25 }, { "matrix": [3, 10], "label": ":", "x": 10.75, "y": 3.25 }, { "matrix": [3, 11], "label": "@", "x": 11.75, "y": 3.25 }, - { "matrix": [3, 12], "label": "Enter", "x": 12.75, "y": 3.25 }, - { "matrix": [4, 0], "label": "Shift", "w": 1.25, "x": 0, "y": 4.25 }, - { "matrix": [4, 1], "label": "|", "x": 1.25, "y": 4.25 }, + { "matrix": [3, 12], "label": "Enter", "w": 2.25, "x": 12.75, "y": 3.25 }, + { "matrix": [4, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 4.25 }, + { "matrix": [4, 2], "label": "Z", "x": 2.25, "y": 4.25 }, { "matrix": [4, 3], "label": "X", "x": 3.25, "y": 4.25 }, { "matrix": [4, 4], "label": "C", "x": 4.25, "y": 4.25 }, diff --git a/keyboards/prototypist/pt80/keymaps/default/keymap.c b/keyboards/prototypist/pt80/keymaps/default/keymap.c index 2b71e971f6b8..a4594045bc5f 100644 --- a/keyboards/prototypist/pt80/keymaps/default/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default/keymap.c @@ -4,40 +4,40 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_iso( + [0] = LAYOUT_tkl_iso( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_iso( + [1] = LAYOUT_tkl_iso( QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), - [2] = LAYOUT_iso( + [2] = LAYOUT_tkl_iso( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), - [3] = LAYOUT_iso( + [3] = LAYOUT_tkl_iso( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c index 9d6462ae639a..7ca4d5b4b4e5 100644 --- a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c @@ -4,43 +4,43 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_ansi( + [0] = LAYOUT_tkl_ansi( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, - KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_ansi( + [1] = LAYOUT_tkl_ansi( QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), - [2] = LAYOUT_ansi( + [2] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), - [3] = LAYOUT_ansi( + [3] = LAYOUT_tkl_ansi( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) From 186736de498abbd43afd5aa16517295f20a5f737 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Tue, 28 Feb 2023 04:59:59 -0800 Subject: [PATCH 31/37] Modified info.json and keymaps. --- keyboards/prototypist/pt60/info.json | 2 +- keyboards/prototypist/pt60/keymaps/via/keymap.c | 8 ++++---- keyboards/prototypist/pt80/info.json | 2 +- keyboards/prototypist/pt80/keymaps/via/keymap.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index cd746478bdc5..feceb82d805a 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -24,7 +24,7 @@ "vid": "0x4A46" }, "layouts": { - "LAYOUT_all": { + "LAYOUT": { "layout": [ { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, diff --git a/keyboards/prototypist/pt60/keymaps/via/keymap.c b/keyboards/prototypist/pt60/keymaps/via/keymap.c index d710399a811e..0144117fb71d 100644 --- a/keyboards/prototypist/pt60/keymaps/via/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), - [1] = LAYOUT_all( + [1] = LAYOUT( EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT_all( + [2] = LAYOUT( _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3) ), - [3] = LAYOUT_all( + [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json index dcffd5870ee8..b0b835f4e9d3 100644 --- a/keyboards/prototypist/pt80/info.json +++ b/keyboards/prototypist/pt80/info.json @@ -24,7 +24,7 @@ "vid": "0x4A46" }, "layouts": { - "LAYOUT_all": { + "LAYOUT": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 }, diff --git a/keyboards/prototypist/pt80/keymaps/via/keymap.c b/keyboards/prototypist/pt80/keymaps/via/keymap.c index 0529547ba712..98ce6025de46 100644 --- a/keyboards/prototypist/pt80/keymaps/via/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_all( + [0] = LAYOUT( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT_all( + [1] = LAYOUT( QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), - [2] = LAYOUT_all( + [2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), - [3] = LAYOUT_all( + [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From fc8b7397ee0097fc1c99177fbc34967528fed576 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Tue, 28 Feb 2023 05:04:22 -0800 Subject: [PATCH 32/37] Corrected Layout names. --- keyboards/prototypist/pt60/info.json | 2 +- keyboards/prototypist/pt60/keymaps/via/keymap.c | 8 ++++---- keyboards/prototypist/pt80/info.json | 2 +- keyboards/prototypist/pt80/keymaps/via/keymap.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index feceb82d805a..cd746478bdc5 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -24,7 +24,7 @@ "vid": "0x4A46" }, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ { "matrix": [ 0, 0 ], "label": "\u00ac", "x": 0, "y": 0 }, { "matrix": [ 0, 1 ], "label": "!", "x": 1, "y": 0 }, diff --git a/keyboards/prototypist/pt60/keymaps/via/keymap.c b/keyboards/prototypist/pt60/keymaps/via/keymap.c index 0144117fb71d..d710399a811e 100644 --- a/keyboards/prototypist/pt60/keymaps/via/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_all( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL ), - [1] = LAYOUT( + [1] = LAYOUT_all( EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______ ), - [2] = LAYOUT( + [2] = LAYOUT_all( _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3) ), - [3] = LAYOUT( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json index b0b835f4e9d3..dcffd5870ee8 100644 --- a/keyboards/prototypist/pt80/info.json +++ b/keyboards/prototypist/pt80/info.json @@ -24,7 +24,7 @@ "vid": "0x4A46" }, "layouts": { - "LAYOUT": { + "LAYOUT_all": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 }, diff --git a/keyboards/prototypist/pt80/keymaps/via/keymap.c b/keyboards/prototypist/pt80/keymaps/via/keymap.c index 98ce6025de46..0529547ba712 100644 --- a/keyboards/prototypist/pt80/keymaps/via/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/via/keymap.c @@ -4,7 +4,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT( + [0] = LAYOUT_all( KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, @@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), - [1] = LAYOUT( + [1] = LAYOUT_all( QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), - [2] = LAYOUT( + [2] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), - [3] = LAYOUT( + [3] = LAYOUT_all( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From fb74b9c19ee9259feee791389f81c8968c9a2d64 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Tue, 28 Feb 2023 20:42:01 -0800 Subject: [PATCH 33/37] Fixed more layout things --- keyboards/prototypist/pt60/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index cd746478bdc5..7bc143903012 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -234,4 +234,4 @@ ] } } -} +} \ No newline at end of file From e5eecc5b436252829ad634c0569849a54ddbd0b0 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Wed, 1 Mar 2023 13:42:36 -0800 Subject: [PATCH 34/37] Fixed Community Layouts --- keyboards/prototypist/pt60/info.json | 1 + keyboards/prototypist/pt60/readme.md | 4 ++-- keyboards/prototypist/pt80/info.json | 1 + keyboards/prototypist/pt80/readme.md | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index 7bc143903012..d3085d643853 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -23,6 +23,7 @@ "pid": "0x0001", "vid": "0x4A46" }, + "community_layouts": ["60_iso", "60_ansi"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/prototypist/pt60/readme.md b/keyboards/prototypist/pt60/readme.md index 8ab90e3db278..a4f396bf4a22 100644 --- a/keyboards/prototypist/pt60/readme.md +++ b/keyboards/prototypist/pt60/readme.md @@ -30,6 +30,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`**` +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard. +* **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`. * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json index dcffd5870ee8..b534a86aeab8 100644 --- a/keyboards/prototypist/pt80/info.json +++ b/keyboards/prototypist/pt80/info.json @@ -23,6 +23,7 @@ "pid": "0x0000", "vid": "0x4A46" }, + "community_layouts": ["tkl_iso", "tkl_ansi"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/prototypist/pt80/readme.md b/keyboards/prototypist/pt80/readme.md index 30c3b36e0948..a102d9d6db30 100644 --- a/keyboards/prototypist/pt80/readme.md +++ b/keyboards/prototypist/pt80/readme.md @@ -30,6 +30,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to Enter the bootloader in 3 ways: -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`**` +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard. +* **Physical reset button**: Briefly press the button on the back of the PCB marked `RESET0`. * **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available. \ No newline at end of file From fd7452431fafbc0da4147ff431c583133bf998fa Mon Sep 17 00:00:00 2001 From: Anjheos Date: Wed, 1 Mar 2023 14:16:42 -0800 Subject: [PATCH 35/37] Fixed Community Layouts --- keyboards/prototypist/pt60/info.json | 4 ++-- keyboards/prototypist/pt60/keymaps/default/keymap.c | 8 ++++---- .../prototypist/pt60/keymaps/default_ansi/keymap.c | 8 ++++---- keyboards/prototypist/pt80/info.json | 10 +++++----- keyboards/prototypist/pt80/keymaps/default/keymap.c | 10 +++++----- .../prototypist/pt80/keymaps/default_ansi/keymap.c | 10 +++++----- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index d3085d643853..33887b47a005 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -153,7 +153,7 @@ { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 }, { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 }, { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [ 3, 13], "label": "Fn", "x": 14, "y": 3 }, + { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, @@ -223,7 +223,7 @@ { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 }, { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 }, { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [ 3, 13], "label": "Fn", "x": 14, "y": 3 }, + { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, { "matrix": [ 4, 2], "label": "Alt", "w": 1.25, "x": 2.5, "y": 4 }, diff --git a/keyboards/prototypist/pt60/keymaps/default/keymap.c b/keyboards/prototypist/pt60/keymaps/default/keymap.c index 215869ad0363..7a5d5911570c 100644 --- a/keyboards/prototypist/pt60/keymaps/default/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL ), [1] = LAYOUT_60_iso( @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(3) ), @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c index 0bba531c7e1e..cee7394ed9ad 100644 --- a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c @@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL ), [1] = LAYOUT_60_ansi( @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(3) ), @@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json index b534a86aeab8..9da09da9a6ba 100644 --- a/keyboards/prototypist/pt80/info.json +++ b/keyboards/prototypist/pt80/info.json @@ -136,7 +136,7 @@ { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 }, { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 }, { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 }, - { "matrix": [0, 13], "label": "F13", "x": 14, "y": 0 }, + { "matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0 }, { "matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0 }, { "matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0 }, @@ -200,8 +200,8 @@ { "matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25 }, { "matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25 }, { "matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25 }, - { "matrix": [4, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 4.25 }, - { "matrix": [4, 13], "label": "Fn", "x": 14, "y": 4.25 }, + { "matrix": [4, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.25 }, + { "matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25 }, { "matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, { "matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25 }, @@ -232,7 +232,7 @@ { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 }, { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 }, { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 }, - { "matrix": [0, 13], "label": "F13", "x": 14, "y": 0 }, + { "matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0 }, { "matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0 }, { "matrix": [0, 16], "label": "Pause", "x": 17.25, "y": 0 }, @@ -297,7 +297,7 @@ { "matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25 }, { "matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25 }, { "matrix": [4, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 4.25 }, - { "matrix": [4, 13], "label": "Fn", "x": 14, "y": 4.25 }, + { "matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25 }, { "matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 }, { "matrix": [5, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 5.25 }, diff --git a/keyboards/prototypist/pt80/keymaps/default/keymap.c b/keyboards/prototypist/pt80/keymaps/default/keymap.c index a4594045bc5f..77d190f848d9 100644 --- a/keyboards/prototypist/pt80/keymaps/default/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default/keymap.c @@ -5,12 +5,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_tkl_iso( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, - KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) diff --git a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c index 7ca4d5b4b4e5..ac903973c5f0 100644 --- a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c @@ -5,12 +5,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_tkl_ansi( - KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_PSCR, KC_SCRL, KC_PAUS, + KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), @@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT ), @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(3), _______, _______, _______ ), @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) From 095a5006ae3eaf9d7ec8f9c9d415047f00e722ad Mon Sep 17 00:00:00 2001 From: Anjheos Date: Wed, 1 Mar 2023 16:53:11 -0800 Subject: [PATCH 36/37] fixed some community layout compatibility --- keyboards/prototypist/pt60/info.json | 2 +- keyboards/prototypist/pt60/keymaps/default/keymap.c | 8 ++++---- keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c | 8 ++++---- keyboards/prototypist/pt80/keymaps/default/keymap.c | 6 +++--- keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index 33887b47a005..05221a438b6f 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -207,7 +207,7 @@ { "matrix": [ 2, 8], "label": "K", "x": 8.75, "y": 2 }, { "matrix": [ 2, 9], "label": "L", "x": 9.75, "y": 2 }, { "matrix": [ 2, 10], "label": ":", "x": 10.75, "y": 2 }, - { "matrix": [ 2, 11], "label": "@", "x": 11.75, "y": 2 }, + { "matrix": [ 2, 11], "label": "'", "x": 11.75, "y": 2 }, { "matrix": [ 2, 12], "label": "Enter", "w": 2.25, "x": 12.75, "y": 2 }, { "matrix": [ 3, 0], "label": "Shift", "w": 2.25, "x": 0, "y": 3 }, diff --git a/keyboards/prototypist/pt60/keymaps/default/keymap.c b/keyboards/prototypist/pt60/keymaps/default/keymap.c index 7a5d5911570c..24616964751e 100644 --- a/keyboards/prototypist/pt60/keymaps/default/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default/keymap.c @@ -5,23 +5,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_60_iso( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_ENT, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL ), [1] = LAYOUT_60_iso( EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_60_iso( - _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c index cee7394ed9ad..a25cd2fae90f 100644 --- a/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c @@ -5,23 +5,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_60_ansi( - QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, + QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_LGUI, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL ), [1] = LAYOUT_60_ansi( EE_CLR, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, _______, _______, KC_MUTE, KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______, _______, _______, _______ ), [2] = LAYOUT_60_ansi( - _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, + _______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MPRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt80/keymaps/default/keymap.c b/keyboards/prototypist/pt80/keymaps/default/keymap.c index 77d190f848d9..5c5776b271db 100644 --- a/keyboards/prototypist/pt80/keymaps/default/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_tkl_iso( - QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, + QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MUTE, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT_tkl_iso( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT_tkl_iso( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c index ac903973c5f0..d4d974464ae0 100644 --- a/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c +++ b/keyboards/prototypist/pt80/keymaps/default_ansi/keymap.c @@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [1] = LAYOUT_tkl_ansi( - QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, KC_MUTE, _______, KC_MPLY, _______, + QK_BOOT, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_MUTE, _______, KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [2] = LAYOUT_tkl_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [3] = LAYOUT_tkl_ansi( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, From 656ca289d3a34c0c31be08a77305022d1fc7eb85 Mon Sep 17 00:00:00 2001 From: Anjheos Date: Wed, 1 Mar 2023 17:53:39 -0800 Subject: [PATCH 37/37] Applied info.json adjustments --- keyboards/prototypist/pt60/info.json | 4 +-- keyboards/prototypist/pt80/info.json | 50 ++++++++++++++-------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/keyboards/prototypist/pt60/info.json b/keyboards/prototypist/pt60/info.json index 05221a438b6f..c902b16f4f5d 100644 --- a/keyboards/prototypist/pt60/info.json +++ b/keyboards/prototypist/pt60/info.json @@ -152,7 +152,7 @@ { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 }, { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 }, { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 }, - { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [ 3, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 3 }, { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, @@ -222,7 +222,7 @@ { "matrix": [ 3, 9], "label": "<", "x": 9.25, "y": 3 }, { "matrix": [ 3, 10], "label": ">", "x": 10.25, "y": 3 }, { "matrix": [ 3, 11], "label": "?", "x": 11.25, "y": 3 }, - { "matrix": [ 3, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [ 3, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 3 }, { "matrix": [ 4, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 4 }, { "matrix": [ 4, 1], "label": "Win", "w": 1.25, "x": 1.25, "y": 4 }, diff --git a/keyboards/prototypist/pt80/info.json b/keyboards/prototypist/pt80/info.json index 9da09da9a6ba..8751845fc9dd 100644 --- a/keyboards/prototypist/pt80/info.json +++ b/keyboards/prototypist/pt80/info.json @@ -124,18 +124,18 @@ "LAYOUT_tkl_iso": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, - { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 }, - { "matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0 }, - { "matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0 }, - { "matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0 }, - { "matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0 }, - { "matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0 }, - { "matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0 }, - { "matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0 }, - { "matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0 }, - { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 }, - { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 }, - { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 }, + { "matrix": [0, 1], "label": "F1", "x": 2, "y": 0 }, + { "matrix": [0, 2], "label": "F2", "x": 3, "y": 0 }, + { "matrix": [0, 3], "label": "F3", "x": 4, "y": 0 }, + { "matrix": [0, 4], "label": "F4", "x": 5, "y": 0 }, + { "matrix": [0, 5], "label": "F5", "x": 6.5, "y": 0 }, + { "matrix": [0, 6], "label": "F6", "x": 7.5, "y": 0 }, + { "matrix": [0, 7], "label": "F7", "x": 8.5, "y": 0 }, + { "matrix": [0, 8], "label": "F8", "x": 9.5, "y": 0 }, + { "matrix": [0, 9], "label": "F9", "x": 11, "y": 0 }, + { "matrix": [0, 10], "label": "F10", "x": 12, "y": 0 }, + { "matrix": [0, 11], "label": "F11", "x": 13, "y": 0 }, + { "matrix": [0, 12], "label": "F12", "x": 14, "y": 0 }, { "matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0 }, { "matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0 }, @@ -220,18 +220,18 @@ "LAYOUT_tkl_ansi": { "layout": [ { "matrix": [0, 0], "label": "Esc", "x": 0, "y": 0 }, - { "matrix": [0, 1], "label": "F1", "x": 1.25, "y": 0 }, - { "matrix": [0, 2], "label": "F2", "x": 2.25, "y": 0 }, - { "matrix": [0, 3], "label": "F3", "x": 3.25, "y": 0 }, - { "matrix": [0, 4], "label": "F4", "x": 4.25, "y": 0 }, - { "matrix": [0, 5], "label": "F5", "x": 5.5, "y": 0 }, - { "matrix": [0, 6], "label": "F6", "x": 6.5, "y": 0 }, - { "matrix": [0, 7], "label": "F7", "x": 7.5, "y": 0 }, - { "matrix": [0, 8], "label": "F8", "x": 8.5, "y": 0 }, - { "matrix": [0, 9], "label": "F9", "x": 9.75, "y": 0 }, - { "matrix": [0, 10], "label": "F10", "x": 10.75, "y": 0 }, - { "matrix": [0, 11], "label": "F11", "x": 11.75, "y": 0 }, - { "matrix": [0, 12], "label": "F12", "x": 12.75, "y": 0 }, + { "matrix": [0, 1], "label": "F1", "x": 2, "y": 0 }, + { "matrix": [0, 2], "label": "F2", "x": 3, "y": 0 }, + { "matrix": [0, 3], "label": "F3", "x": 4, "y": 0 }, + { "matrix": [0, 4], "label": "F4", "x": 5, "y": 0 }, + { "matrix": [0, 5], "label": "F5", "x": 6.5, "y": 0 }, + { "matrix": [0, 6], "label": "F6", "x": 7.5, "y": 0 }, + { "matrix": [0, 7], "label": "F7", "x": 8.5, "y": 0 }, + { "matrix": [0, 8], "label": "F8", "x": 9.5, "y": 0 }, + { "matrix": [0, 9], "label": "F9", "x": 11, "y": 0 }, + { "matrix": [0, 10], "label": "F10", "x": 12, "y": 0 }, + { "matrix": [0, 11], "label": "F11", "x": 13, "y": 0 }, + { "matrix": [0, 12], "label": "F12", "x": 14, "y": 0 }, { "matrix": [0, 14], "label": "PrtSc", "x": 15.25, "y": 0 }, { "matrix": [0, 15], "label": "Scroll Lock", "x": 16.25, "y": 0 }, @@ -296,7 +296,7 @@ { "matrix": [4, 9], "label": "<", "x": 9.25, "y": 4.25 }, { "matrix": [4, 10], "label": ">", "x": 10.25, "y": 4.25 }, { "matrix": [4, 11], "label": "?", "x": 11.25, "y": 4.25 }, - { "matrix": [4, 12], "label": "Shift", "w": 1.75, "x": 12.25, "y": 4.25 }, + { "matrix": [4, 12], "label": "Shift", "w": 2.75, "x": 12.25, "y": 4.25 }, { "matrix": [4, 15], "label": "\u2191", "x": 16.25, "y": 4.25 }, { "matrix": [5, 0], "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.25 },