From 91c02fb23899552a88229491c73c98156b684e63 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Sun, 17 Sep 2023 21:55:15 +0200 Subject: [PATCH] Implement changes suggested by review --- keyboards/ibm/model_m/ctrl_m/ctrl_m.c | 16 -- keyboards/ibm/model_m/ctrl_m/ctrl_m.h | 18 -- keyboards/ibm/model_m/ctrl_m/info.json | 318 +++++++++++++++++++++---- keyboards/ibm/model_m/ctrl_m/readme.md | 2 +- keyboards/ibm/model_m/ctrl_m/rules.mk | 18 +- 5 files changed, 280 insertions(+), 92 deletions(-) delete mode 100644 keyboards/ibm/model_m/ctrl_m/ctrl_m.c delete mode 100644 keyboards/ibm/model_m/ctrl_m/ctrl_m.h diff --git a/keyboards/ibm/model_m/ctrl_m/ctrl_m.c b/keyboards/ibm/model_m/ctrl_m/ctrl_m.c deleted file mode 100644 index eb93f27ee87..00000000000 --- a/keyboards/ibm/model_m/ctrl_m/ctrl_m.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 nuess0r - * - * 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 "ctrl_m.h" diff --git a/keyboards/ibm/model_m/ctrl_m/ctrl_m.h b/keyboards/ibm/model_m/ctrl_m/ctrl_m.h deleted file mode 100644 index b4cc3f7144b..00000000000 --- a/keyboards/ibm/model_m/ctrl_m/ctrl_m.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2019 ashpil - * - * 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" diff --git a/keyboards/ibm/model_m/ctrl_m/info.json b/keyboards/ibm/model_m/ctrl_m/info.json index 19f48b22d80..4b922db769c 100644 --- a/keyboards/ibm/model_m/ctrl_m/info.json +++ b/keyboards/ibm/model_m/ctrl_m/info.json @@ -1,48 +1,286 @@ { - "keyboard_name": "ctrl-M replacement controller for the IBM Model M 101/102", - "manufacturer": "nuess0r", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/ctrl_m", - "maintainer": "nuess0r", - "usb": { - "vid": "0x1D50", - "pid": "0x6180", - "device_version": "1.0.0", - "max_power": 100 - }, - "debounce": 5, - "matrix_pins": { - "cols": ["A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15", "F0", "F1", "A0", "A1", "A2"], - "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2"] - }, - "diode_direction": "ROW2COL", - "indicators": { + "keyboard_name": "ctrl-M", + "manufacturer": "nuess0r", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/ctrl_m", + "maintainer": "nuess0r", + "usb": { + "vid": "0x1D50", + "pid": "0x6180", + "device_version": "1.0.0", + "max_power": 100 + }, + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": false + }, + "matrix_pins": { + "cols": ["A15", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "C13", "C14", "C15", "F0", "F1", "A0", "A1", "A2"], + "rows": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2"], + "ghost": true + }, + "diode_direction": "ROW2COL", + "indicators": { "num_lock": "B10", "caps_lock": "B12", "scroll_lock": "B11", "on_state": 0 - }, - "ghost": true, - "bootmagic": { - "enabled": true, - "matrix": [0, 2] - }, - "processor": "STM32F072", - "bootloader": "stm32-dfu", - "layouts": { - "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":"PrtSc", "matrix": [3, 15], "x":15.25, "y":0}, {"label":"Scroll Lock", "matrix": [4, 15], "x":16.25, "y":0}, {"label":"Pause", "matrix": [6, 14], "x":17.25, "y":0}, - {"label":"~", "matrix": [2, 2], "x":0, "y":1.5}, {"label":"!", "matrix": [3, 2], "x":1, "y":1.5}, {"label":"@", "matrix": [3, 3], "x":2, "y":1.5}, {"label":"#", "matrix": [3, 4], "x":3, "y":1.5}, {"label":"$", "matrix": [3, 5], "x":4, "y":1.5}, {"label":"%", "matrix": [2, 5], "x":5, "y":1.5}, {"label":"^", "matrix": [2, 7], "x":6, "y":1.5}, {"label":"&", "matrix": [3, 7], "x":7, "y":1.5}, {"label":"*", "matrix": [3, 8], "x":8, "y":1.5}, {"label":"(", "matrix": [3, 9], "x":9, "y":1.5}, {"label":")", "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.25, "y":1.5}, {"label":"Home", "matrix": [2, 14], "x":16.25, "y":1.5}, {"label":"PgUp", "matrix": [2, 13], "x":17.25, "y":1.5}, {"label":"Num Lock", "matrix": [6, 11], "x":18.5, "y":1.5}, {"label":"/", "matrix": [6, 12], "x":19.5, "y":1.5}, {"label":"*", "matrix": [6, 13], "x":20.5, "y":1.5}, {"label":"-", "matrix": [7, 13], "x":21.5, "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.25, "y":2.5}, {"label":"End", "matrix": [3, 14], "x":16.25, "y":2.5}, {"label":"PgDn", "matrix": [3, 13], "x":17.25, "y":2.5}, {"label":"7", "matrix": [4, 11], "x":18.5, "y":2.5}, {"label":"8", "matrix": [4, 12], "x":19.5, "y":2.5}, {"label":"9", "matrix": [4, 13], "x":20.5, "y":2.5}, {"label":"+", "matrix": [4, 14], "x":21.5, "y":2.5, "h":2}, - {"label":"Caps Lock", "matrix": [1, 3], "x":0, "y":3.5, "w":1.5}, {"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":"NUHS", "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":18.5, "y":3.5}, {"label":"5", "matrix": [1, 12], "x":19.5, "y":3.5}, {"label":"6", "matrix": [1, 13], "x":20.5, "y":3.5}, - {"label":"Shift", "matrix": [1, 1], "x":0, "y":4.5, "w":1.25}, {"label":"NUBS", "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.25, "y":4.5}, {"label":"1", "matrix": [5, 11], "x":18.5, "y":4.5}, {"label":"2", "matrix": [5, 12], "x":19.5, "y":4.5}, {"label":"3", "matrix": [5, 13], "x":20.5, "y":4.5}, {"label":"Enter", "matrix": [5, 14], "x":21.5, "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}, {"matrix": [7, 6], "x":4, "y":5.5, "w":7}, {"label":"Alt", "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.25, "y":5.5}, {"label":"\u2193", "matrix": [7, 11], "x":16.25, "y":5.5}, {"label":"\u2192", "matrix": [7, 12], "x":17.25, "y":5.5}, {"label":"0", "matrix": [0, 12], "x":18.5, "y":5.5, "w":2}, {"label":".", "matrix": [0, 13], "x":20.5, "y":5.5}] }, - "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":"PrtSc", "matrix": [3, 15], "x":15.25, "y":0}, {"label":"Scroll Lock", "matrix": [4, 15], "x":16.25, "y":0}, {"label":"Pause", "matrix": [6, 14], "x":17.25, "y":0}, - {"label":"~", "matrix": [2, 2], "x":0, "y":1.5}, {"label":"!", "matrix": [3, 2], "x":1, "y":1.5}, {"label":"@", "matrix": [3, 3], "x":2, "y":1.5}, {"label":"#", "matrix": [3, 4], "x":3, "y":1.5}, {"label":"$", "matrix": [3, 5], "x":4, "y":1.5}, {"label":"%", "matrix": [2, 5], "x":5, "y":1.5}, {"label":"^", "matrix": [2, 7], "x":6, "y":1.5}, {"label":"&", "matrix": [3, 7], "x":7, "y":1.5}, {"label":"*", "matrix": [3, 8], "x":8, "y":1.5}, {"label":"(", "matrix": [3, 9], "x":9, "y":1.5}, {"label":")", "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.25, "y":1.5}, {"label":"Home", "matrix": [2, 14], "x":16.25, "y":1.5}, {"label":"PgUp", "matrix": [2, 13], "x":17.25, "y":1.5}, {"label":"Num Lock", "matrix": [6, 11], "x":18.5, "y":1.5}, {"label":"/", "matrix": [6, 12], "x":19.5, "y":1.5}, {"label":"*", "matrix": [6, 13], "x":20.5, "y":1.5}, {"label":"-", "matrix": [7, 13], "x":21.5, "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.25, "y":2.5}, {"label":"End", "matrix": [3, 14], "x":16.25, "y":2.5}, {"label":"PgDn", "matrix": [3, 13], "x":17.25, "y":2.5}, {"label":"7", "matrix": [4, 11], "x":18.5, "y":2.5}, {"label":"8", "matrix": [4, 12], "x":19.5, "y":2.5}, {"label":"9", "matrix": [4, 13], "x":20.5, "y":2.5}, {"label":"+", "matrix": [4, 14], "x":21.5, "y":2.5, "h":2}, - {"label":"Caps Lock", "matrix": [1, 3], "x":0, "y":3.5, "w":1.5}, {"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":18.5, "y":3.5}, {"label":"5", "matrix": [1, 12], "x":19.5, "y":3.5}, {"label":"6", "matrix": [1, 13], "x":20.5, "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.25, "y":4.5}, {"label":"1", "matrix": [5, 11], "x":18.5, "y":4.5}, {"label":"2", "matrix": [5, 12], "x":19.5, "y":4.5}, {"label":"3", "matrix": [5, 13], "x":20.5, "y":4.5}, {"label":"Enter", "matrix": [5, 14], "x":21.5, "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}, {"matrix": [7, 6], "x":4, "y":5.5, "w":7}, {"label":"Alt", "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.25, "y":5.5}, {"label":"\u2193", "matrix": [7, 11], "x":16.25, "y":5.5}, {"label":"\u2192", "matrix": [7, 12], "x":17.25, "y":5.5}, {"label":"0", "matrix": [0, 12], "x":18.5, "y":5.5, "w":2}, {"label":".", "matrix": [0, 13], "x":20.5, "y":5.5}] + "bootmagic": { + "matrix": [0, 2] + }, + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "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": "PrtSc", "matrix": [3, 15], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [4, 15], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [6, 14], "x": 17.25, "y": 0}, + + {"label": "~", "matrix": [2, 2], "x": 0, "y": 1.5}, + {"label": "!", "matrix": [3, 2], "x": 1, "y": 1.5}, + {"label": "@", "matrix": [3, 3], "x": 2, "y": 1.5}, + {"label": "#", "matrix": [3, 4], "x": 3, "y": 1.5}, + {"label": "$", "matrix": [3, 5], "x": 4, "y": 1.5}, + {"label": "%", "matrix": [2, 5], "x": 5, "y": 1.5}, + {"label": "^", "matrix": [2, 7], "x": 6, "y": 1.5}, + {"label": "&", "matrix": [3, 7], "x": 7, "y": 1.5}, + {"label": "*", "matrix": [3, 8], "x": 8, "y": 1.5}, + {"label": "(", "matrix": [3, 9], "x": 9, "y": 1.5}, + {"label": ")", "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.25, "y": 1.5}, + {"label": "Home", "matrix": [2, 14], "x": 16.25, "y": 1.5}, + {"label": "PgUp", "matrix": [2, 13], "x": 17.25, "y": 1.5}, + + {"label": "Num Lock", "matrix": [6, 11], "x": 18.5, "y": 1.5}, + {"label": "/", "matrix": [6, 12], "x": 19.5, "y": 1.5}, + {"label": "*", "matrix": [6, 13], "x": 20.5, "y": 1.5}, + {"label": "-", "matrix": [7, 13], "x": 21.5, "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.25, "y": 2.5}, + {"label": "End", "matrix": [3, 14], "x": 16.25, "y": 2.5}, + {"label": "PgDn", "matrix": [3, 13], "x": 17.25, "y": 2.5}, + + {"label": "7", "matrix": [4, 11], "x": 18.5, "y": 2.5}, + {"label": "8", "matrix": [4, 12], "x": 19.5, "y": 2.5}, + {"label": "9", "matrix": [4, 13], "x": 20.5, "y": 2.5}, + {"label": "+", "matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2}, + + {"label": "Caps Lock", "matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5}, + {"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": 18.5, "y": 3.5}, + {"label": "5", "matrix": [1, 12], "x": 19.5, "y": 3.5}, + {"label": "6", "matrix": [1, 13], "x": 20.5, "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.25, "y": 4.5}, + + {"label": "1", "matrix": [5, 11], "x": 18.5, "y": 4.5}, + {"label": "2", "matrix": [5, 12], "x": 19.5, "y": 4.5}, + {"label": "3", "matrix": [5, 13], "x": 20.5, "y": 4.5}, + {"label": "Enter", "matrix": [5, 14], "x": 21.5, "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}, + {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7}, + {"label": "Alt", "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.25, "y": 5.5}, + {"label": "\u2193", "matrix": [7, 11], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [7, 12], "x": 17.25, "y": 5.5}, + + {"label": "0", "matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2}, + {"label": ".", "matrix": [0, 13], "x": 20.5, "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": "PrtSc", "matrix": [3, 15], "x": 15.25, "y": 0}, + {"label": "Scroll Lock", "matrix": [4, 15], "x": 16.25, "y": 0}, + {"label": "Pause", "matrix": [6, 14], "x": 17.25, "y": 0}, + + {"label": "~", "matrix": [2, 2], "x": 0, "y": 1.5}, + {"label": "!", "matrix": [3, 2], "x": 1, "y": 1.5}, + {"label": "@", "matrix": [3, 3], "x": 2, "y": 1.5}, + {"label": "#", "matrix": [3, 4], "x": 3, "y": 1.5}, + {"label": "$", "matrix": [3, 5], "x": 4, "y": 1.5}, + {"label": "%", "matrix": [2, 5], "x": 5, "y": 1.5}, + {"label": "^", "matrix": [2, 7], "x": 6, "y": 1.5}, + {"label": "&", "matrix": [3, 7], "x": 7, "y": 1.5}, + {"label": "*", "matrix": [3, 8], "x": 8, "y": 1.5}, + {"label": "(", "matrix": [3, 9], "x": 9, "y": 1.5}, + {"label": ")", "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.25, "y": 1.5}, + {"label": "Home", "matrix": [2, 14], "x": 16.25, "y": 1.5}, + {"label": "PgUp", "matrix": [2, 13], "x": 17.25, "y": 1.5}, + + {"label": "Num Lock", "matrix": [6, 11], "x": 18.5, "y": 1.5}, + {"label": "/", "matrix": [6, 12], "x": 19.5, "y": 1.5}, + {"label": "*", "matrix": [6, 13], "x": 20.5, "y": 1.5}, + {"label": "-", "matrix": [7, 13], "x": 21.5, "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.25, "y": 2.5}, + {"label": "End", "matrix": [3, 14], "x": 16.25, "y": 2.5}, + {"label": "PgDn", "matrix": [3, 13], "x": 17.25, "y": 2.5}, + + {"label": "7", "matrix": [4, 11], "x": 18.5, "y": 2.5}, + {"label": "8", "matrix": [4, 12], "x": 19.5, "y": 2.5}, + {"label": "9", "matrix": [4, 13], "x": 20.5, "y": 2.5}, + {"label": "+", "matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2}, + + {"label": "Caps Lock", "matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5}, + {"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": "NUHS", "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": 18.5, "y": 3.5}, + {"label": "5", "matrix": [1, 12], "x": 19.5, "y": 3.5}, + {"label": "6", "matrix": [1, 13], "x": 20.5, "y": 3.5}, + + {"label": "Shift", "matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25}, + {"label": "NUBS", "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.25, "y": 4.5}, + + {"label": "1", "matrix": [5, 11], "x": 18.5, "y": 4.5}, + {"label": "2", "matrix": [5, 12], "x": 19.5, "y": 4.5}, + {"label": "3", "matrix": [5, 13], "x": 20.5, "y": 4.5}, + {"label": "Enter", "matrix": [5, 14], "x": 21.5, "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}, + {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7}, + {"label": "Alt", "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.25, "y": 5.5}, + {"label": "\u2193", "matrix": [7, 11], "x": 16.25, "y": 5.5}, + {"label": "\u2192", "matrix": [7, 12], "x": 17.25, "y": 5.5}, + + {"label": "0", "matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2}, + {"label": ".", "matrix": [0, 13], "x": 20.5, "y": 5.5} + ] + } } - } } diff --git a/keyboards/ibm/model_m/ctrl_m/readme.md b/keyboards/ibm/model_m/ctrl_m/readme.md index f5878e1e5c7..f88131fd694 100644 --- a/keyboards/ibm/model_m/ctrl_m/readme.md +++ b/keyboards/ibm/model_m/ctrl_m/readme.md @@ -13,7 +13,7 @@ Example how to compile for this keyboard (after setting up your build environmen Flashing example for this keyboard: - make %KEYBOARD%:default:flash + make ibm/model_m/ctrl_m:default:flash Or if you use the QMK tool: diff --git a/keyboards/ibm/model_m/ctrl_m/rules.mk b/keyboards/ibm/model_m/ctrl_m/rules.mk index e9077b2bfdb..6e7633bfe01 100644 --- a/keyboards/ibm/model_m/ctrl_m/rules.mk +++ b/keyboards/ibm/model_m/ctrl_m/rules.mk @@ -1,17 +1 @@ -# Enter lower-power sleep mode when on the ChibiOS idle thread -OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE - -# Build Options -# change yes to no to disable -# -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -UNICODE_ENABLE = yes # Unicode -KEY_LOCK_ENABLE = yes # Key Lock -DYNAMIC_MACRO_ENABLE = yes # Dynamic Macros +# This file intentionally left blank