Compare commits

...

9 Commits

Author SHA1 Message Date
Stephen Edwards
58168caf47
Merge 0342f6804b into 9bea332a21 2024-11-20 22:22:13 -08:00
Ryan
9bea332a21
qmk via2json: Improve macro parsing (#24345) 2024-11-21 17:20:05 +11:00
Ryan
8cbcdcac62
qmk new-keymap: validate keymap name (#23420) 2024-11-21 17:18:51 +11:00
sje
0342f6804b PR Comments 2024-08-25 19:33:54 -04:00
sje-mse
aad0ff6860 standardize comments 2024-05-30 08:31:19 -04:00
sje-mse
32403d0c53 PR Comments 2024-05-30 08:28:37 -04:00
sje-mse
e4fdb99709 remove dead file 2024-05-30 08:21:35 -04:00
Stephen Edwards
9afd412957
Update keyboards/ibm/model_m/yacobo/keyboard.json
Co-authored-by: jack <0x6a73@protonmail.com>
2024-05-30 08:14:50 -04:00
sje-mse
c0f02fbcbd add the keyboard 2024-05-29 22:06:02 -04:00
7 changed files with 428 additions and 9 deletions

View File

@ -0,0 +1,22 @@
/* Copyright 2024 Stephen Edwards
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Adapted from the Model H Project by Jonathan Hawthorn.
*/
#pragma once
/* The status LED on the Blue Pill. */
#define BLUE_PILL_STATUS_LED C13

View File

@ -0,0 +1,285 @@
{
"manufacturer": "IBM",
"keyboard_name": "Model M (Yacobo)",
"maintainer": "sje-mse",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
"extrakey": true,
"mousekey": true
},
"qmk": {
"locking": {
"enabled": true,
"resync": true
}
},
"indicators": {
"num_lock": "B11",
"caps_lock": "B10",
"scroll_lock": "B1",
"on_state": 0
},
"matrix_pins": {
"cols": ["B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A10", "A9", "A8", "B15", "B14", "B13", "B12", "A0"],
"rows": ["A1", "A2", "A3", "A4", "A5", "A6", "A7","B0"],
"ghost": true
},
"development_board": "bluepill",
"url": "https://github.com/sje-mse/yacobo",
"usb": {
"device_version": "1.0.0",
"max_power": 100,
"pid": "0xB155",
"vid": "0xFEED"
},
"layouts": {
"LAYOUT_fullsize_ansi_wkl": {
"layout": [
{"label": "Esc", "matrix": [0, 2], "x": 0, "y": 0},
{"label": "F1", "matrix": [2, 3], "x": 2, "y": 0},
{"label": "F2", "matrix": [2, 4], "x": 3, "y": 0},
{"label": "F3", "matrix": [1, 4], "x": 4, "y": 0},
{"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
{"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
{"label": "F6", "matrix": [0, 8], "x": 7.5, "y": 0},
{"label": "F7", "matrix": [1, 9], "x": 8.5, "y": 0},
{"label": "F8", "matrix": [2, 9], "x": 9.5, "y": 0},
{"label": "F9", "matrix": [2, 6], "x": 11, "y": 0},
{"label": "F10", "matrix": [3, 6], "x": 12, "y": 0},
{"label": "F11", "matrix": [3, 11], "x": 13, "y": 0},
{"label": "F12", "matrix": [3, 12], "x": 14, "y": 0},
{"label": "Print Screen", "matrix": [3, 15], "x": 15.5, "y": 0},
{"label": "Scroll Lock", "matrix": [4, 15], "x": 16.5, "y": 0},
{"label": "Pause", "matrix": [6, 14], "x": 17.5, "y": 0},
{"label": "`", "matrix": [2, 2], "x": 0, "y": 1.5},
{"label": "1", "matrix": [3, 2], "x": 1, "y": 1.5},
{"label": "2", "matrix": [3, 3], "x": 2, "y": 1.5},
{"label": "3", "matrix": [3, 4], "x": 3, "y": 1.5},
{"label": "4", "matrix": [3, 5], "x": 4, "y": 1.5},
{"label": "5", "matrix": [2, 5], "x": 5, "y": 1.5},
{"label": "6", "matrix": [2, 7], "x": 6, "y": 1.5},
{"label": "7", "matrix": [3, 7], "x": 7, "y": 1.5},
{"label": "8", "matrix": [3, 8], "x": 8, "y": 1.5},
{"label": "9", "matrix": [3, 9], "x": 9, "y": 1.5},
{"label": "0", "matrix": [3, 10], "x": 10, "y": 1.5},
{"label": "-", "matrix": [2, 10], "x": 11, "y": 1.5},
{"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5},
{"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
{"label": "Insert", "matrix": [2, 12], "x": 15.5, "y": 1.5},
{"label": "Home", "matrix": [2, 14], "x": 16.5, "y": 1.5},
{"label": "Page Up", "matrix": [2, 13], "x": 17.5, "y": 1.5},
{"label": "Num Lock", "matrix": [6, 11], "x": 19, "y": 1.5},
{"label": "/", "matrix": [6, 12], "x": 20, "y": 1.5},
{"label": "*", "matrix": [6, 13], "x": 21, "y": 1.5},
{"label": "-", "matrix": [7, 13], "x": 22, "y": 1.5},
{"label": "Tab", "matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
{"label": "Q", "matrix": [4, 2], "x": 1.5, "y": 2.5},
{"label": "W", "matrix": [4, 3], "x": 2.5, "y": 2.5},
{"label": "E", "matrix": [4, 4], "x": 3.5, "y": 2.5},
{"label": "R", "matrix": [4, 5], "x": 4.5, "y": 2.5},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2.5},
{"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 2.5},
{"label": "U", "matrix": [4, 7], "x": 7.5, "y": 2.5},
{"label": "I", "matrix": [4, 8], "x": 8.5, "y": 2.5},
{"label": "O", "matrix": [4, 9], "x": 9.5, "y": 2.5},
{"label": "P", "matrix": [4, 10], "x": 10.5, "y": 2.5},
{"label": "[", "matrix": [1, 10], "x": 11.5, "y": 2.5},
{"label": "]", "matrix": [1, 8], "x": 12.5, "y": 2.5},
{"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
{"label": "Delete", "matrix": [2, 11], "x": 15.5, "y": 2.5},
{"label": "End", "matrix": [3, 14], "x": 16.5, "y": 2.5},
{"label": "Page Down", "matrix": [3, 13], "x": 17.5, "y": 2.5},
{"label": "7", "matrix": [4, 11], "x": 19, "y": 2.5},
{"label": "8", "matrix": [4, 12], "x": 20, "y": 2.5},
{"label": "9", "matrix": [4, 13], "x": 21, "y": 2.5},
{"label": "+", "matrix": [4, 14], "x": 22, "y": 2.5, "h": 2},
{"label": "Caps Lock", "matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.25},
{"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5},
{"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5},
{"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5},
{"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5},
{"label": "G", "matrix": [0, 5], "x": 5.75, "y": 3.5},
{"label": "H", "matrix": [0, 7], "x": 6.75, "y": 3.5},
{"label": "J", "matrix": [5, 7], "x": 7.75, "y": 3.5},
{"label": "K", "matrix": [5, 8], "x": 8.75, "y": 3.5},
{"label": "L", "matrix": [5, 9], "x": 9.75, "y": 3.5},
{"label": ";", "matrix": [5, 10], "x": 10.75, "y": 3.5},
{"label": "'", "matrix": [0, 10], "x": 11.75, "y": 3.5},
{"label": "Enter", "matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25},
{"label": "4", "matrix": [1, 11], "x": 19, "y": 3.5},
{"label": "5", "matrix": [1, 12], "x": 20, "y": 3.5},
{"label": "6", "matrix": [1, 13], "x": 21, "y": 3.5},
{"label": "Shift", "matrix": [1, 1], "x": 0, "y": 4.5, "w": 2.25},
{"label": "Z", "matrix": [6, 2], "x": 2.25, "y": 4.5},
{"label": "X", "matrix": [6, 3], "x": 3.25, "y": 4.5},
{"label": "C", "matrix": [6, 4], "x": 4.25, "y": 4.5},
{"label": "V", "matrix": [6, 5], "x": 5.25, "y": 4.5},
{"label": "B", "matrix": [7, 5], "x": 6.25, "y": 4.5},
{"label": "N", "matrix": [7, 7], "x": 7.25, "y": 4.5},
{"label": "M", "matrix": [6, 7], "x": 8.25, "y": 4.5},
{"label": ",", "matrix": [6, 8], "x": 9.25, "y": 4.5},
{"label": ".", "matrix": [6, 9], "x": 10.25, "y": 4.5},
{"label": "/", "matrix": [7, 10], "x": 11.25, "y": 4.5},
{"label": "Shift", "matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
{"label": "\u2191", "matrix": [0, 14], "x": 16.5, "y": 4.5},
{"label": "1", "matrix": [5, 11], "x": 19, "y": 4.5},
{"label": "2", "matrix": [5, 12], "x": 20, "y": 4.5},
{"label": "3", "matrix": [5, 13], "x": 21, "y": 4.5},
{"label": "Enter", "matrix": [5, 14], "x": 22, "y": 4.5, "h": 2},
{"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
{"label": "Alt", "matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
{"label": "Space", "matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
{"label": "Alt Gr", "matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
{"label": "Ctrl", "matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
{"label": "\u2190", "matrix": [7, 14], "x": 15.5, "y": 5.5},
{"label": "\u2193", "matrix": [7, 11], "x": 16.5, "y": 5.5},
{"label": "\u2192", "matrix": [7, 12], "x": 17.5, "y": 5.5},
{"label": "0", "matrix": [0, 11], "x": 19, "y": 5.5, "w": 2},
{"label": ".", "matrix": [0, 13], "x": 21, "y": 5.5}
]
},
"LAYOUT_fullsize_iso_wkl": {
"layout": [
{"label": "Esc", "matrix": [0, 2], "x": 0, "y": 0},
{"label": "F1", "matrix": [2, 3], "x": 2, "y": 0},
{"label": "F2", "matrix": [2, 4], "x": 3, "y": 0},
{"label": "F3", "matrix": [1, 4], "x": 4, "y": 0},
{"label": "F4", "matrix": [0, 4], "x": 5, "y": 0},
{"label": "F5", "matrix": [0, 6], "x": 6.5, "y": 0},
{"label": "F6", "matrix": [0, 8], "x": 7.5, "y": 0},
{"label": "F7", "matrix": [1, 9], "x": 8.5, "y": 0},
{"label": "F8", "matrix": [2, 9], "x": 9.5, "y": 0},
{"label": "F9", "matrix": [2, 6], "x": 11, "y": 0},
{"label": "F10", "matrix": [3, 6], "x": 12, "y": 0},
{"label": "F11", "matrix": [3, 11], "x": 13, "y": 0},
{"label": "F12", "matrix": [3, 12], "x": 14, "y": 0},
{"label": "Print Screen", "matrix": [3, 15], "x": 15.5, "y": 0},
{"label": "Scroll Lock", "matrix": [4, 15], "x": 16.5, "y": 0},
{"label": "Pause", "matrix": [6, 14], "x": 17.5, "y": 0},
{"label": "`", "matrix": [2, 2], "x": 0, "y": 1.5},
{"label": "1", "matrix": [3, 2], "x": 1, "y": 1.5},
{"label": "2", "matrix": [3, 3], "x": 2, "y": 1.5},
{"label": "3", "matrix": [3, 4], "x": 3, "y": 1.5},
{"label": "4", "matrix": [3, 5], "x": 4, "y": 1.5},
{"label": "5", "matrix": [2, 5], "x": 5, "y": 1.5},
{"label": "6", "matrix": [2, 7], "x": 6, "y": 1.5},
{"label": "7", "matrix": [3, 7], "x": 7, "y": 1.5},
{"label": "8", "matrix": [3, 8], "x": 8, "y": 1.5},
{"label": "9", "matrix": [3, 9], "x": 9, "y": 1.5},
{"label": "0", "matrix": [3, 10], "x": 10, "y": 1.5},
{"label": "-", "matrix": [2, 10], "x": 11, "y": 1.5},
{"label": "=", "matrix": [2, 8], "x": 12, "y": 1.5},
{"label": "Backspace", "matrix": [1, 6], "x": 13, "y": 1.5, "w": 2},
{"label": "Insert", "matrix": [2, 12], "x": 15.5, "y": 1.5},
{"label": "Home", "matrix": [2, 14], "x": 16.5, "y": 1.5},
{"label": "Page Up", "matrix": [2, 13], "x": 17.5, "y": 1.5},
{"label": "Num Lock", "matrix": [6, 11], "x": 19, "y": 1.5},
{"label": "/", "matrix": [6, 12], "x": 20, "y": 1.5},
{"label": "*", "matrix": [6, 13], "x": 21, "y": 1.5},
{"label": "-", "matrix": [7, 13], "x": 22, "y": 1.5},
{"label": "Tab", "matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5},
{"label": "Q", "matrix": [4, 2], "x": 1.5, "y": 2.5},
{"label": "W", "matrix": [4, 3], "x": 2.5, "y": 2.5},
{"label": "E", "matrix": [4, 4], "x": 3.5, "y": 2.5},
{"label": "R", "matrix": [4, 5], "x": 4.5, "y": 2.5},
{"label": "T", "matrix": [1, 5], "x": 5.5, "y": 2.5},
{"label": "Y", "matrix": [1, 7], "x": 6.5, "y": 2.5},
{"label": "U", "matrix": [4, 7], "x": 7.5, "y": 2.5},
{"label": "I", "matrix": [4, 8], "x": 8.5, "y": 2.5},
{"label": "O", "matrix": [4, 9], "x": 9.5, "y": 2.5},
{"label": "P", "matrix": [4, 10], "x": 10.5, "y": 2.5},
{"label": "[", "matrix": [1, 10], "x": 11.5, "y": 2.5},
{"label": "]", "matrix": [1, 8], "x": 12.5, "y": 2.5},
{"label": "Delete", "matrix": [2, 11], "x": 15.5, "y": 2.5},
{"label": "End", "matrix": [3, 14], "x": 16.5, "y": 2.5},
{"label": "Page Down", "matrix": [3, 13], "x": 17.5, "y": 2.5},
{"label": "7", "matrix": [4, 11], "x": 19, "y": 2.5},
{"label": "8", "matrix": [4, 12], "x": 20, "y": 2.5},
{"label": "9", "matrix": [4, 13], "x": 21, "y": 2.5},
{"label": "+", "matrix": [4, 14], "x": 22, "y": 2.5, "h": 2},
{"label": "Caps Lock", "matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.25},
{"label": "A", "matrix": [5, 2], "x": 1.75, "y": 3.5},
{"label": "S", "matrix": [5, 3], "x": 2.75, "y": 3.5},
{"label": "D", "matrix": [5, 4], "x": 3.75, "y": 3.5},
{"label": "F", "matrix": [5, 5], "x": 4.75, "y": 3.5},
{"label": "G", "matrix": [0, 5], "x": 5.75, "y": 3.5},
{"label": "H", "matrix": [0, 7], "x": 6.75, "y": 3.5},
{"label": "J", "matrix": [5, 7], "x": 7.75, "y": 3.5},
{"label": "K", "matrix": [5, 8], "x": 8.75, "y": 3.5},
{"label": "L", "matrix": [5, 9], "x": 9.75, "y": 3.5},
{"label": ";", "matrix": [5, 10], "x": 10.75, "y": 3.5},
{"label": "'", "matrix": [0, 10], "x": 11.75, "y": 3.5},
{"label": "#", "matrix": [6, 10], "x": 12.75, "y": 3.5},
{"label": "Enter", "matrix": [6, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
{"label": "4", "matrix": [1, 11], "x": 19, "y": 3.5},
{"label": "5", "matrix": [1, 12], "x": 20, "y": 3.5},
{"label": "6", "matrix": [1, 13], "x": 21, "y": 3.5},
{"label": "Shift", "matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25},
{"label": "\\", "matrix": [0, 3], "x": 1.25, "y": 4.5},
{"label": "Z", "matrix": [6, 2], "x": 2.25, "y": 4.5},
{"label": "X", "matrix": [6, 3], "x": 3.25, "y": 4.5},
{"label": "C", "matrix": [6, 4], "x": 4.25, "y": 4.5},
{"label": "V", "matrix": [6, 5], "x": 5.25, "y": 4.5},
{"label": "B", "matrix": [7, 5], "x": 6.25, "y": 4.5},
{"label": "N", "matrix": [7, 7], "x": 7.25, "y": 4.5},
{"label": "M", "matrix": [6, 7], "x": 8.25, "y": 4.5},
{"label": ",", "matrix": [6, 8], "x": 9.25, "y": 4.5},
{"label": ".", "matrix": [6, 9], "x": 10.25, "y": 4.5},
{"label": "/", "matrix": [7, 10], "x": 11.25, "y": 4.5},
{"label": "Shift", "matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75},
{"label": "\u2191", "matrix": [0, 14], "x": 16.5, "y": 4.5},
{"label": "1", "matrix": [5, 11], "x": 19, "y": 4.5},
{"label": "2", "matrix": [5, 12], "x": 20, "y": 4.5},
{"label": "3", "matrix": [5, 13], "x": 21, "y": 4.5},
{"label": "Enter", "matrix": [5, 14], "x": 22, "y": 4.5, "h": 2},
{"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5},
{"label": "Alt", "matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5},
{"label": "Space", "matrix": [7, 6], "x": 4, "y": 5.5, "w": 7},
{"label": "Alt Gr", "matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5},
{"label": "Ctrl", "matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5},
{"label": "\u2190", "matrix": [7, 14], "x": 15.5, "y": 5.5},
{"label": "\u2193", "matrix": [7, 11], "x": 16.5, "y": 5.5},
{"label": "\u2192", "matrix": [7, 12], "x": 17.5, "y": 5.5},
{"label": "0", "matrix": [0, 11], "x": 19, "y": 5.5, "w": 2},
{"label": ".", "matrix": [0, 13], "x": 21, "y": 5.5}
]
}
}
}

View File

@ -0,0 +1,30 @@
/* Copyright 2021 Stephen Edwards
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Adapted from the Model H Project by Jonathan Hawthorn.
*/
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_fullsize_ansi_wkl( /* Base layer */
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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
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_P7, KC_P8, KC_P9, KC_PPLS,
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_P4, KC_P5, KC_P6,
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_P1, KC_P2, KC_P3, KC_PENT,
KC_LCTL, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT
),
};

View File

@ -0,0 +1,28 @@
# yacobo
![yacobo](https://i.imgur.com/1nfuWoa.jpeg)
*A replacement qmk-compatible control board for the 101-key Model M keyboards.
Inspired by and based on the ModelH by jhawthorn, in comparison this design uses 100% through-hole components, including the widely available STM32F103C8T6 "Blue Pill" development board, for ease of assembly.*
* Keyboard Maintainer: [Stephen Edwards](https://github.com/sje-mse)
* Hardware Supported: IBM 101-key Model M with Yacobo replacement control boards.
* Hardware Availability: [Yacobo PCB](https://github.com/sje-mse/yacobo).
Make example for this keyboard (after setting up your build environment):
make yacobo:default
Flashing example for this keyboard:
make yacobo: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**: Press the "Reset" button on the Blue Pill daughterboard.
* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

View File

@ -0,0 +1,26 @@
/* Copyright 2024 Stephen Edwards
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* Adapted from the Model H Project by Jonathan Hawthorn.
*/
#include "quantum.h"
void keyboard_pre_init_kb(void) {
gpio_set_pin_output(BLUE_PILL_STATUS_LED);
gpio_write_pin(BLUE_PILL_STATUS_LED, 0);
keyboard_pre_init_user();
}

View File

@ -1,5 +1,6 @@
"""This script automates the copying of the default keymap into your own keymap.
"""
import re
import shutil
from milc import cli
@ -13,6 +14,13 @@ from qmk.keyboard import keyboard_completer, keyboard_folder
from qmk.userspace import UserspaceDefs
def validate_keymap_name(name):
"""Returns True if the given keymap name contains only a-z, 0-9 and underscore characters.
"""
regex = re.compile(r'^[a-zA-Z0-9][a-zA-Z0-9_]+$')
return bool(regex.match(name))
def prompt_keyboard():
prompt = """{fg_yellow}Select Keyboard{style_reset_all}
If you`re unsure you can view a full list of supported keyboards with {fg_yellow}qmk list-keyboards{style_reset_all}.
@ -60,6 +68,10 @@ def new_keymap(cli):
cli.log.error(f'Default keymap {{fg_cyan}}{keymap_path_default}{{fg_reset}} does not exist!')
return False
if not validate_keymap_name(user_name):
cli.log.error('Keymap names must contain only {fg_cyan}a-z{fg_reset}, {fg_cyan}0-9{fg_reset} and {fg_cyan}_{fg_reset}! Please choose a different name.')
return False
if keymap_path_new.exists():
cli.log.error(f'Keymap {{fg_cyan}}{user_name}{{fg_reset}} already exists! Please choose a different name.')
return False

View File

@ -29,6 +29,7 @@ def _convert_macros(via_macros):
if len(via_macros) == 0:
return list()
split_regex = re.compile(r'(}\,)|(\,{)')
macro_group_regex = re.compile(r'({.+?})')
macros = list()
for via_macro in via_macros:
# Split VIA macro to its elements
@ -38,13 +39,28 @@ def _convert_macros(via_macros):
macro_data = list()
for m in macro:
if '{' in m or '}' in m:
# Found keycode(s)
keycodes = m.split(',')
# Remove whitespaces and curly braces from around keycodes
keycodes = list(map(lambda s: s.strip(' {}'), keycodes))
# Remove the KC prefix
keycodes = list(map(lambda s: s.replace('KC_', ''), keycodes))
macro_data.append({"action": "tap", "keycodes": keycodes})
# Split macro groups
macro_groups = macro_group_regex.findall(m)
for macro_group in macro_groups:
# Remove whitespaces and curly braces from around group
macro_group = macro_group.strip(' {}')
macro_action = 'tap'
macro_keycodes = []
if macro_group[0] == '+':
macro_action = 'down'
macro_keycodes.append(macro_group[1:])
elif macro_group[0] == '-':
macro_action = 'up'
macro_keycodes.append(macro_group[1:])
else:
macro_keycodes.extend(macro_group.split(',') if ',' in macro_group else [macro_group])
# Remove the KC prefixes
macro_keycodes = list(map(lambda s: s.replace('KC_', ''), macro_keycodes))
macro_data.append({"action": macro_action, "keycodes": macro_keycodes})
else:
# Found text
macro_data.append(m)
@ -54,13 +70,13 @@ def _convert_macros(via_macros):
def _fix_macro_keys(keymap_data):
macro_no = re.compile(r'MACRO0?([0-9]{1,2})')
macro_no = re.compile(r'MACRO0?\(([0-9]{1,2})\)')
for i in range(0, len(keymap_data)):
for j in range(0, len(keymap_data[i])):
kc = keymap_data[i][j]
m = macro_no.match(kc)
if m:
keymap_data[i][j] = f'MACRO_{m.group(1)}'
keymap_data[i][j] = f'MC_{m.group(1)}'
return keymap_data