Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding firmware for New Proto[Typist] in-stock PCBs. #19958

Merged
merged 38 commits into from
Mar 9, 2023
Merged

Adding firmware for New Proto[Typist] in-stock PCBs. #19958

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
4301cc5
Initial commit for Mugen 75.
May 13, 2022
dcee560
Added Mugen 75 standard layouts.
May 15, 2022
7677447
Edited readme.md.
May 15, 2022
034666e
Updated mugen_prototype config.h
May 17, 2022
2837175
Added rotary encoder support to mugen and mugen_prototype.
May 19, 2022
c038549
Setup secure unlock combination for Vial.
May 19, 2022
fb28ab0
Added Reset in Keymap for easier flashing.
May 23, 2022
07182cd
Added PT-60J PCB Firmware to Prototypist.
Jan 20, 2023
3f6303c
Adding PT-60J PCB Firmware.
Jan 20, 2023
6f3f934
Added extra information.
Jan 20, 2023
49af5a8
Updated keymaps for ANSI, ISO and VIA.
Jan 20, 2023
67253dd
Updated keymaps for ANSI, ISO and VIA.
Jan 20, 2023
79daf5d
Adjusted VIA.json and readme.md.
Jan 20, 2023
9939b2c
Added Hardware Image.
Feb 27, 2023
d9fea18
Added Hardware Image.
Feb 27, 2023
29f9f4b
Added Hardware Image.
Feb 27, 2023
3482dad
Added Hardware Image.
Feb 27, 2023
fa4f3a2
Added Hardware Image.
Feb 27, 2023
02d30ae
Updated License Headers.
Feb 28, 2023
6149570
Clean up firmware.
Feb 28, 2023
3d636e8
Manufacturer name fixed.
Feb 28, 2023
676deae
Specified true default keymap per lint check.
Feb 28, 2023
3e4ab2f
Corrected Make and Flash examples in Readme.md.
Feb 28, 2023
98444e8
Implemented all suggestions from Review.
Feb 28, 2023
e9083d1
Update keyboards/prototypist/pt80/keymaps/via/rules.mk
Anjheos Feb 28, 2023
24f26b8
Update keyboards/prototypist/pt60/readme.md
Anjheos Feb 28, 2023
f9f38f1
Update keyboards/prototypist/pt80/readme.md
Anjheos Feb 28, 2023
54c084a
Updated info.json layouts.
Feb 28, 2023
4ee027a
Updated info.json layouts.
Feb 28, 2023
20636e5
Removed non-feature.
Feb 28, 2023
f24eae7
Fixed Layout things.
Feb 28, 2023
186736d
Modified info.json and keymaps.
Feb 28, 2023
fc8b739
Corrected Layout names.
Feb 28, 2023
fb74b9c
Fixed more layout things
Mar 1, 2023
e5eecc5
Fixed Community Layouts
Mar 1, 2023
fd74524
Fixed Community Layouts
Mar 1, 2023
095a500
fixed some community layout compatibility
Mar 2, 2023
656ca28
Applied info.json adjustments
Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions keyboards/prototypist/pt60/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2023 Josh (@Anjheos)
Anjheos marked this conversation as resolved.
Show resolved Hide resolved
// 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
97 changes: 97 additions & 0 deletions keyboards/prototypist/pt60/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
{
"manufacturer": "Proto[Typist]",
"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"
Anjheos marked this conversation as resolved.
Show resolved Hide resolved
},
waffle87 marked this conversation as resolved.
Show resolved Hide resolved
"layouts": {
"LAYOUT_default": {
Anjheos marked this conversation as resolved.
Show resolved Hide resolved
"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 }
]
}
}
}
38 changes: 38 additions & 0 deletions keyboards/prototypist/pt60/keymaps/default/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// 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] = {
[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(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
38 changes: 38 additions & 0 deletions keyboards/prototypist/pt60/keymaps/default_ansi/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// 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] = {
[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_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
),

[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(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
38 changes: 38 additions & 0 deletions keyboards/prototypist/pt60/keymaps/via/keymap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// 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] = {
[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(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
2 changes: 2 additions & 0 deletions keyboards/prototypist/pt60/keymaps/via/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
VIA_ENABLE = yes
VIAL_ENABLE = yes
Anjheos marked this conversation as resolved.
Show resolved Hide resolved
35 changes: 35 additions & 0 deletions keyboards/prototypist/pt60/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# prototypist/pt60

![prototypist/pt60](https://imgur.com/Iu3QwxR.png)
Anjheos marked this conversation as resolved.
Show resolved Hide resolved

*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: [Proto[Typist]](https://prototypist.net)

Make example for this keyboard (after setting up your build environment):

make prototypist/pt60:default
make prototypist/pt60:via
make prototypist/pt60:default_ansi


Flashing example for this keyboard:

make prototypist/pt60:default:flash
make prototypist/pt60:via:flash
make prototypist/pt60:default_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 marked `RESET0`**`
Anjheos marked this conversation as resolved.
Show resolved Hide resolved
* **Keycode in layout**: Press the key mapped to `RESET` if it is available.
Anjheos marked this conversation as resolved.
Show resolved Hide resolved
3 changes: 3 additions & 0 deletions keyboards/prototypist/pt60/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@



Anjheos marked this conversation as resolved.
Show resolved Hide resolved
20 changes: 20 additions & 0 deletions keyboards/prototypist/pt80/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// Copyright 2021 Josh (@Anjheos)
Anjheos marked this conversation as resolved.
Show resolved Hide resolved
// 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
Loading