From edf863f61eab28963d87bf38eaac713a8e0fca3c Mon Sep 17 00:00:00 2001 From: nuess0r Date: Mon, 3 May 2021 22:11:18 +0200 Subject: [PATCH] Putting all IBM Model M projects under one folder As discussed in #12370: The maintainers of several Model M replacement controller projects agreed to cosolidate them under one common folder. --- keyboards/handwired/ibm122m/readme.md | 16 ---------- .../ashpil_usbc/ashpil_usbc.c} | 2 +- .../ashpil_usbc/ashpil_usbc.h} | 0 .../ashpil_usbc}/config.h | 0 .../ashpil_usbc}/info.json | 10 +++--- .../ashpil_usbc}/keymaps/ashpil/config.h | 0 .../ashpil_usbc}/keymaps/ashpil/keymap.c | 0 .../ashpil_usbc}/keymaps/ashpil/rules.mk | 0 .../ashpil_usbc}/keymaps/default/keymap.c | 0 .../ashpil_usbc}/readme.md | 2 +- .../ashpil_usbc}/rules.mk | 0 .../{handwired => modelm}/ibm122m/config.h | 0 .../{handwired => modelm}/ibm122m/ibm122m.c | 0 .../{handwired => modelm}/ibm122m/ibm122m.h | 0 .../{handwired => modelm}/ibm122m/info.json | 1 + .../ibm122m/keymaps/andresteare/keymap.c | 0 .../ibm122m/keymaps/default/config.h | 0 .../ibm122m/keymaps/default/keymap.c | 0 .../ibm122m/keymaps/default/readme.md | 0 .../ibm122m/keymaps/lukaus/config.h | 0 .../ibm122m/keymaps/lukaus/keymap.c | 0 .../ibm122m/keymaps/lukaus/readme.md | 0 .../ibm122m/keymaps/via/keymap.c | 0 .../ibm122m/keymaps/via/rules.mk | 0 keyboards/modelm/ibm122m/readme.md | 31 +++++++++++++++++++ .../{handwired => modelm}/ibm122m/rules.mk | 0 .../modelm => modelm/mschwingen}/config.h | 6 ++-- .../modelm => modelm/mschwingen}/info.json | 2 +- .../mschwingen}/keymaps/default/keymap.c | 0 .../mschwingen}/led_ffc/rules.mk | 0 .../mschwingen}/led_wired/rules.mk | 0 .../mschwingen}/led_ws2812/rules.mk | 0 .../modelm => modelm/mschwingen}/matrix.c | 4 +-- .../mschwingen/mschwingen.c} | 11 +++---- .../mschwingen/mschwingen.h} | 4 +-- .../modelm => modelm/mschwingen}/readme.md | 12 +++---- .../modelm => modelm/mschwingen}/rules.mk | 2 +- keyboards/modelm/readme.md | 23 ++++++++++++++ .../modelm101 => modelm/teensypp}/.noci | 0 .../modelm101 => modelm/teensypp}/config.h | 0 .../modelm101 => modelm/teensypp}/info.json | 12 +++---- .../teensypp}/keymaps/default/config.h | 0 .../teensypp}/keymaps/default/keymap.c | 0 .../teensypp}/keymaps/default/readme.md | 0 .../teensypp}/keymaps/iw0rm3r/config.h | 0 .../teensypp}/keymaps/iw0rm3r/keymap.c | 0 .../teensypp}/keymaps/iw0rm3r/readme.md | 0 .../modelm101 => modelm/teensypp}/readme.md | 22 ++++++------- .../modelm101 => modelm/teensypp}/rules.mk | 0 .../teensypp/teensypp.c} | 2 +- .../teensypp/teensypp.h} | 0 .../model_m_101 => modelm/yugo_m}/config.h | 0 .../model_m_101 => modelm/yugo_m}/info.json | 2 +- .../yugo_m}/keymaps/default/keymap.c | 0 .../yugo_m}/keymaps/default/readme.md | 0 .../model_m_101 => modelm/yugo_m}/readme.md | 2 +- .../model_m_101 => modelm/yugo_m}/rules.mk | 0 .../model_m_101.c => modelm/yugo_m/yugo_m.c} | 4 +-- .../model_m_101.h => modelm/yugo_m/yugo_m.h} | 0 keyboards/readme.md | 1 + keyboards/yugo_m/readme.md | 11 ------- 61 files changed, 105 insertions(+), 77 deletions(-) delete mode 100644 keyboards/handwired/ibm122m/readme.md rename keyboards/{ashpil/modelm_usbc/modelm_usbc.c => modelm/ashpil_usbc/ashpil_usbc.c} (97%) rename keyboards/{ashpil/modelm_usbc/modelm_usbc.h => modelm/ashpil_usbc/ashpil_usbc.h} (100%) rename keyboards/{ashpil/modelm_usbc => modelm/ashpil_usbc}/config.h (100%) rename keyboards/{ashpil/modelm_usbc => modelm/ashpil_usbc}/info.json (97%) rename keyboards/{ashpil/modelm_usbc => modelm/ashpil_usbc}/keymaps/ashpil/config.h (100%) rename keyboards/{ashpil/modelm_usbc => modelm/ashpil_usbc}/keymaps/ashpil/keymap.c (100%) rename keyboards/{ashpil/modelm_usbc => modelm/ashpil_usbc}/keymaps/ashpil/rules.mk (100%) rename keyboards/{ashpil/modelm_usbc => modelm/ashpil_usbc}/keymaps/default/keymap.c (100%) rename keyboards/{ashpil/modelm_usbc => modelm/ashpil_usbc}/readme.md (96%) rename keyboards/{ashpil/modelm_usbc => modelm/ashpil_usbc}/rules.mk (100%) rename keyboards/{handwired => modelm}/ibm122m/config.h (100%) rename keyboards/{handwired => modelm}/ibm122m/ibm122m.c (100%) rename keyboards/{handwired => modelm}/ibm122m/ibm122m.h (100%) rename keyboards/{handwired => modelm}/ibm122m/info.json (98%) rename keyboards/{handwired => modelm}/ibm122m/keymaps/andresteare/keymap.c (100%) rename keyboards/{handwired => modelm}/ibm122m/keymaps/default/config.h (100%) rename keyboards/{handwired => modelm}/ibm122m/keymaps/default/keymap.c (100%) rename keyboards/{handwired => modelm}/ibm122m/keymaps/default/readme.md (100%) rename keyboards/{handwired => modelm}/ibm122m/keymaps/lukaus/config.h (100%) rename keyboards/{handwired => modelm}/ibm122m/keymaps/lukaus/keymap.c (100%) rename keyboards/{handwired => modelm}/ibm122m/keymaps/lukaus/readme.md (100%) rename keyboards/{handwired => modelm}/ibm122m/keymaps/via/keymap.c (100%) rename keyboards/{handwired => modelm}/ibm122m/keymaps/via/rules.mk (100%) create mode 100644 keyboards/modelm/ibm122m/readme.md rename keyboards/{handwired => modelm}/ibm122m/rules.mk (100%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/config.h (93%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/info.json (97%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/keymaps/default/keymap.c (100%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/led_ffc/rules.mk (100%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/led_wired/rules.mk (100%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/led_ws2812/rules.mk (100%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/matrix.c (99%) rename keyboards/{mschwingen/modelm/modelm.c => modelm/mschwingen/mschwingen.c} (96%) rename keyboards/{mschwingen/modelm/modelm.h => modelm/mschwingen/mschwingen.h} (95%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/readme.md (77%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/rules.mk (96%) create mode 100644 keyboards/modelm/readme.md rename keyboards/{converter/modelm101 => modelm/teensypp}/.noci (100%) rename keyboards/{converter/modelm101 => modelm/teensypp}/config.h (100%) rename keyboards/{converter/modelm101 => modelm/teensypp}/info.json (94%) rename keyboards/{converter/modelm101 => modelm/teensypp}/keymaps/default/config.h (100%) rename keyboards/{converter/modelm101 => modelm/teensypp}/keymaps/default/keymap.c (100%) rename keyboards/{converter/modelm101 => modelm/teensypp}/keymaps/default/readme.md (100%) rename keyboards/{converter/modelm101 => modelm/teensypp}/keymaps/iw0rm3r/config.h (100%) rename keyboards/{converter/modelm101 => modelm/teensypp}/keymaps/iw0rm3r/keymap.c (100%) rename keyboards/{converter/modelm101 => modelm/teensypp}/keymaps/iw0rm3r/readme.md (100%) rename keyboards/{converter/modelm101 => modelm/teensypp}/readme.md (81%) rename keyboards/{converter/modelm101 => modelm/teensypp}/rules.mk (100%) rename keyboards/{converter/modelm101/modelm101.c => modelm/teensypp/teensypp.c} (98%) rename keyboards/{converter/modelm101/modelm101.h => modelm/teensypp/teensypp.h} (100%) rename keyboards/{yugo_m/model_m_101 => modelm/yugo_m}/config.h (100%) rename keyboards/{yugo_m/model_m_101 => modelm/yugo_m}/info.json (97%) rename keyboards/{yugo_m/model_m_101 => modelm/yugo_m}/keymaps/default/keymap.c (100%) rename keyboards/{yugo_m/model_m_101 => modelm/yugo_m}/keymaps/default/readme.md (100%) rename keyboards/{yugo_m/model_m_101 => modelm/yugo_m}/readme.md (96%) rename keyboards/{yugo_m/model_m_101 => modelm/yugo_m}/rules.mk (100%) rename keyboards/{yugo_m/model_m_101/model_m_101.c => modelm/yugo_m/yugo_m.c} (97%) rename keyboards/{yugo_m/model_m_101/model_m_101.h => modelm/yugo_m/yugo_m.h} (100%) delete mode 100644 keyboards/yugo_m/readme.md diff --git a/keyboards/handwired/ibm122m/readme.md b/keyboards/handwired/ibm122m/readme.md deleted file mode 100644 index de89d7596e6f..000000000000 --- a/keyboards/handwired/ibm122m/readme.md +++ /dev/null @@ -1,16 +0,0 @@ -# ibm122m - -![IBM Model M 122 key](https://i.imgur.com/Oo3Ozqz.jpg) - -This is a keymap for the IBM Model M 122 key terminal keyboard running on a Teensy 2.0++ -I wired it to weird pins on mine (mainly to accomodate speakers), so make sure to update the pin arrays. - -Keyboard Maintainer: [Luke Stanley](https://github.com/lukexorz) -Hardware Supported: Teensy 2.0++ -Hardware Availability: https://www.pjrc.com/store/teensypp.html - -Make example for this keyboard (after setting up your build environment): - - make handwired/ibm122m:default - -See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. diff --git a/keyboards/ashpil/modelm_usbc/modelm_usbc.c b/keyboards/modelm/ashpil_usbc/ashpil_usbc.c similarity index 97% rename from keyboards/ashpil/modelm_usbc/modelm_usbc.c rename to keyboards/modelm/ashpil_usbc/ashpil_usbc.c index e505c72233ba..dde0a5b533b0 100644 --- a/keyboards/ashpil/modelm_usbc/modelm_usbc.c +++ b/keyboards/modelm/ashpil_usbc/ashpil_usbc.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "modelm_usbc.h" +#include "ashpil_usbc.h" void keyboard_pre_init_kb(void) { /* Setting status LEDs pins to output and +5V (off) */ diff --git a/keyboards/ashpil/modelm_usbc/modelm_usbc.h b/keyboards/modelm/ashpil_usbc/ashpil_usbc.h similarity index 100% rename from keyboards/ashpil/modelm_usbc/modelm_usbc.h rename to keyboards/modelm/ashpil_usbc/ashpil_usbc.h diff --git a/keyboards/ashpil/modelm_usbc/config.h b/keyboards/modelm/ashpil_usbc/config.h similarity index 100% rename from keyboards/ashpil/modelm_usbc/config.h rename to keyboards/modelm/ashpil_usbc/config.h diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/modelm/ashpil_usbc/info.json similarity index 97% rename from keyboards/ashpil/modelm_usbc/info.json rename to keyboards/modelm/ashpil_usbc/info.json index e24a27f200a3..fd4633acf20f 100644 --- a/keyboards/ashpil/modelm_usbc/info.json +++ b/keyboards/modelm/ashpil_usbc/info.json @@ -1,9 +1,9 @@ { - "keyboard_name": "IBM Model M 101 ANSI/102 ISO", - "url": "https://github.com/ashpil/qmk_firmware/tree/master/keyboards/ashpil/modelm_usbc", - "maintainer": "ashpil", - "width": 22.5, - "height": 6.5, + "keyboard_name": "IBM Model M 101 ANSI/102 ISO", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/ashpil_usbc", + "maintainer": "ashpil", + "width": 22.5, + "height": 6.5, "layouts": { "LAYOUT_fullsize_iso_wkl": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h b/keyboards/modelm/ashpil_usbc/keymaps/ashpil/config.h similarity index 100% rename from keyboards/ashpil/modelm_usbc/keymaps/ashpil/config.h rename to keyboards/modelm/ashpil_usbc/keymaps/ashpil/config.h diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c b/keyboards/modelm/ashpil_usbc/keymaps/ashpil/keymap.c similarity index 100% rename from keyboards/ashpil/modelm_usbc/keymaps/ashpil/keymap.c rename to keyboards/modelm/ashpil_usbc/keymaps/ashpil/keymap.c diff --git a/keyboards/ashpil/modelm_usbc/keymaps/ashpil/rules.mk b/keyboards/modelm/ashpil_usbc/keymaps/ashpil/rules.mk similarity index 100% rename from keyboards/ashpil/modelm_usbc/keymaps/ashpil/rules.mk rename to keyboards/modelm/ashpil_usbc/keymaps/ashpil/rules.mk diff --git a/keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c b/keyboards/modelm/ashpil_usbc/keymaps/default/keymap.c similarity index 100% rename from keyboards/ashpil/modelm_usbc/keymaps/default/keymap.c rename to keyboards/modelm/ashpil_usbc/keymaps/default/keymap.c diff --git a/keyboards/ashpil/modelm_usbc/readme.md b/keyboards/modelm/ashpil_usbc/readme.md similarity index 96% rename from keyboards/ashpil/modelm_usbc/readme.md rename to keyboards/modelm/ashpil_usbc/readme.md index 261d97ab4906..8921a64b857f 100644 --- a/keyboards/ashpil/modelm_usbc/readme.md +++ b/keyboards/modelm/ashpil_usbc/readme.md @@ -9,6 +9,6 @@ This is a configuration of QMK intended to be used with the [USB C Model M alt c Make example for this keyboard (after setting up your build environment): - make ashpil/modelm_usbc:default + make modelm/ashpil_usbc:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/ashpil/modelm_usbc/rules.mk b/keyboards/modelm/ashpil_usbc/rules.mk similarity index 100% rename from keyboards/ashpil/modelm_usbc/rules.mk rename to keyboards/modelm/ashpil_usbc/rules.mk diff --git a/keyboards/handwired/ibm122m/config.h b/keyboards/modelm/ibm122m/config.h similarity index 100% rename from keyboards/handwired/ibm122m/config.h rename to keyboards/modelm/ibm122m/config.h diff --git a/keyboards/handwired/ibm122m/ibm122m.c b/keyboards/modelm/ibm122m/ibm122m.c similarity index 100% rename from keyboards/handwired/ibm122m/ibm122m.c rename to keyboards/modelm/ibm122m/ibm122m.c diff --git a/keyboards/handwired/ibm122m/ibm122m.h b/keyboards/modelm/ibm122m/ibm122m.h similarity index 100% rename from keyboards/handwired/ibm122m/ibm122m.h rename to keyboards/modelm/ibm122m/ibm122m.h diff --git a/keyboards/handwired/ibm122m/info.json b/keyboards/modelm/ibm122m/info.json similarity index 98% rename from keyboards/handwired/ibm122m/info.json rename to keyboards/modelm/ibm122m/info.json index 46db3c0d7565..73e2f1f6cbb3 100644 --- a/keyboards/handwired/ibm122m/info.json +++ b/keyboards/modelm/ibm122m/info.json @@ -1,5 +1,6 @@ { "keyboard_name": "IBM Model M 122-key", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/ibm122m", "maintainer": "qmk", "width": 24.75, "height": 8, diff --git a/keyboards/handwired/ibm122m/keymaps/andresteare/keymap.c b/keyboards/modelm/ibm122m/keymaps/andresteare/keymap.c similarity index 100% rename from keyboards/handwired/ibm122m/keymaps/andresteare/keymap.c rename to keyboards/modelm/ibm122m/keymaps/andresteare/keymap.c diff --git a/keyboards/handwired/ibm122m/keymaps/default/config.h b/keyboards/modelm/ibm122m/keymaps/default/config.h similarity index 100% rename from keyboards/handwired/ibm122m/keymaps/default/config.h rename to keyboards/modelm/ibm122m/keymaps/default/config.h diff --git a/keyboards/handwired/ibm122m/keymaps/default/keymap.c b/keyboards/modelm/ibm122m/keymaps/default/keymap.c similarity index 100% rename from keyboards/handwired/ibm122m/keymaps/default/keymap.c rename to keyboards/modelm/ibm122m/keymaps/default/keymap.c diff --git a/keyboards/handwired/ibm122m/keymaps/default/readme.md b/keyboards/modelm/ibm122m/keymaps/default/readme.md similarity index 100% rename from keyboards/handwired/ibm122m/keymaps/default/readme.md rename to keyboards/modelm/ibm122m/keymaps/default/readme.md diff --git a/keyboards/handwired/ibm122m/keymaps/lukaus/config.h b/keyboards/modelm/ibm122m/keymaps/lukaus/config.h similarity index 100% rename from keyboards/handwired/ibm122m/keymaps/lukaus/config.h rename to keyboards/modelm/ibm122m/keymaps/lukaus/config.h diff --git a/keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c b/keyboards/modelm/ibm122m/keymaps/lukaus/keymap.c similarity index 100% rename from keyboards/handwired/ibm122m/keymaps/lukaus/keymap.c rename to keyboards/modelm/ibm122m/keymaps/lukaus/keymap.c diff --git a/keyboards/handwired/ibm122m/keymaps/lukaus/readme.md b/keyboards/modelm/ibm122m/keymaps/lukaus/readme.md similarity index 100% rename from keyboards/handwired/ibm122m/keymaps/lukaus/readme.md rename to keyboards/modelm/ibm122m/keymaps/lukaus/readme.md diff --git a/keyboards/handwired/ibm122m/keymaps/via/keymap.c b/keyboards/modelm/ibm122m/keymaps/via/keymap.c similarity index 100% rename from keyboards/handwired/ibm122m/keymaps/via/keymap.c rename to keyboards/modelm/ibm122m/keymaps/via/keymap.c diff --git a/keyboards/handwired/ibm122m/keymaps/via/rules.mk b/keyboards/modelm/ibm122m/keymaps/via/rules.mk similarity index 100% rename from keyboards/handwired/ibm122m/keymaps/via/rules.mk rename to keyboards/modelm/ibm122m/keymaps/via/rules.mk diff --git a/keyboards/modelm/ibm122m/readme.md b/keyboards/modelm/ibm122m/readme.md new file mode 100644 index 000000000000..25cfe831a454 --- /dev/null +++ b/keyboards/modelm/ibm122m/readme.md @@ -0,0 +1,31 @@ +# ibm122m + +![IBM Model M 122 key](https://i.imgur.com/Oo3Ozqz.jpg) + +This is a keymap for the IBM Model M 122 key terminal keyboard running on a Teensy++ 2.0 +I wired it to weird pins on mine (mainly to accomodate two speakers), so make sure to update the pin arrays. + +Keyboard Maintainer: [Luke Stanley](https://github.com/lukexorz) +Hardware Supported: Teensy++ 2.0 +Hardware Availability: https://www.pjrc.com/store/teensypp.html + +Pins of the Teensy board you should use by default: +``` +Columns: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 +Pins: E6 B7 D0 D1 D2 D3 D4 D5 D6 D7 E0 E1 C0 C1 C2 C3 C4 C5 C7 F1 +-------------------------------------------------------- +Rows: 1 2 3 4 5 6 7 8 +Pins: F0 B5 B4 B3 B2 B1 B0 E7 +-------------------------------------------------------- +Status LEDs: CapsLock +5V ScrollLock NumLock +Pins: N/A 5V N/A N/A +-------------------------------------------------------- +Speaker: 1+ 1- 2+ 2- +Pins: C6 GND B6 GND +``` + +Make example for this keyboard (after setting up your build environment): + + make modelm/ibm122m:default + +See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. diff --git a/keyboards/handwired/ibm122m/rules.mk b/keyboards/modelm/ibm122m/rules.mk similarity index 100% rename from keyboards/handwired/ibm122m/rules.mk rename to keyboards/modelm/ibm122m/rules.mk diff --git a/keyboards/mschwingen/modelm/config.h b/keyboards/modelm/mschwingen/config.h similarity index 93% rename from keyboards/mschwingen/modelm/config.h rename to keyboards/modelm/mschwingen/config.h index 2b42bb38ed76..445210a1a54d 100644 --- a/keyboards/mschwingen/modelm/config.h +++ b/keyboards/modelm/mschwingen/config.h @@ -69,15 +69,15 @@ #define MODELM_LED2 B6 #define MODELM_LED3 D0 -#if defined(KEYBOARD_mschwingen_modelm_led_wired) +#if defined(KEYBOARD_modelm_mschwingen_led_wired) # define MODELM_LED_CAPSLOCK MODELM_LED1 # define MODELM_LED_SCROLLOCK MODELM_LED2 # define MODELM_LED_NUMLOCK MODELM_LED3 -#elif defined(KEYBOARD_mschwingen_modelm_led_ffc) +#elif defined(KEYBOARD_modelm_mschwingen_led_ffc) # define MODELM_LED_CAPSLOCK MODELM_LED2 # define MODELM_LED_SCROLLOCK MODELM_LED3 # define MODELM_LED_NUMLOCK MODELM_LED1 -#elif defined(KEYBOARD_mschwingen_modelm_led_ws2812) +#elif defined(KEYBOARD_modelm_mschwingen_led_ws2812) #else # error one of MODELM_LEDS_FFC, MODELM_LEDS_WIRED or MODELM_LEDS_WS2812 must be set! #endif diff --git a/keyboards/mschwingen/modelm/info.json b/keyboards/modelm/mschwingen/info.json similarity index 97% rename from keyboards/mschwingen/modelm/info.json rename to keyboards/modelm/mschwingen/info.json index f4e6ed1c1409..e96b19b91d11 100644 --- a/keyboards/mschwingen/modelm/info.json +++ b/keyboards/modelm/mschwingen/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "atmega32U4 board for IBM Model M", - "url": "", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/mschwingen", "maintainer": "mschwingen", "width": 23, "height": 7, diff --git a/keyboards/mschwingen/modelm/keymaps/default/keymap.c b/keyboards/modelm/mschwingen/keymaps/default/keymap.c similarity index 100% rename from keyboards/mschwingen/modelm/keymaps/default/keymap.c rename to keyboards/modelm/mschwingen/keymaps/default/keymap.c diff --git a/keyboards/mschwingen/modelm/led_ffc/rules.mk b/keyboards/modelm/mschwingen/led_ffc/rules.mk similarity index 100% rename from keyboards/mschwingen/modelm/led_ffc/rules.mk rename to keyboards/modelm/mschwingen/led_ffc/rules.mk diff --git a/keyboards/mschwingen/modelm/led_wired/rules.mk b/keyboards/modelm/mschwingen/led_wired/rules.mk similarity index 100% rename from keyboards/mschwingen/modelm/led_wired/rules.mk rename to keyboards/modelm/mschwingen/led_wired/rules.mk diff --git a/keyboards/mschwingen/modelm/led_ws2812/rules.mk b/keyboards/modelm/mschwingen/led_ws2812/rules.mk similarity index 100% rename from keyboards/mschwingen/modelm/led_ws2812/rules.mk rename to keyboards/modelm/mschwingen/led_ws2812/rules.mk diff --git a/keyboards/mschwingen/modelm/matrix.c b/keyboards/modelm/mschwingen/matrix.c similarity index 99% rename from keyboards/mschwingen/modelm/matrix.c rename to keyboards/modelm/mschwingen/matrix.c index ffc1284eadd9..e0735f32a0d3 100644 --- a/keyboards/mschwingen/modelm/matrix.c +++ b/keyboards/modelm/mschwingen/matrix.c @@ -22,7 +22,7 @@ #include "quantum.h" #include "spi_master.h" #include "print.h" -#include "modelm.h" +#include "mschwingen.h" #define DEBUG 0 @@ -96,7 +96,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) void matrix_init_custom(void) { unselect_cols(); - + // set 4MHz SPI clock SPSR = 0; SPCR = _BV(SPE) | _BV(MSTR) | _BV(CPOL); diff --git a/keyboards/mschwingen/modelm/modelm.c b/keyboards/modelm/mschwingen/mschwingen.c similarity index 96% rename from keyboards/mschwingen/modelm/modelm.c rename to keyboards/modelm/mschwingen/mschwingen.c index c1180612ad06..3d8919f01877 100644 --- a/keyboards/mschwingen/modelm/modelm.c +++ b/keyboards/modelm/mschwingen/mschwingen.c @@ -15,12 +15,11 @@ * along with this program. If not, see . */ #include -#include "modelm.h" +#include "mschwingen.h" #include "uart.h" #include "print.h" #include "sendchar.h" #include "ws2812.h" -#include "modelm.h" #include "sleep_led.h" #ifdef UART_DEBUG @@ -36,7 +35,7 @@ static uint16_t blink_cycle_timer; static bool blink_state = false; static uint8_t isRecording = 0; -#ifdef KEYBOARD_mschwingen_modelm_led_ws2812 +#ifdef KEYBOARD_modelm_mschwingen_led_ws2812 # if RGBLED_NUM < 3 # error we need at least 3 RGB LEDs! # endif @@ -81,7 +80,7 @@ void sleep_led_disable(void) { void sleep_led_enable(void) { suspend_active = true; writePinLow(QMK_LED); -#ifdef KEYBOARD_mschwingen_modelm_led_ws2812 +#ifdef KEYBOARD_modelm_mschwingen_led_ws2812 led[0] = black; led[1] = black; led[2] = black; @@ -90,7 +89,7 @@ void sleep_led_enable(void) { } void keyboard_pre_init_kb(void) { -#ifdef KEYBOARD_mschwingen_modelm_led_ws2812 +#ifdef KEYBOARD_modelm_mschwingen_led_ws2812 ws2812_setleds(led, RGBLED_NUM); #else /* Set status LEDs pins to output and Low (on) */ @@ -116,7 +115,7 @@ void keyboard_pre_init_kb(void) { writePinLow(SR_CLK_PIN); } -#ifdef KEYBOARD_mschwingen_modelm_led_ws2812 +#ifdef KEYBOARD_modelm_mschwingen_led_ws2812 static void led_update_rgb(void) { if (isRecording && blink_state) { led[0] = white; diff --git a/keyboards/mschwingen/modelm/modelm.h b/keyboards/modelm/mschwingen/mschwingen.h similarity index 95% rename from keyboards/mschwingen/modelm/modelm.h rename to keyboards/modelm/mschwingen/mschwingen.h index 04b6b6112570..3b099e4bac50 100644 --- a/keyboards/mschwingen/modelm/modelm.h +++ b/keyboards/modelm/mschwingen/mschwingen.h @@ -27,7 +27,7 @@ extern void update_layer_leds(void); * The second section defines position of the keys on the switch matrix * (where COLUMNS and ROWS crosses). */ -/* universla layout for both 101 and 102-key versions */ +/* universal layout for both 101 and 102-key versions */ #define LAYOUT( \ K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ \ @@ -37,7 +37,7 @@ extern void update_layer_leds(void); K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, K1P, K1Q, K1R, \ K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J \ ) \ - {/* COL0 ............ COL7 */ \ + {/* COL0 ............ COL7 */ \ { K0D , KC_NO, KC_NO, K5O , K5N , KC_NO, KC_NO, K0B }, /* ROW0 */ \ { K0F , K5P , K1R , K3U , K3P , K4P , KC_NO, K1N }, \ { K4U , K4T , K1Q , K3T , K3Q , K4Q , K2Q , K0J }, \ diff --git a/keyboards/mschwingen/modelm/readme.md b/keyboards/modelm/mschwingen/readme.md similarity index 77% rename from keyboards/mschwingen/modelm/readme.md rename to keyboards/modelm/mschwingen/readme.md index f4cb3606252f..fd47af346a58 100644 --- a/keyboards/mschwingen/modelm/readme.md +++ b/keyboards/modelm/mschwingen/readme.md @@ -10,15 +10,15 @@ This is a configuration of QMK intended to be used with the [Model M USB PCB](ht Make example for this keyboard (after setting up your build environment), run one of: - make mschwingen/modelm/led_wired:default - make mschwingen/modelm/led_ffc:default - make mschwingen/modelm/led_ws2812:default + make modelm/mschwingen/led_wired:default + make modelm/mschwingen/led_ffc:default + make modelm/mschwingen/led_ws2812:default flash: - make mschwingen/modelm/led_wired:default:flash - make mschwingen/modelm/led_ffc:default:flash - make mschwingen/modelm/led_ws2812:default:flash + make modelm/mschwingen/led_wired:default:flash + make modelm/mschwingen/led_ffc:default:flash + make modelm/mschwingen/led_ws2812:default:flash Bootloader: do not use the QMK bootloader, use the bootloader from [here](https://github.com/mschwingen/modelm-lufa-bootloader) diff --git a/keyboards/mschwingen/modelm/rules.mk b/keyboards/modelm/mschwingen/rules.mk similarity index 96% rename from keyboards/mschwingen/modelm/rules.mk rename to keyboards/modelm/mschwingen/rules.mk index 6775dfa203b6..b128f276104d 100644 --- a/keyboards/mschwingen/modelm/rules.mk +++ b/keyboards/modelm/mschwingen/rules.mk @@ -40,4 +40,4 @@ ifeq ($(strip $(UART_DEBUG)), yes) OPT_DEFS += -DUART_DEBUG endif -DEFAULT_FOLDER = mschwingen/modelm/led_wired +DEFAULT_FOLDER = modelm/mschwingen/led_wired diff --git a/keyboards/modelm/readme.md b/keyboards/modelm/readme.md new file mode 100644 index 000000000000..645f81b7210d --- /dev/null +++ b/keyboards/modelm/readme.md @@ -0,0 +1,23 @@ +# IBM Model M + +This is the parent directory for all projects that replace the controller +of IBM's Model M Keyboard and then run QMK on it. + +These controllers differ in their use of microcontrollers, connection (mainly +USB) optional speakers etc. + +Some of them can be bought fully assembled others are do-it-yourself. + +## Warning - Model M Variants + +**Not all of these projects will fit into your keyboard!** + +As the Model M was produced over several years there are many variants of the +controller PCB. Check what fits your keyboard before you build/order one. + +The variants built for PCs differ in: +* PCB size +* Connectors (8/12 pin flex, location) +* Ground wire connector location + +Additionally IBM built Model M keyboards for terminals with 122 keys etc. diff --git a/keyboards/converter/modelm101/.noci b/keyboards/modelm/teensypp/.noci similarity index 100% rename from keyboards/converter/modelm101/.noci rename to keyboards/modelm/teensypp/.noci diff --git a/keyboards/converter/modelm101/config.h b/keyboards/modelm/teensypp/config.h similarity index 100% rename from keyboards/converter/modelm101/config.h rename to keyboards/modelm/teensypp/config.h diff --git a/keyboards/converter/modelm101/info.json b/keyboards/modelm/teensypp/info.json similarity index 94% rename from keyboards/converter/modelm101/info.json rename to keyboards/modelm/teensypp/info.json index 868cd89b1a60..a0174dcbccbd 100644 --- a/keyboards/converter/modelm101/info.json +++ b/keyboards/modelm/teensypp/info.json @@ -1,12 +1,12 @@ { - "keyboard_name": "IBM Model M 101 ANSI/102 ISO", - "url": "https://github.com/iw0rm3r/qmk_firmware/tree/modelm101/keyboards/converter/modelm101", - "maintainer": "iw0rm3r", - "width": 22.5, - "height": 6.5, + "keyboard_name": "IBM Model M 101 ANSI/102 ISO", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/teensypp", + "maintainer": "iw0rm3r", + "width": 22.5, + "height": 6.5, "layouts": { "LAYOUT": { "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] } } -} \ No newline at end of file +} diff --git a/keyboards/converter/modelm101/keymaps/default/config.h b/keyboards/modelm/teensypp/keymaps/default/config.h similarity index 100% rename from keyboards/converter/modelm101/keymaps/default/config.h rename to keyboards/modelm/teensypp/keymaps/default/config.h diff --git a/keyboards/converter/modelm101/keymaps/default/keymap.c b/keyboards/modelm/teensypp/keymaps/default/keymap.c similarity index 100% rename from keyboards/converter/modelm101/keymaps/default/keymap.c rename to keyboards/modelm/teensypp/keymaps/default/keymap.c diff --git a/keyboards/converter/modelm101/keymaps/default/readme.md b/keyboards/modelm/teensypp/keymaps/default/readme.md similarity index 100% rename from keyboards/converter/modelm101/keymaps/default/readme.md rename to keyboards/modelm/teensypp/keymaps/default/readme.md diff --git a/keyboards/converter/modelm101/keymaps/iw0rm3r/config.h b/keyboards/modelm/teensypp/keymaps/iw0rm3r/config.h similarity index 100% rename from keyboards/converter/modelm101/keymaps/iw0rm3r/config.h rename to keyboards/modelm/teensypp/keymaps/iw0rm3r/config.h diff --git a/keyboards/converter/modelm101/keymaps/iw0rm3r/keymap.c b/keyboards/modelm/teensypp/keymaps/iw0rm3r/keymap.c similarity index 100% rename from keyboards/converter/modelm101/keymaps/iw0rm3r/keymap.c rename to keyboards/modelm/teensypp/keymaps/iw0rm3r/keymap.c diff --git a/keyboards/converter/modelm101/keymaps/iw0rm3r/readme.md b/keyboards/modelm/teensypp/keymaps/iw0rm3r/readme.md similarity index 100% rename from keyboards/converter/modelm101/keymaps/iw0rm3r/readme.md rename to keyboards/modelm/teensypp/keymaps/iw0rm3r/readme.md diff --git a/keyboards/converter/modelm101/readme.md b/keyboards/modelm/teensypp/readme.md similarity index 81% rename from keyboards/converter/modelm101/readme.md rename to keyboards/modelm/teensypp/readme.md index 5355c8007142..aa61f02113c2 100644 --- a/keyboards/converter/modelm101/readme.md +++ b/keyboards/modelm/teensypp/readme.md @@ -2,14 +2,14 @@ ![IBM Model M 101 ANSI/102 ISO](https://i.imgur.com/DAE3W7g.jpg) -This is a configuration for the QMK firmware for reversible conversion of IBM's Model M keyboards (common 101-key ANSI and 102-key ISO models) from stock, power-hungry controller, to a modern one, running the USB bus. -Configuration is build for the Atmel AT90USB1286 controller, which you can easily use on the Teensy 2.0++ board (produced by PJRC). +This is a configuration for the QMK firmware for reversible conversion of IBM's Model M keyboards (common 101-key ANSI and 102-key ISO models) from stock, power-hungry controller, to a modern one, running the USB bus. +Configuration is build for the Atmel AT90USB1286 controller, which you can easily use on the Teensy++ 2.0 board (produced by PJRC). Project is heavely based on 2 other projects: -1. Teensy 2.0++-based custom Model M controller running TMK firmware ('modelm" by [lmorchard](https://blog.lmorchard.com/2016/02/21/modelm-controller/)); - had a few issues. -2. Teensy 2.0++-based custom Model M 122-key controller running QMK firmware ("ibm122m" by [lukexorz](https://github.com/lukexorz)); - had wrong layout for 101/102-key boards and no status LED support. +1. Teensy++ 2.0-based custom Model M controller running TMK firmware ('modelm" by [lmorchard](https://blog.lmorchard.com/2016/02/21/modelm-controller/)); - had a few issues. +2. Teensy++ 2.0-based custom Model M 122-key controller running QMK firmware ("ibm122m" by [lukexorz](https://github.com/lukexorz)); - had wrong layout for 101/102-key boards and no status LED support. -For this conversion you will need: -1. Teensy 2.0++ dev board itself (can be used a different dev board, but it will require some changes in configuration); +For this conversion you will need: +1. Teensy++ 2.0 dev board itself (can be used a different dev board, but it will require some changes in configuration); 2. Ribbon connectors to connect the membrane to a dev board. Depending on your Model M variation, you will need 1 Trio-mate 16pin connector (6-520315-6 or 6-520415-6) and 1 Trio-mate 8pin connector (5-120628-8 or 5-520314-8), or 2 Trio-mate 16pin connectors; 3. Full-sized breadboard (without power rails; half-size should do, but full-sized one looks more native) or a PCB to wire everything up; 4. A bunch of jumper wires; @@ -27,16 +27,16 @@ Pins: F7 F6 F5 F4 F3 F2 F1 F0 -------------------------------------------------------- Status LEDs: CapsLock +5V ScrollLock NumLock Pins: B6 5V B5 B4 -``` +``` -Please note that some versions of Model M have LED connected with a ribbon cable, and not with separate wires. +Please note that some versions of Model M have LED connected with a ribbon cable, and not with separate wires. -Keyboard Maintainer: [iw0rm3r](https://github.com/iw0rm3r) -Hardware Supported: Teensy 2.0++ board by PJRC +Keyboard Maintainer: [iw0rm3r](https://github.com/iw0rm3r) +Hardware Supported: Teensy++ 2.0 board by PJRC Hardware Availability: https://www.pjrc.com/store/teensypp.html Make example for this keyboard (after setting up your build environment): - make converter/modelm101:default:teensy + make modelm/teensypp:default:teensy 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/converter/modelm101/rules.mk b/keyboards/modelm/teensypp/rules.mk similarity index 100% rename from keyboards/converter/modelm101/rules.mk rename to keyboards/modelm/teensypp/rules.mk diff --git a/keyboards/converter/modelm101/modelm101.c b/keyboards/modelm/teensypp/teensypp.c similarity index 98% rename from keyboards/converter/modelm101/modelm101.c rename to keyboards/modelm/teensypp/teensypp.c index c2204bea660e..fded2747d33f 100644 --- a/keyboards/converter/modelm101/modelm101.c +++ b/keyboards/modelm/teensypp/teensypp.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "modelm101.h" +#include "teensypp.h" void keyboard_pre_init_kb(void) { /* Setting status LEDs pins to output and +5V (off) */ diff --git a/keyboards/converter/modelm101/modelm101.h b/keyboards/modelm/teensypp/teensypp.h similarity index 100% rename from keyboards/converter/modelm101/modelm101.h rename to keyboards/modelm/teensypp/teensypp.h diff --git a/keyboards/yugo_m/model_m_101/config.h b/keyboards/modelm/yugo_m/config.h similarity index 100% rename from keyboards/yugo_m/model_m_101/config.h rename to keyboards/modelm/yugo_m/config.h diff --git a/keyboards/yugo_m/model_m_101/info.json b/keyboards/modelm/yugo_m/info.json similarity index 97% rename from keyboards/yugo_m/model_m_101/info.json rename to keyboards/modelm/yugo_m/info.json index ec0c0f280100..6618f83c6a5a 100644 --- a/keyboards/yugo_m/model_m_101/info.json +++ b/keyboards/modelm/yugo_m/info.json @@ -1,6 +1,6 @@ { "keyboard_name": "IBM Model M 101/102", - "url": "https://github.com/tomic1785/qmk_firmware/tree/stm32_model_m/keyboards/yugo_m/model_m_101", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/yugo_m", "maintainer": "Nidzo Tomic", "width": 22.5, "height": 6.5, diff --git a/keyboards/yugo_m/model_m_101/keymaps/default/keymap.c b/keyboards/modelm/yugo_m/keymaps/default/keymap.c similarity index 100% rename from keyboards/yugo_m/model_m_101/keymaps/default/keymap.c rename to keyboards/modelm/yugo_m/keymaps/default/keymap.c diff --git a/keyboards/yugo_m/model_m_101/keymaps/default/readme.md b/keyboards/modelm/yugo_m/keymaps/default/readme.md similarity index 100% rename from keyboards/yugo_m/model_m_101/keymaps/default/readme.md rename to keyboards/modelm/yugo_m/keymaps/default/readme.md diff --git a/keyboards/yugo_m/model_m_101/readme.md b/keyboards/modelm/yugo_m/readme.md similarity index 96% rename from keyboards/yugo_m/model_m_101/readme.md rename to keyboards/modelm/yugo_m/readme.md index 598f0fa79d26..d80df0573b01 100644 --- a/keyboards/yugo_m/model_m_101/readme.md +++ b/keyboards/modelm/yugo_m/readme.md @@ -12,6 +12,6 @@ A drop-in replacement controller PCB for IBM Model M keyboards, based on the STM Make example for this keyboard (after setting up your build environment): - make yugo_m/model_m_101:default + make modelm/yugo_m:default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/yugo_m/model_m_101/rules.mk b/keyboards/modelm/yugo_m/rules.mk similarity index 100% rename from keyboards/yugo_m/model_m_101/rules.mk rename to keyboards/modelm/yugo_m/rules.mk diff --git a/keyboards/yugo_m/model_m_101/model_m_101.c b/keyboards/modelm/yugo_m/yugo_m.c similarity index 97% rename from keyboards/yugo_m/model_m_101/model_m_101.c rename to keyboards/modelm/yugo_m/yugo_m.c index 34755cf4bcdb..f04d3fc1f4bd 100644 --- a/keyboards/yugo_m/model_m_101/model_m_101.c +++ b/keyboards/modelm/yugo_m/yugo_m.c @@ -13,14 +13,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "model_m_101.h" +#include "yugo_m.h" void keyboard_pre_init_kb(void) { // Set our LED pins as output setPinOutput(A2); setPinOutput(A1); setPinOutput(A0); - + keyboard_pre_init_user(); } diff --git a/keyboards/yugo_m/model_m_101/model_m_101.h b/keyboards/modelm/yugo_m/yugo_m.h similarity index 100% rename from keyboards/yugo_m/model_m_101/model_m_101.h rename to keyboards/modelm/yugo_m/yugo_m.h diff --git a/keyboards/readme.md b/keyboards/readme.md index 6b7b92e0cf7b..cb43ba28be2c 100644 --- a/keyboards/readme.md +++ b/keyboards/readme.md @@ -43,6 +43,7 @@ These keyboards are part of the QMK repository, but their manufacturers are not * [GH60](/keyboards/gh60) — A 60% Geekhack community-driven project. * [GON NerD](/keyboards/gonnerd) — Korean custom 60% PCB * [Happy Hacking Keyboard](/keyboards/hhkb) — The Happy Hacking keyboard can be hacked with a custom controller to run QMK. +* [IBM Model M](/keyboards/modelm) — The classic IBM Model M can be modernized with one of several custom controllers to run QMK. * [Infinity 60%](/keyboards/infinity60) - — Compact community keyboard by Input Club. * [JD45](/keyboards/jd45) — Another Geekhack community project, designed by jdcarpe. * [JJ40](/keyboards/jj40) — ps2avrGB based ortholinear sold by KPrepublic diff --git a/keyboards/yugo_m/readme.md b/keyboards/yugo_m/readme.md deleted file mode 100644 index 557c4262d543..000000000000 --- a/keyboards/yugo_m/readme.md +++ /dev/null @@ -1,11 +0,0 @@ -# Yugo-M - An STM32-based IBM Model M controller - -A drop-in replacement controller PCB for IBM Model M keyboards. -Currently available only for 101/102 key keyboards. - -* Keyboard Maintainer: [Nidzo Tomic](https://github.com/tomic1785) -* Hardware Supported: Yugo-M PCB - * Rev 0.9b - * Rev 1.1b - -For more info visit the project repository: [Yugo-M-controller-project](https://github.com/tomic1785/Yugo-M-controller-project)