From 9a7cf626924c5e8750972d6d00d114d9ac34e938 Mon Sep 17 00:00:00 2001 From: nuess0r Date: Mon, 3 May 2021 22:11:18 +0200 Subject: [PATCH 01/25] 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 ---------- keyboards/lxxt/config.h | 2 +- .../ashpil_usbc/ashpil_usbc.c} | 0 .../ashpil_usbc}/info.json | 2 +- .../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/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 | 8 +++-- .../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} | 0 .../mschwingen}/post_rules.mk | 0 .../modelm => modelm/mschwingen}/readme.md | 12 +++---- .../modelm => modelm/mschwingen}/rules.mk | 2 +- keyboards/modelm/readme.md | 23 ++++++++++++++ keyboards/modelm/teensypp/.noci | 0 .../modelm101 => modelm/teensypp}/config.h | 0 .../modelm101 => modelm/teensypp}/info.json | 2 +- .../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} | 0 .../model_m_101 => modelm/yugo_m}/config.h | 0 .../model_m_101 => modelm/yugo_m}/info.json | 4 +-- .../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} | 2 +- keyboards/yugo_m/readme.md | 19 ------------ 55 files changed, 97 insertions(+), 74 deletions(-) delete mode 100644 keyboards/handwired/ibm122m/readme.md rename keyboards/{ashpil/modelm_usbc/modelm_usbc.c => modelm/ashpil_usbc/ashpil_usbc.c} (100%) rename keyboards/{ashpil/modelm_usbc => modelm/ashpil_usbc}/info.json (99%) 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/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 (92%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/info.json (95%) 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} (100%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/post_rules.mk (100%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/readme.md (77%) rename keyboards/{mschwingen/modelm => modelm/mschwingen}/rules.mk (94%) create mode 100644 keyboards/modelm/readme.md create mode 100644 keyboards/modelm/teensypp/.noci rename keyboards/{converter/modelm101 => modelm/teensypp}/config.h (100%) rename keyboards/{converter/modelm101 => modelm/teensypp}/info.json (98%) 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} (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 (99%) 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 (97%) 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} (99%) 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/lxxt/config.h b/keyboards/lxxt/config.h index 03ef56622c0c..df0d65abbb6b 100644 --- a/keyboards/lxxt/config.h +++ b/keyboards/lxxt/config.h @@ -16,4 +16,4 @@ #pragma once -#define WS2812_PIO_USE_PIO1 \ No newline at end of file +#define WS2812_PIO_USE_PIO1 diff --git a/keyboards/ashpil/modelm_usbc/modelm_usbc.c b/keyboards/modelm/ashpil_usbc/ashpil_usbc.c similarity index 100% rename from keyboards/ashpil/modelm_usbc/modelm_usbc.c rename to keyboards/modelm/ashpil_usbc/ashpil_usbc.c diff --git a/keyboards/ashpil/modelm_usbc/info.json b/keyboards/modelm/ashpil_usbc/info.json similarity index 99% rename from keyboards/ashpil/modelm_usbc/info.json rename to keyboards/modelm/ashpil_usbc/info.json index 4d8eec3167df..797ed5a5c945 100644 --- a/keyboards/ashpil/modelm_usbc/info.json +++ b/keyboards/modelm/ashpil_usbc/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "IBM Model M 101/102", "manufacturer": "ashpil", - "url": "https://github.com/ashpil/qmk_firmware/tree/master/keyboards/ashpil/modelm_usbc", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/ashpil_usbc", "maintainer": "ashpil", "usb": { "vid": "0xFEED", 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/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 8dbdbb9fb502..a1f1698455c5 100644 --- a/keyboards/handwired/ibm122m/info.json +++ b/keyboards/modelm/ibm122m/info.json @@ -1,6 +1,7 @@ { "keyboard_name": "IBM Model M 122 key", "manufacturer": "IBM", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/ibm122m", "maintainer": "qmk", "usb": { "vid": "0xFEED", 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 92% rename from keyboards/mschwingen/modelm/config.h rename to keyboards/modelm/mschwingen/config.h index c828bd36ff81..4e83b0494286 100644 --- a/keyboards/mschwingen/modelm/config.h +++ b/keyboards/modelm/mschwingen/config.h @@ -56,15 +56,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 95% rename from keyboards/mschwingen/modelm/info.json rename to keyboards/modelm/mschwingen/info.json index 8005f5e7f779..17717d579994 100644 --- a/keyboards/mschwingen/modelm/info.json +++ b/keyboards/modelm/mschwingen/info.json @@ -1,18 +1,22 @@ { - "keyboard_name": "IBM Model M 101/102", + "keyboard_name": "atmega32U4 board for IBM Model M", "manufacturer": "mschwingen", - "url": "", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/mschwingen", "maintainer": "mschwingen", "usb": { "vid": "0xFEED", "pid": "0x558E", "device_version": "0.0.1" +<<<<<<< HEAD:keyboards/mschwingen/modelm/info.json }, "ws2812": { "pin": "B6" }, "processor": "atmega32u4", "bootloader": "lufa-dfu", +======= + } +>>>>>>> c8a369be5c (Putting all IBM Model M projects under one folder):keyboards/modelm/mschwingen/info.json "layouts": { "LAYOUT": { "layout": [ 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 7ea20b5a11ff..9997b659756e 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 SPI_TIMEOUT 100 @@ -93,7 +93,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 23d1b1484a4b..1d04e242c037 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(MODELM_STATUS_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 100% rename from keyboards/mschwingen/modelm/modelm.h rename to keyboards/modelm/mschwingen/mschwingen.h diff --git a/keyboards/mschwingen/modelm/post_rules.mk b/keyboards/modelm/mschwingen/post_rules.mk similarity index 100% rename from keyboards/mschwingen/modelm/post_rules.mk rename to keyboards/modelm/mschwingen/post_rules.mk 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 94% rename from keyboards/mschwingen/modelm/rules.mk rename to keyboards/modelm/mschwingen/rules.mk index 94830f7a75d1..334298d93ba9 100644 --- a/keyboards/mschwingen/modelm/rules.mk +++ b/keyboards/modelm/mschwingen/rules.mk @@ -26,4 +26,4 @@ OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS28 LTO_ENABLE = yes -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/modelm/teensypp/.noci b/keyboards/modelm/teensypp/.noci new file mode 100644 index 000000000000..e69de29bb2d1 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 98% rename from keyboards/converter/modelm101/info.json rename to keyboards/modelm/teensypp/info.json index c59df57e8114..0f546f7d2b2a 100644 --- a/keyboards/converter/modelm101/info.json +++ b/keyboards/modelm/teensypp/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "IBM Model M 101/102", "manufacturer": "iw0rm3r", - "url": "https://github.com/iw0rm3r/qmk_firmware/tree/modelm101/keyboards/converter/modelm101", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/teensypp", "maintainer": "iw0rm3r", "usb": { "vid": "0xFEED", 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 100% rename from keyboards/converter/modelm101/modelm101.c rename to keyboards/modelm/teensypp/teensypp.c 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 99% rename from keyboards/yugo_m/model_m_101/info.json rename to keyboards/modelm/yugo_m/info.json index 9c1aeb0ac9cf..11d66dc1a253 100644 --- a/keyboards/yugo_m/model_m_101/info.json +++ b/keyboards/modelm/yugo_m/info.json @@ -1,7 +1,7 @@ { - "keyboard_name": "Yugo-M (Model M replacment controller)", + "keyboard_name": "Yugo-M (IBM Model M replacment controller)", "manufacturer": "IBM", - "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", "usb": { "vid": "0xFEED", 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 97% rename from keyboards/yugo_m/model_m_101/readme.md rename to keyboards/modelm/yugo_m/readme.md index 7c14dea80423..89e1fae7676d 100644 --- a/keyboards/yugo_m/model_m_101/readme.md +++ b/keyboards/modelm/yugo_m/readme.md @@ -12,7 +12,7 @@ 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 99% rename from keyboards/yugo_m/model_m_101/model_m_101.c rename to keyboards/modelm/yugo_m/yugo_m.c index 87e681d8e099..542043d5dc6b 100644 --- a/keyboards/yugo_m/model_m_101/model_m_101.c +++ b/keyboards/modelm/yugo_m/yugo_m.c @@ -20,7 +20,7 @@ void keyboard_pre_init_kb(void) { setPinOutput(A2); setPinOutput(A1); setPinOutput(A0); - + keyboard_pre_init_user(); } diff --git a/keyboards/yugo_m/readme.md b/keyboards/yugo_m/readme.md deleted file mode 100644 index 40c7b6407353..000000000000 --- a/keyboards/yugo_m/readme.md +++ /dev/null @@ -1,19 +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) - - - -Note regarding 2022 matrix update: - -The original author's firmware did not make several lesser-used membrane/matrix positions available to the controller. These are useful for JIS users and/or if you simply want to create a more unique layout. I've added all of the unused membrane positions to the firmware, except for an extremely seldom used one that sits in the left side of the space bar on some later membranes (I would have added it if I knew its matrix position, but I haven't mapped that out yet). The default mappings for these additional keys follow JIS conventions, except for the extra key on the bottom right corner of the numpad (lower half of vertical 2u Enter), which I've mapped to the LGUI key a.k.a. left Windows/Command key for now. Remap as you wish! - -- an_achronism, February 2022 \ No newline at end of file From 54ce10e86c26eacdb89b577908a0ace70aa4afff Mon Sep 17 00:00:00 2001 From: nuess0r Date: Sun, 16 May 2021 21:12:55 +0200 Subject: [PATCH 02/25] Add readme files for the different mschwingen targets This fixes a linter error. --- keyboards/modelm/mschwingen/led_ffc/readme.md | 21 +++++++++++++++++++ .../modelm/mschwingen/led_wired/readme.md | 21 +++++++++++++++++++ .../modelm/mschwingen/led_ws2812/readme.md | 21 +++++++++++++++++++ 3 files changed, 63 insertions(+) create mode 100644 keyboards/modelm/mschwingen/led_ffc/readme.md create mode 100644 keyboards/modelm/mschwingen/led_wired/readme.md create mode 100644 keyboards/modelm/mschwingen/led_ws2812/readme.md diff --git a/keyboards/modelm/mschwingen/led_ffc/readme.md b/keyboards/modelm/mschwingen/led_ffc/readme.md new file mode 100644 index 000000000000..2b958a93264f --- /dev/null +++ b/keyboards/modelm/mschwingen/led_ffc/readme.md @@ -0,0 +1,21 @@ +# atmega32U4 board for IBM Model M, LEDs connected with flexible flat cable (FFC) + +![modelm](https://raw.githubusercontent.com/mschwingen/hardware/master/modelm-usb/images/PCB.jpg) + +This is a configuration of QMK intended to be used with the [Model M USB PCB](https://github.com/mschwingen/hardware/tree/master/modelm-usb). + +* Keyboard Maintainer: [Michael Schwingen](https://github.com/mschwingen/) +* Hardware Supported: [Model M USB PCB](https://github.com/mschwingen/hardware/tree/master/modelm-usb) +* Hardware Availability: need to build your own. + +Make example for this keyboard (after setting up your build environment), run one of: + + make modelm/mschwingen/led_ffc:default + +flash: + + make modelm/mschwingen/led_ffc:default:flash + +Bootloader: do not use the QMK bootloader, use the bootloader from [here](https://github.com/mschwingen/modelm-lufa-bootloader) + +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/modelm/mschwingen/led_wired/readme.md b/keyboards/modelm/mschwingen/led_wired/readme.md new file mode 100644 index 000000000000..42fe8075e993 --- /dev/null +++ b/keyboards/modelm/mschwingen/led_wired/readme.md @@ -0,0 +1,21 @@ +# atmega32U4 board for IBM Model M, LEDs connected with wires + +![modelm](https://raw.githubusercontent.com/mschwingen/hardware/master/modelm-usb/images/PCB.jpg) + +This is a configuration of QMK intended to be used with the [Model M USB PCB](https://github.com/mschwingen/hardware/tree/master/modelm-usb). + +* Keyboard Maintainer: [Michael Schwingen](https://github.com/mschwingen/) +* Hardware Supported: [Model M USB PCB](https://github.com/mschwingen/hardware/tree/master/modelm-usb) +* Hardware Availability: need to build your own. + +Make example for this keyboard (after setting up your build environment), run one of: + + make modelm/mschwingen/led_wired:default + +flash: + + make modelm/mschwingen/led_wired:default:flash + +Bootloader: do not use the QMK bootloader, use the bootloader from [here](https://github.com/mschwingen/modelm-lufa-bootloader) + +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/modelm/mschwingen/led_ws2812/readme.md b/keyboards/modelm/mschwingen/led_ws2812/readme.md new file mode 100644 index 000000000000..37e9e0434892 --- /dev/null +++ b/keyboards/modelm/mschwingen/led_ws2812/readme.md @@ -0,0 +1,21 @@ +# atmega32U4 board for IBM Model M, old LEDs replaces with WS2812 RGB LEDs + +![modelm](https://raw.githubusercontent.com/mschwingen/hardware/master/modelm-usb/images/PCB.jpg) + +This is a configuration of QMK intended to be used with the [Model M USB PCB](https://github.com/mschwingen/hardware/tree/master/modelm-usb). + +* Keyboard Maintainer: [Michael Schwingen](https://github.com/mschwingen/) +* Hardware Supported: [Model M USB PCB](https://github.com/mschwingen/hardware/tree/master/modelm-usb) +* Hardware Availability: need to build your own. + +Make example for this keyboard (after setting up your build environment), run one of: + + make modelm/mschwingen/led_ws2812: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) + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). From 01ea5468014941d5a387c54e64b3b10eb1800d14 Mon Sep 17 00:00:00 2001 From: nuess0r Date: Tue, 26 Oct 2021 23:54:47 +0200 Subject: [PATCH 03/25] Move Model M SSK controller based on Teensy++ 2.0 to consolidated folder --- keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/config.h | 0 keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/info.json | 0 .../modelm_ssk => modelm/teensypp_ssk}/keymaps/default/keymap.c | 0 .../modelm_ssk => modelm/teensypp_ssk}/keymaps/default/readme.md | 0 .../modelm_ssk => modelm/teensypp_ssk}/keymaps/tiltowait/config.h | 0 .../modelm_ssk => modelm/teensypp_ssk}/keymaps/tiltowait/keymap.c | 0 .../teensypp_ssk}/keymaps/tiltowait/readme.md | 0 keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/readme.md | 0 keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/rules.mk | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/config.h (100%) rename keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/info.json (100%) rename keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/keymaps/default/keymap.c (100%) rename keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/keymaps/default/readme.md (100%) rename keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/keymaps/tiltowait/config.h (100%) rename keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/keymaps/tiltowait/keymap.c (100%) rename keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/keymaps/tiltowait/readme.md (100%) rename keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/readme.md (100%) rename keyboards/{converter/modelm_ssk => modelm/teensypp_ssk}/rules.mk (100%) diff --git a/keyboards/converter/modelm_ssk/config.h b/keyboards/modelm/teensypp_ssk/config.h similarity index 100% rename from keyboards/converter/modelm_ssk/config.h rename to keyboards/modelm/teensypp_ssk/config.h diff --git a/keyboards/converter/modelm_ssk/info.json b/keyboards/modelm/teensypp_ssk/info.json similarity index 100% rename from keyboards/converter/modelm_ssk/info.json rename to keyboards/modelm/teensypp_ssk/info.json diff --git a/keyboards/converter/modelm_ssk/keymaps/default/keymap.c b/keyboards/modelm/teensypp_ssk/keymaps/default/keymap.c similarity index 100% rename from keyboards/converter/modelm_ssk/keymaps/default/keymap.c rename to keyboards/modelm/teensypp_ssk/keymaps/default/keymap.c diff --git a/keyboards/converter/modelm_ssk/keymaps/default/readme.md b/keyboards/modelm/teensypp_ssk/keymaps/default/readme.md similarity index 100% rename from keyboards/converter/modelm_ssk/keymaps/default/readme.md rename to keyboards/modelm/teensypp_ssk/keymaps/default/readme.md diff --git a/keyboards/converter/modelm_ssk/keymaps/tiltowait/config.h b/keyboards/modelm/teensypp_ssk/keymaps/tiltowait/config.h similarity index 100% rename from keyboards/converter/modelm_ssk/keymaps/tiltowait/config.h rename to keyboards/modelm/teensypp_ssk/keymaps/tiltowait/config.h diff --git a/keyboards/converter/modelm_ssk/keymaps/tiltowait/keymap.c b/keyboards/modelm/teensypp_ssk/keymaps/tiltowait/keymap.c similarity index 100% rename from keyboards/converter/modelm_ssk/keymaps/tiltowait/keymap.c rename to keyboards/modelm/teensypp_ssk/keymaps/tiltowait/keymap.c diff --git a/keyboards/converter/modelm_ssk/keymaps/tiltowait/readme.md b/keyboards/modelm/teensypp_ssk/keymaps/tiltowait/readme.md similarity index 100% rename from keyboards/converter/modelm_ssk/keymaps/tiltowait/readme.md rename to keyboards/modelm/teensypp_ssk/keymaps/tiltowait/readme.md diff --git a/keyboards/converter/modelm_ssk/readme.md b/keyboards/modelm/teensypp_ssk/readme.md similarity index 100% rename from keyboards/converter/modelm_ssk/readme.md rename to keyboards/modelm/teensypp_ssk/readme.md diff --git a/keyboards/converter/modelm_ssk/rules.mk b/keyboards/modelm/teensypp_ssk/rules.mk similarity index 100% rename from keyboards/converter/modelm_ssk/rules.mk rename to keyboards/modelm/teensypp_ssk/rules.mk From 0a250e2882013d4a46155c8f2848b91a0ccde1f6 Mon Sep 17 00:00:00 2001 From: nuess0r Date: Sun, 31 Oct 2021 20:44:19 +0100 Subject: [PATCH 04/25] Fix readme and URL for moved SSK project --- keyboards/modelm/readme.md | 3 ++- keyboards/modelm/teensypp_ssk/readme.md | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/modelm/readme.md b/keyboards/modelm/readme.md index 645f81b7210d..048b02495a95 100644 --- a/keyboards/modelm/readme.md +++ b/keyboards/modelm/readme.md @@ -20,4 +20,5 @@ The variants built for PCs differ in: * Connectors (8/12 pin flex, location) * Ground wire connector location -Additionally IBM built Model M keyboards for terminals with 122 keys etc. +Additionally IBM built Model M variants for terminals with 122 keys, the +space saving keyboard (SSK, 84-key) etc. diff --git a/keyboards/modelm/teensypp_ssk/readme.md b/keyboards/modelm/teensypp_ssk/readme.md index 8105a0c2dfd3..d413a0fbf6d5 100644 --- a/keyboards/modelm/teensypp_ssk/readme.md +++ b/keyboards/modelm/teensypp_ssk/readme.md @@ -2,7 +2,7 @@ ![IBM Model M Space-Saving Keyboard](https://i.imgur.com/CSXrQI5.jpg) -This is a QMK firmware configuration for the IBM Model M Space-Saving Keyboard (SSK). Based on [this project](https://github.com/qmk/qmk_firmware/tree/master/keyboards/converter/modelm101), it features a few slight improvements and, most importantly, a full remapping to match the SSK's matrix, which differs from its full-sized cousins. The modification is easily reversible, as no part of the keyboard is permanently changed. Just take out the replacement controller and reinstall the original, should you desire. +This is a QMK firmware configuration for the IBM Model M Space-Saving Keyboard (SSK). Based on [this project](https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/teensypp), it features a few slight improvements and, most importantly, a full remapping to match the SSK's matrix, which differs from its full-sized cousins. The modification is easily reversible, as no part of the keyboard is permanently changed. Just take out the replacement controller and reinstall the original, should you desire. The numpad layer (accessed with Shift + Scroll Lock as with the original controller) is mapped to layer 7 by default. All non-numpad keys are transparent. From f3bd95623957a439fbb99b0678a379c9ba09fd46 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Tue, 16 Aug 2022 00:02:41 +0200 Subject: [PATCH 05/25] Move Model M controller based on Teensy 2.0 to consolidated folder --- .../{converter/modelm101_teensy2 => modelm/teensy2}/config.h | 0 .../{converter/modelm101_teensy2 => modelm/teensy2}/info.json | 0 .../modelm101_teensy2 => modelm/teensy2}/keymaps/default/keymap.c | 0 .../teensy2}/keymaps/default/readme.md | 0 .../{converter/modelm101_teensy2 => modelm/teensy2}/readme.md | 0 .../{converter/modelm101_teensy2 => modelm/teensy2}/rules.mk | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/{converter/modelm101_teensy2 => modelm/teensy2}/config.h (100%) rename keyboards/{converter/modelm101_teensy2 => modelm/teensy2}/info.json (100%) rename keyboards/{converter/modelm101_teensy2 => modelm/teensy2}/keymaps/default/keymap.c (100%) rename keyboards/{converter/modelm101_teensy2 => modelm/teensy2}/keymaps/default/readme.md (100%) rename keyboards/{converter/modelm101_teensy2 => modelm/teensy2}/readme.md (100%) rename keyboards/{converter/modelm101_teensy2 => modelm/teensy2}/rules.mk (100%) diff --git a/keyboards/converter/modelm101_teensy2/config.h b/keyboards/modelm/teensy2/config.h similarity index 100% rename from keyboards/converter/modelm101_teensy2/config.h rename to keyboards/modelm/teensy2/config.h diff --git a/keyboards/converter/modelm101_teensy2/info.json b/keyboards/modelm/teensy2/info.json similarity index 100% rename from keyboards/converter/modelm101_teensy2/info.json rename to keyboards/modelm/teensy2/info.json diff --git a/keyboards/converter/modelm101_teensy2/keymaps/default/keymap.c b/keyboards/modelm/teensy2/keymaps/default/keymap.c similarity index 100% rename from keyboards/converter/modelm101_teensy2/keymaps/default/keymap.c rename to keyboards/modelm/teensy2/keymaps/default/keymap.c diff --git a/keyboards/converter/modelm101_teensy2/keymaps/default/readme.md b/keyboards/modelm/teensy2/keymaps/default/readme.md similarity index 100% rename from keyboards/converter/modelm101_teensy2/keymaps/default/readme.md rename to keyboards/modelm/teensy2/keymaps/default/readme.md diff --git a/keyboards/converter/modelm101_teensy2/readme.md b/keyboards/modelm/teensy2/readme.md similarity index 100% rename from keyboards/converter/modelm101_teensy2/readme.md rename to keyboards/modelm/teensy2/readme.md diff --git a/keyboards/converter/modelm101_teensy2/rules.mk b/keyboards/modelm/teensy2/rules.mk similarity index 100% rename from keyboards/converter/modelm101_teensy2/rules.mk rename to keyboards/modelm/teensy2/rules.mk From bf409bae9a40aecb05c87864c7c9fe48ab4c819d Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Tue, 16 Aug 2022 00:05:42 +0200 Subject: [PATCH 06/25] Fix readme and URL for moved Teensy 2.0 project --- keyboards/modelm/teensy2/info.json | 2 +- keyboards/modelm/teensy2/readme.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/modelm/teensy2/info.json b/keyboards/modelm/teensy2/info.json index 86dc44de0e68..dc51880d5f9f 100644 --- a/keyboards/modelm/teensy2/info.json +++ b/keyboards/modelm/teensy2/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "IBM Model M 101/102", "manufacturer": "wangfuco", - "url": "https://github.com/wangfuco/qmk_firmware/tree/modelm101_teensy2/keyboards/converter/modelm101_teensy2", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/teensy2", "maintainer": "wangfuco", "usb": { "vid": "0xFEED", diff --git a/keyboards/modelm/teensy2/readme.md b/keyboards/modelm/teensy2/readme.md index d65df72580b6..53b32fed6724 100644 --- a/keyboards/modelm/teensy2/readme.md +++ b/keyboards/modelm/teensy2/readme.md @@ -2,7 +2,7 @@ ![IBM Model M 101 ANSI/102 ISO](https://user-images.githubusercontent.com/46733695/161862805-c891735b-e2e8-418a-ad82-d71c00570eab.jpg) -This is based on the modelm101 keyboard by iw0rm3r. The difference is that Teensy 2.0 board (produced by PJRC) is used instead of the Teensy 2.0++ due to the availability issues. Only CapsLock LED is supported since Teensy 2.0 only has 25 digital I/0 pins. +This is based on the modelm101 teensypp keyboard by iw0rm3r. The difference is that Teensy 2.0 board (produced by PJRC) is used instead of the Teensy++ 2.0 due to the availability issues. Only CapsLock LED is supported since Teensy 2.0 only has 25 digital I/0 pins. Configuration is build for the Atmel ATmega32U4 controller, which you can easily use on the Teensy 2.0 board (produced by PJRC). @@ -24,6 +24,6 @@ Hardware Availability: https://www.pjrc.com/store/teensy.html Make example for this keyboard (after setting up your build environment): - make converter/modelm101_teensy2:default:teensy + make modelm/teensy2: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). From d03c5c9f9d7ebd60e6f14259c000359823909687 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Tue, 16 Aug 2022 00:19:44 +0200 Subject: [PATCH 07/25] Readding modelm101_teensy2.c and renaming to teensy2.c During the last rebase and resolving merge conflicts this file was deleted but that was wrong. --- keyboards/modelm/teensy2/teensy2.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 keyboards/modelm/teensy2/teensy2.c diff --git a/keyboards/modelm/teensy2/teensy2.c b/keyboards/modelm/teensy2/teensy2.c new file mode 100644 index 000000000000..6a9b37769bdd --- /dev/null +++ b/keyboards/modelm/teensy2/teensy2.c @@ -0,0 +1,16 @@ +/* Copyright 2019 iw0rm3r + * + * 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 "teensy2.h" From 26810eed3d717a7261e704a474492203d8a7ccc0 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Thu, 27 Oct 2022 22:51:04 +0200 Subject: [PATCH 08/25] Adding ChangeLog file describing the changes --- docs/ChangeLog/20221126/PR14996.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 docs/ChangeLog/20221126/PR14996.md diff --git a/docs/ChangeLog/20221126/PR14996.md b/docs/ChangeLog/20221126/PR14996.md new file mode 100644 index 000000000000..5d2dec696ff9 --- /dev/null +++ b/docs/ChangeLog/20221126/PR14996.md @@ -0,0 +1,9 @@ +# QMK Breaking Changes - 2022 November 26 Changelog + +## Notable Features :id=notable-features + +### Consolidate modelm ([#14996](https://github.com/qmk/qmk_firmware/pull/14996) + +Several build targets for the IBM Model M were cluttered in different folders. +The maintainers of several Model M replacement controller projects agreed to +consolidate them under one common folder. From be20876289abd2475f4530725a0f0fd20ca10f71 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Thu, 27 Oct 2022 23:19:27 +0200 Subject: [PATCH 09/25] For teensypp_ssk adjust file names according to new folder name This solves an error detected by the linter --- keyboards/kprepublic/bm80v2/keymaps/smooted/config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h b/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h index 88fa41d11098..6a2811dfbd7a 100644 --- a/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h +++ b/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h @@ -12,6 +12,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +<<<<<<<< HEAD:keyboards/kprepublic/bm80v2/keymaps/smooted/config.h #pragma once #define FORCE_NKRO +======== +#include "teensypp_ssk.h" +>>>>>>>> 34da7a0efa (For teensypp_ssk adjust file names according to new folder name):keyboards/modelm/teensypp_ssk/teensypp_ssk.c From 1858f913031715a5e2aa10cdfc7f9dad3582c435 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Sat, 29 Oct 2022 20:53:36 +0200 Subject: [PATCH 10/25] Enhance PR14996 changelog Adding list of consolidated projects --- docs/ChangeLog/20221126/PR14996.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/ChangeLog/20221126/PR14996.md b/docs/ChangeLog/20221126/PR14996.md index 5d2dec696ff9..94482bb1071f 100644 --- a/docs/ChangeLog/20221126/PR14996.md +++ b/docs/ChangeLog/20221126/PR14996.md @@ -7,3 +7,13 @@ Several build targets for the IBM Model M were cluttered in different folders. The maintainers of several Model M replacement controller projects agreed to consolidate them under one common folder. + +List of the consolidations now in keyboards/modelm/: + +- ashpil_usbc +- ibm122m +- mschwingen +- teensy2 (renamed from modelm101_teensy2) +- teensypp (renamed from modelm101) +- teensypp_ssk (renamed from modelm_ssk) +- yugo_m From 319c8cbb476abf7b352fc14c785a716fa2e2b33f Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Sun, 13 Nov 2022 22:28:08 +0100 Subject: [PATCH 11/25] Adding moved keyboards to keyboard_aliases.hjson to not break historical mappings --- data/mappings/keyboard_aliases.hjson | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index f005bb34c399..8a8899ab440c 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -41,6 +41,9 @@ "angel64": { "target": "angel64/alpha" }, + "ashpil/modelm_usbc": { + "target": "modelm/ashpil_usbc" + }, "at101_blackheart": { "target": "viktus/at101_bh" }, @@ -113,6 +116,15 @@ "cmm_studio/saka68": { "target": "cmm_studio/saka68/solder" }, + "converter/modelm101": { + "target": "modelm/teensypp" + }, + "converter/modelm101_teensy2": { + "target": "modelm/teensy2" + }, + "converter/modelm_ssk": { + "target": "modelm/teensypp_ssk" + }, "cospad": { "target": "kprepublic/cospad" }, @@ -203,6 +215,9 @@ "handwired/ferris": { "target": "ferris/0_1" }, + "handwired/ibm122m": { + "target": "modelm/ibm122m" + }, "handwired/p1800fl": { "target": "team0110/p1800fl" }, @@ -419,6 +434,9 @@ "montsinger/rebound": { "target": "montsinger/rebound/rev1" }, + "mschwingen/modelm": { + "target": "mschwingen/modelm" + }, "noxary/268_2": { "layouts": { "LAYOUT": "LAYOUT_65_ansi_blocker" @@ -1294,6 +1312,9 @@ "ymdk_np21": { "target": "ymdk/np21" }, + "yugo_m/model_m_101": { + "target": "modelm/yugo_m" + }, "yurei": { "target": "kkatano/yurei" }, From b787c90cde88e707cb9f2f7d9aaa2bca5181b944 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Sun, 13 Nov 2022 22:50:24 +0100 Subject: [PATCH 12/25] Fix misspelled alias target for modelm/mschwingen --- data/mappings/keyboard_aliases.hjson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 8a8899ab440c..184bde35c136 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -435,7 +435,7 @@ "target": "montsinger/rebound/rev1" }, "mschwingen/modelm": { - "target": "mschwingen/modelm" + "target": "modelm/mschwingen" }, "noxary/268_2": { "layouts": { From 9ade528d97d8ad12e7977fec29f867682e277306 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Fri, 27 Jan 2023 20:48:05 +0100 Subject: [PATCH 13/25] Move m122_3270 based from tronguylabs consolidated folder --- data/mappings/keyboard_aliases.hjson | 3 ++ .../{ => 20230226}/20221126/PR14996.md | 0 .../m122_3270/blackpill/info.json | 0 .../m122_3270/blackpill/readme.md | 0 .../m122_3270/blackpill/rules.mk | 0 .../m122_3270/bluepill/info.json | 0 .../m122_3270/bluepill/readme.md | 0 .../m122_3270/bluepill/rules.mk | 0 .../m122_3270/info.json | 0 .../m122_3270/keymaps/default/keymap.c | 0 .../m122_3270/keymaps/default/readme.md | 0 keyboards/modelm/m122_3270/readme.md | 32 +++++++++++++++++++ .../m122_3270/teensy/info.json | 0 .../m122_3270/teensy/readme.md | 0 .../m122_3270/teensy/rules.mk | 0 keyboards/tronguylabs/m122_3270/readme.md | 22 ------------- 16 files changed, 35 insertions(+), 22 deletions(-) rename docs/ChangeLog/{ => 20230226}/20221126/PR14996.md (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/blackpill/info.json (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/blackpill/readme.md (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/blackpill/rules.mk (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/bluepill/info.json (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/bluepill/readme.md (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/bluepill/rules.mk (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/info.json (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/keymaps/default/keymap.c (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/keymaps/default/readme.md (100%) create mode 100644 keyboards/modelm/m122_3270/readme.md rename keyboards/{tronguylabs => modelm}/m122_3270/teensy/info.json (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/teensy/readme.md (100%) rename keyboards/{tronguylabs => modelm}/m122_3270/teensy/rules.mk (100%) delete mode 100644 keyboards/tronguylabs/m122_3270/readme.md diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 184bde35c136..7c0bc73fa1b7 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -1252,6 +1252,9 @@ "treadstone48/rev2": { "target": "marksard/treadstone48/rev2" }, + "tronguylabs/m122_3270": { + "target": "modelm/m122_3270" + }, "ua62": { "target": "nacly/ua62" }, diff --git a/docs/ChangeLog/20221126/PR14996.md b/docs/ChangeLog/20230226/20221126/PR14996.md similarity index 100% rename from docs/ChangeLog/20221126/PR14996.md rename to docs/ChangeLog/20230226/20221126/PR14996.md diff --git a/keyboards/tronguylabs/m122_3270/blackpill/info.json b/keyboards/modelm/m122_3270/blackpill/info.json similarity index 100% rename from keyboards/tronguylabs/m122_3270/blackpill/info.json rename to keyboards/modelm/m122_3270/blackpill/info.json diff --git a/keyboards/tronguylabs/m122_3270/blackpill/readme.md b/keyboards/modelm/m122_3270/blackpill/readme.md similarity index 100% rename from keyboards/tronguylabs/m122_3270/blackpill/readme.md rename to keyboards/modelm/m122_3270/blackpill/readme.md diff --git a/keyboards/tronguylabs/m122_3270/blackpill/rules.mk b/keyboards/modelm/m122_3270/blackpill/rules.mk similarity index 100% rename from keyboards/tronguylabs/m122_3270/blackpill/rules.mk rename to keyboards/modelm/m122_3270/blackpill/rules.mk diff --git a/keyboards/tronguylabs/m122_3270/bluepill/info.json b/keyboards/modelm/m122_3270/bluepill/info.json similarity index 100% rename from keyboards/tronguylabs/m122_3270/bluepill/info.json rename to keyboards/modelm/m122_3270/bluepill/info.json diff --git a/keyboards/tronguylabs/m122_3270/bluepill/readme.md b/keyboards/modelm/m122_3270/bluepill/readme.md similarity index 100% rename from keyboards/tronguylabs/m122_3270/bluepill/readme.md rename to keyboards/modelm/m122_3270/bluepill/readme.md diff --git a/keyboards/tronguylabs/m122_3270/bluepill/rules.mk b/keyboards/modelm/m122_3270/bluepill/rules.mk similarity index 100% rename from keyboards/tronguylabs/m122_3270/bluepill/rules.mk rename to keyboards/modelm/m122_3270/bluepill/rules.mk diff --git a/keyboards/tronguylabs/m122_3270/info.json b/keyboards/modelm/m122_3270/info.json similarity index 100% rename from keyboards/tronguylabs/m122_3270/info.json rename to keyboards/modelm/m122_3270/info.json diff --git a/keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c b/keyboards/modelm/m122_3270/keymaps/default/keymap.c similarity index 100% rename from keyboards/tronguylabs/m122_3270/keymaps/default/keymap.c rename to keyboards/modelm/m122_3270/keymaps/default/keymap.c diff --git a/keyboards/tronguylabs/m122_3270/keymaps/default/readme.md b/keyboards/modelm/m122_3270/keymaps/default/readme.md similarity index 100% rename from keyboards/tronguylabs/m122_3270/keymaps/default/readme.md rename to keyboards/modelm/m122_3270/keymaps/default/readme.md diff --git a/keyboards/modelm/m122_3270/readme.md b/keyboards/modelm/m122_3270/readme.md new file mode 100644 index 000000000000..7c7852d5d77f --- /dev/null +++ b/keyboards/modelm/m122_3270/readme.md @@ -0,0 +1,32 @@ +# m122-3270 + +![IBM Model M 122 key](https://i.imgur.com/Oo3Ozqzh.jpg) + +This is a replacement controller for the IBM Model M 122 key terminal keyboard +running on a STM32F411 BlackPill, intended to act as closely to the 3270 +keyboard's functioning as possible while still being usable on a PC. + +* Keyboard Maintainer: [Jay Maynard](https://github.com/jmaynard) +* Hardware Supported: BlackPill STM32F411, Teensy++ 2.0 +* Hardware Availability: [BlackPill](https://www.adafruit.com/product/4877), [Teensy](https://www.pjrc.com/store/teensypp.html) + +Make example for this keyboard (after setting up your build environment): + + make modelm/m122_3270/blackpill:default + make modelm/m122_3270/teensy: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). + +A schematic and Gerber files are publicly available for those wishing to have +carrier boards made professionally instead of handwiring things. The M122 +matrix connectors plug right into it. It can be found at +https://github.com/jmaynard/tronguylabs-m122-blackpill. + +This is derived from Luke Stanley's handwired/ibm122m keyboard, with my own +keymapping and rework of the I/O for the BlackPill. There's also a version for +the Teensy++ 2.0, since that was my original design and I still use one on one +board, even though I switched to the BlackPill for future-proofing. +The Teensy++ 2.0 is not recommended for new designs. diff --git a/keyboards/tronguylabs/m122_3270/teensy/info.json b/keyboards/modelm/m122_3270/teensy/info.json similarity index 100% rename from keyboards/tronguylabs/m122_3270/teensy/info.json rename to keyboards/modelm/m122_3270/teensy/info.json diff --git a/keyboards/tronguylabs/m122_3270/teensy/readme.md b/keyboards/modelm/m122_3270/teensy/readme.md similarity index 100% rename from keyboards/tronguylabs/m122_3270/teensy/readme.md rename to keyboards/modelm/m122_3270/teensy/readme.md diff --git a/keyboards/tronguylabs/m122_3270/teensy/rules.mk b/keyboards/modelm/m122_3270/teensy/rules.mk similarity index 100% rename from keyboards/tronguylabs/m122_3270/teensy/rules.mk rename to keyboards/modelm/m122_3270/teensy/rules.mk diff --git a/keyboards/tronguylabs/m122_3270/readme.md b/keyboards/tronguylabs/m122_3270/readme.md deleted file mode 100644 index 1dd1580bcd3e..000000000000 --- a/keyboards/tronguylabs/m122_3270/readme.md +++ /dev/null @@ -1,22 +0,0 @@ -# m122-3270 - -![IBM Model M 122 key](https://i.imgur.com/Oo3Ozqzh.jpg) - -This is a replacement controller for the IBM Model M 122 key terminal keyboard running on a STM32F411 BlackPill, intended to act as closely to the 3270 keyboard's functioning as possible while still being usable on a PC. - -* Keyboard Maintainer: [Jay Maynard](https://github.com/jmaynard) -* Hardware Supported: BlackPill STM32F411, Teensy++ 2.0 -* Hardware Availability: [BlackPill](https://www.adafruit.com/product/4877), [Teensy](https://www.pjrc.com/store/teensypp.html) - -Make example for this keyboard (after setting up your build environment): - - make tronguylabs/m122_3270/blackpill:default - make tronguylabs/m122_3270/teensy: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). - -A schematic and Gerber files are publicly available for those wishing to have carrier boards made -professionally instead of handwiring things. The M122 matrix connectors plug right into it. It can -be found at https://github.com/jmaynard/tronguylabs-m122-blackpill. - -This is derived from Luke Stanley's handwired/ibm122m keyboard, with my own keymapping and rework of the I/O for the BlackPill. There's also a version for the Teensy++ 2.0, since that was my original design and I still use one on one board, even though I switched to the BlackPill for future-proofing. The Teensy++ 2.0 is not recommended for new designs. From e7e27595192a542106d8cce7d85639a104a804b4 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Sun, 12 Feb 2023 00:59:09 +0100 Subject: [PATCH 14/25] Remove merge conflict residues --- keyboards/modelm/mschwingen/info.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/modelm/mschwingen/info.json b/keyboards/modelm/mschwingen/info.json index 17717d579994..db9b9814ceb7 100644 --- a/keyboards/modelm/mschwingen/info.json +++ b/keyboards/modelm/mschwingen/info.json @@ -7,16 +7,12 @@ "vid": "0xFEED", "pid": "0x558E", "device_version": "0.0.1" -<<<<<<< HEAD:keyboards/mschwingen/modelm/info.json }, "ws2812": { "pin": "B6" }, "processor": "atmega32u4", "bootloader": "lufa-dfu", -======= - } ->>>>>>> c8a369be5c (Putting all IBM Model M projects under one folder):keyboards/modelm/mschwingen/info.json "layouts": { "LAYOUT": { "layout": [ From 9f7375375da6629deead6b0a2ebc1091a34de1fb Mon Sep 17 00:00:00 2001 From: nuess0r Date: Mon, 13 Feb 2023 22:04:41 +0100 Subject: [PATCH 15/25] Update keyboards/modelm/ibm122m/readme.md Co-authored-by: Ryan --- keyboards/modelm/ibm122m/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/modelm/ibm122m/readme.md b/keyboards/modelm/ibm122m/readme.md index 25cfe831a454..54494f2d5bec 100644 --- a/keyboards/modelm/ibm122m/readme.md +++ b/keyboards/modelm/ibm122m/readme.md @@ -5,9 +5,9 @@ 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 +* 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: ``` From 157fbbf75355780ffb2fe898b18c6c1b0148d17c Mon Sep 17 00:00:00 2001 From: nuess0r Date: Mon, 13 Feb 2023 22:04:53 +0100 Subject: [PATCH 16/25] Update keyboards/modelm/mschwingen/led_ffc/readme.md Co-authored-by: Ryan --- keyboards/modelm/mschwingen/led_ffc/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/modelm/mschwingen/led_ffc/readme.md b/keyboards/modelm/mschwingen/led_ffc/readme.md index 2b958a93264f..ae142554e11e 100644 --- a/keyboards/modelm/mschwingen/led_ffc/readme.md +++ b/keyboards/modelm/mschwingen/led_ffc/readme.md @@ -12,7 +12,7 @@ Make example for this keyboard (after setting up your build environment), run on make modelm/mschwingen/led_ffc:default -flash: +Flashing example for this keyboard: make modelm/mschwingen/led_ffc:default:flash From 8110936379cff7d106ae0bbe7803ac5d5fba32aa Mon Sep 17 00:00:00 2001 From: nuess0r Date: Mon, 13 Feb 2023 22:05:06 +0100 Subject: [PATCH 17/25] Update keyboards/modelm/mschwingen/led_wired/readme.md Co-authored-by: Ryan --- keyboards/modelm/mschwingen/led_wired/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/modelm/mschwingen/led_wired/readme.md b/keyboards/modelm/mschwingen/led_wired/readme.md index 42fe8075e993..2ddca7cda792 100644 --- a/keyboards/modelm/mschwingen/led_wired/readme.md +++ b/keyboards/modelm/mschwingen/led_wired/readme.md @@ -12,7 +12,7 @@ Make example for this keyboard (after setting up your build environment), run on make modelm/mschwingen/led_wired:default -flash: +Flashing example for this keyboard: make modelm/mschwingen/led_wired:default:flash From 2cdf138a47af6a6ba768813551ce5dff4ce245fc Mon Sep 17 00:00:00 2001 From: nuess0r Date: Mon, 13 Feb 2023 22:05:21 +0100 Subject: [PATCH 18/25] Update keyboards/modelm/mschwingen/led_ws2812/readme.md Co-authored-by: Ryan --- keyboards/modelm/mschwingen/led_ws2812/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/modelm/mschwingen/led_ws2812/readme.md b/keyboards/modelm/mschwingen/led_ws2812/readme.md index 37e9e0434892..173950da7b2c 100644 --- a/keyboards/modelm/mschwingen/led_ws2812/readme.md +++ b/keyboards/modelm/mschwingen/led_ws2812/readme.md @@ -12,7 +12,7 @@ Make example for this keyboard (after setting up your build environment), run on make modelm/mschwingen/led_ws2812:default -flash: +Flashing example for this keyboard: make modelm/mschwingen/led_ws2812:default:flash From 34c8d311d49983d9152e05a4844c21068a848fa3 Mon Sep 17 00:00:00 2001 From: nuess0r Date: Mon, 13 Feb 2023 22:05:33 +0100 Subject: [PATCH 19/25] Update keyboards/modelm/teensypp/readme.md Co-authored-by: Ryan --- keyboards/modelm/teensypp/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/modelm/teensypp/readme.md b/keyboards/modelm/teensypp/readme.md index aa61f02113c2..8e3988e6626e 100644 --- a/keyboards/modelm/teensypp/readme.md +++ b/keyboards/modelm/teensypp/readme.md @@ -31,9 +31,9 @@ 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. -Keyboard Maintainer: [iw0rm3r](https://github.com/iw0rm3r) -Hardware Supported: Teensy++ 2.0 board by PJRC -Hardware Availability: https://www.pjrc.com/store/teensypp.html +* 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): From 44958def1775905281353a733c284a58a3daf2db Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Mon, 13 Feb 2023 23:00:16 +0100 Subject: [PATCH 20/25] Delete useless .noci file found in review by fauxpark --- keyboards/modelm/teensypp/.noci | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 keyboards/modelm/teensypp/.noci diff --git a/keyboards/modelm/teensypp/.noci b/keyboards/modelm/teensypp/.noci deleted file mode 100644 index e69de29bb2d1..000000000000 From 6767b954b6c4b970e23d0e1ad07f8c5d3fc311c9 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Sat, 29 Apr 2023 19:45:18 +0200 Subject: [PATCH 21/25] Move all Model M's under keyboards/ibm First I deliberately avoided to create the folder ibm as the Model M was manufactured by IBM, Lexmark and Unicomp but now the folder already exists upstream so it's cleaner to use it. --- keyboards/{modelm => ibm/model_m}/ashpil_usbc/ashpil_usbc.c | 0 keyboards/{modelm => ibm/model_m}/ashpil_usbc/info.json | 0 .../{modelm => ibm/model_m}/ashpil_usbc/keymaps/ashpil/config.h | 0 .../{modelm => ibm/model_m}/ashpil_usbc/keymaps/ashpil/keymap.c | 0 .../{modelm => ibm/model_m}/ashpil_usbc/keymaps/ashpil/rules.mk | 0 .../{modelm => ibm/model_m}/ashpil_usbc/keymaps/default/keymap.c | 0 keyboards/{modelm => ibm/model_m}/ashpil_usbc/readme.md | 0 keyboards/{modelm => ibm/model_m}/ashpil_usbc/rules.mk | 0 keyboards/{ => ibm/model_m}/modelm/readme.md | 0 keyboards/{modelm => ibm/model_m}/mschwingen/config.h | 0 keyboards/{modelm => ibm/model_m}/mschwingen/info.json | 0 .../{modelm => ibm/model_m}/mschwingen/keymaps/default/keymap.c | 0 keyboards/{modelm => ibm/model_m}/mschwingen/led_ffc/readme.md | 0 keyboards/{modelm => ibm/model_m}/mschwingen/led_ffc/rules.mk | 0 keyboards/{modelm => ibm/model_m}/mschwingen/led_wired/readme.md | 0 keyboards/{modelm => ibm/model_m}/mschwingen/led_wired/rules.mk | 0 keyboards/{modelm => ibm/model_m}/mschwingen/led_ws2812/readme.md | 0 keyboards/{modelm => ibm/model_m}/mschwingen/led_ws2812/rules.mk | 0 keyboards/{modelm => ibm/model_m}/mschwingen/matrix.c | 0 keyboards/{modelm => ibm/model_m}/mschwingen/mschwingen.c | 0 keyboards/{modelm => ibm/model_m}/mschwingen/mschwingen.h | 0 keyboards/{modelm => ibm/model_m}/mschwingen/post_rules.mk | 0 keyboards/{modelm => ibm/model_m}/mschwingen/readme.md | 0 keyboards/{modelm => ibm/model_m}/mschwingen/rules.mk | 0 keyboards/{modelm => ibm/model_m}/teensy2/config.h | 0 keyboards/{modelm => ibm/model_m}/teensy2/info.json | 0 .../{modelm => ibm/model_m}/teensy2/keymaps/default/keymap.c | 0 .../{modelm => ibm/model_m}/teensy2/keymaps/default/readme.md | 0 keyboards/{modelm => ibm/model_m}/teensy2/readme.md | 0 keyboards/{modelm => ibm/model_m}/teensy2/rules.mk | 0 keyboards/{modelm => ibm/model_m}/teensy2/teensy2.c | 0 keyboards/{modelm => ibm/model_m}/teensypp/config.h | 0 keyboards/{modelm => ibm/model_m}/teensypp/info.json | 0 .../{modelm => ibm/model_m}/teensypp/keymaps/default/keymap.c | 0 .../{modelm => ibm/model_m}/teensypp/keymaps/default/readme.md | 0 .../{modelm => ibm/model_m}/teensypp/keymaps/iw0rm3r/config.h | 0 .../{modelm => ibm/model_m}/teensypp/keymaps/iw0rm3r/keymap.c | 0 .../{modelm => ibm/model_m}/teensypp/keymaps/iw0rm3r/readme.md | 0 keyboards/{modelm => ibm/model_m}/teensypp/readme.md | 0 keyboards/{modelm => ibm/model_m}/teensypp/rules.mk | 0 keyboards/{modelm => ibm/model_m}/teensypp/teensypp.c | 0 keyboards/{modelm => ibm/model_m}/yugo_m/config.h | 0 keyboards/{modelm => ibm/model_m}/yugo_m/info.json | 0 keyboards/{modelm => ibm/model_m}/yugo_m/keymaps/default/keymap.c | 0 .../{modelm => ibm/model_m}/yugo_m/keymaps/default/readme.md | 0 keyboards/{modelm => ibm/model_m}/yugo_m/readme.md | 0 keyboards/{modelm => ibm/model_m}/yugo_m/rules.mk | 0 keyboards/{modelm => ibm/model_m}/yugo_m/yugo_m.c | 0 keyboards/{modelm => ibm/model_m_122}/ibm122m/config.h | 0 keyboards/{modelm => ibm/model_m_122}/ibm122m/info.json | 0 .../model_m_122}/ibm122m/keymaps/andresteare/keymap.c | 0 .../{modelm => ibm/model_m_122}/ibm122m/keymaps/default/config.h | 0 .../{modelm => ibm/model_m_122}/ibm122m/keymaps/default/keymap.c | 0 .../{modelm => ibm/model_m_122}/ibm122m/keymaps/default/readme.md | 0 .../{modelm => ibm/model_m_122}/ibm122m/keymaps/lukaus/config.h | 0 .../{modelm => ibm/model_m_122}/ibm122m/keymaps/lukaus/keymap.c | 0 .../{modelm => ibm/model_m_122}/ibm122m/keymaps/lukaus/readme.md | 0 .../{modelm => ibm/model_m_122}/ibm122m/keymaps/via/keymap.c | 0 .../{modelm => ibm/model_m_122}/ibm122m/keymaps/via/rules.mk | 0 keyboards/{modelm => ibm/model_m_122}/ibm122m/readme.md | 0 keyboards/{modelm => ibm/model_m_122}/ibm122m/rules.mk | 0 .../{modelm => ibm/model_m_122}/m122_3270/blackpill/info.json | 0 .../{modelm => ibm/model_m_122}/m122_3270/blackpill/readme.md | 0 .../{modelm => ibm/model_m_122}/m122_3270/blackpill/rules.mk | 0 .../{modelm => ibm/model_m_122}/m122_3270/bluepill/info.json | 0 .../{modelm => ibm/model_m_122}/m122_3270/bluepill/readme.md | 0 keyboards/{modelm => ibm/model_m_122}/m122_3270/bluepill/rules.mk | 0 keyboards/{modelm => ibm/model_m_122}/m122_3270/info.json | 0 .../model_m_122}/m122_3270/keymaps/default/keymap.c | 0 .../model_m_122}/m122_3270/keymaps/default/readme.md | 0 keyboards/{modelm => ibm/model_m_122}/m122_3270/readme.md | 0 keyboards/{modelm => ibm/model_m_122}/m122_3270/teensy/info.json | 0 keyboards/{modelm => ibm/model_m_122}/m122_3270/teensy/readme.md | 0 keyboards/{modelm => ibm/model_m_122}/m122_3270/teensy/rules.mk | 0 keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/config.h | 0 keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/info.json | 0 .../model_m_ssk}/teensypp_ssk/keymaps/default/keymap.c | 0 .../model_m_ssk}/teensypp_ssk/keymaps/default/readme.md | 0 .../model_m_ssk}/teensypp_ssk/keymaps/tiltowait/config.h | 0 .../model_m_ssk}/teensypp_ssk/keymaps/tiltowait/keymap.c | 0 .../model_m_ssk}/teensypp_ssk/keymaps/tiltowait/readme.md | 0 keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/readme.md | 0 keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/rules.mk | 0 83 files changed, 0 insertions(+), 0 deletions(-) rename keyboards/{modelm => ibm/model_m}/ashpil_usbc/ashpil_usbc.c (100%) rename keyboards/{modelm => ibm/model_m}/ashpil_usbc/info.json (100%) rename keyboards/{modelm => ibm/model_m}/ashpil_usbc/keymaps/ashpil/config.h (100%) rename keyboards/{modelm => ibm/model_m}/ashpil_usbc/keymaps/ashpil/keymap.c (100%) rename keyboards/{modelm => ibm/model_m}/ashpil_usbc/keymaps/ashpil/rules.mk (100%) rename keyboards/{modelm => ibm/model_m}/ashpil_usbc/keymaps/default/keymap.c (100%) rename keyboards/{modelm => ibm/model_m}/ashpil_usbc/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/ashpil_usbc/rules.mk (100%) rename keyboards/{ => ibm/model_m}/modelm/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/config.h (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/info.json (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/keymaps/default/keymap.c (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/led_ffc/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/led_ffc/rules.mk (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/led_wired/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/led_wired/rules.mk (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/led_ws2812/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/led_ws2812/rules.mk (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/matrix.c (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/mschwingen.c (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/mschwingen.h (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/post_rules.mk (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/mschwingen/rules.mk (100%) rename keyboards/{modelm => ibm/model_m}/teensy2/config.h (100%) rename keyboards/{modelm => ibm/model_m}/teensy2/info.json (100%) rename keyboards/{modelm => ibm/model_m}/teensy2/keymaps/default/keymap.c (100%) rename keyboards/{modelm => ibm/model_m}/teensy2/keymaps/default/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/teensy2/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/teensy2/rules.mk (100%) rename keyboards/{modelm => ibm/model_m}/teensy2/teensy2.c (100%) rename keyboards/{modelm => ibm/model_m}/teensypp/config.h (100%) rename keyboards/{modelm => ibm/model_m}/teensypp/info.json (100%) rename keyboards/{modelm => ibm/model_m}/teensypp/keymaps/default/keymap.c (100%) rename keyboards/{modelm => ibm/model_m}/teensypp/keymaps/default/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/teensypp/keymaps/iw0rm3r/config.h (100%) rename keyboards/{modelm => ibm/model_m}/teensypp/keymaps/iw0rm3r/keymap.c (100%) rename keyboards/{modelm => ibm/model_m}/teensypp/keymaps/iw0rm3r/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/teensypp/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/teensypp/rules.mk (100%) rename keyboards/{modelm => ibm/model_m}/teensypp/teensypp.c (100%) rename keyboards/{modelm => ibm/model_m}/yugo_m/config.h (100%) rename keyboards/{modelm => ibm/model_m}/yugo_m/info.json (100%) rename keyboards/{modelm => ibm/model_m}/yugo_m/keymaps/default/keymap.c (100%) rename keyboards/{modelm => ibm/model_m}/yugo_m/keymaps/default/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/yugo_m/readme.md (100%) rename keyboards/{modelm => ibm/model_m}/yugo_m/rules.mk (100%) rename keyboards/{modelm => ibm/model_m}/yugo_m/yugo_m.c (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/config.h (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/info.json (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/keymaps/andresteare/keymap.c (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/keymaps/default/config.h (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/keymaps/default/keymap.c (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/keymaps/default/readme.md (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/keymaps/lukaus/config.h (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/keymaps/lukaus/keymap.c (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/keymaps/lukaus/readme.md (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/keymaps/via/keymap.c (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/keymaps/via/rules.mk (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/readme.md (100%) rename keyboards/{modelm => ibm/model_m_122}/ibm122m/rules.mk (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/blackpill/info.json (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/blackpill/readme.md (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/blackpill/rules.mk (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/bluepill/info.json (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/bluepill/readme.md (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/bluepill/rules.mk (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/info.json (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/keymaps/default/keymap.c (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/keymaps/default/readme.md (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/readme.md (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/teensy/info.json (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/teensy/readme.md (100%) rename keyboards/{modelm => ibm/model_m_122}/m122_3270/teensy/rules.mk (100%) rename keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/config.h (100%) rename keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/info.json (100%) rename keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/keymaps/default/keymap.c (100%) rename keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/keymaps/default/readme.md (100%) rename keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/keymaps/tiltowait/config.h (100%) rename keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/keymaps/tiltowait/keymap.c (100%) rename keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/keymaps/tiltowait/readme.md (100%) rename keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/readme.md (100%) rename keyboards/{modelm => ibm/model_m_ssk}/teensypp_ssk/rules.mk (100%) diff --git a/keyboards/modelm/ashpil_usbc/ashpil_usbc.c b/keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c similarity index 100% rename from keyboards/modelm/ashpil_usbc/ashpil_usbc.c rename to keyboards/ibm/model_m/ashpil_usbc/ashpil_usbc.c diff --git a/keyboards/modelm/ashpil_usbc/info.json b/keyboards/ibm/model_m/ashpil_usbc/info.json similarity index 100% rename from keyboards/modelm/ashpil_usbc/info.json rename to keyboards/ibm/model_m/ashpil_usbc/info.json diff --git a/keyboards/modelm/ashpil_usbc/keymaps/ashpil/config.h b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/config.h similarity index 100% rename from keyboards/modelm/ashpil_usbc/keymaps/ashpil/config.h rename to keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/config.h diff --git a/keyboards/modelm/ashpil_usbc/keymaps/ashpil/keymap.c b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/keymap.c similarity index 100% rename from keyboards/modelm/ashpil_usbc/keymaps/ashpil/keymap.c rename to keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/keymap.c diff --git a/keyboards/modelm/ashpil_usbc/keymaps/ashpil/rules.mk b/keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/rules.mk similarity index 100% rename from keyboards/modelm/ashpil_usbc/keymaps/ashpil/rules.mk rename to keyboards/ibm/model_m/ashpil_usbc/keymaps/ashpil/rules.mk diff --git a/keyboards/modelm/ashpil_usbc/keymaps/default/keymap.c b/keyboards/ibm/model_m/ashpil_usbc/keymaps/default/keymap.c similarity index 100% rename from keyboards/modelm/ashpil_usbc/keymaps/default/keymap.c rename to keyboards/ibm/model_m/ashpil_usbc/keymaps/default/keymap.c diff --git a/keyboards/modelm/ashpil_usbc/readme.md b/keyboards/ibm/model_m/ashpil_usbc/readme.md similarity index 100% rename from keyboards/modelm/ashpil_usbc/readme.md rename to keyboards/ibm/model_m/ashpil_usbc/readme.md diff --git a/keyboards/modelm/ashpil_usbc/rules.mk b/keyboards/ibm/model_m/ashpil_usbc/rules.mk similarity index 100% rename from keyboards/modelm/ashpil_usbc/rules.mk rename to keyboards/ibm/model_m/ashpil_usbc/rules.mk diff --git a/keyboards/modelm/readme.md b/keyboards/ibm/model_m/modelm/readme.md similarity index 100% rename from keyboards/modelm/readme.md rename to keyboards/ibm/model_m/modelm/readme.md diff --git a/keyboards/modelm/mschwingen/config.h b/keyboards/ibm/model_m/mschwingen/config.h similarity index 100% rename from keyboards/modelm/mschwingen/config.h rename to keyboards/ibm/model_m/mschwingen/config.h diff --git a/keyboards/modelm/mschwingen/info.json b/keyboards/ibm/model_m/mschwingen/info.json similarity index 100% rename from keyboards/modelm/mschwingen/info.json rename to keyboards/ibm/model_m/mschwingen/info.json diff --git a/keyboards/modelm/mschwingen/keymaps/default/keymap.c b/keyboards/ibm/model_m/mschwingen/keymaps/default/keymap.c similarity index 100% rename from keyboards/modelm/mschwingen/keymaps/default/keymap.c rename to keyboards/ibm/model_m/mschwingen/keymaps/default/keymap.c diff --git a/keyboards/modelm/mschwingen/led_ffc/readme.md b/keyboards/ibm/model_m/mschwingen/led_ffc/readme.md similarity index 100% rename from keyboards/modelm/mschwingen/led_ffc/readme.md rename to keyboards/ibm/model_m/mschwingen/led_ffc/readme.md diff --git a/keyboards/modelm/mschwingen/led_ffc/rules.mk b/keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk similarity index 100% rename from keyboards/modelm/mschwingen/led_ffc/rules.mk rename to keyboards/ibm/model_m/mschwingen/led_ffc/rules.mk diff --git a/keyboards/modelm/mschwingen/led_wired/readme.md b/keyboards/ibm/model_m/mschwingen/led_wired/readme.md similarity index 100% rename from keyboards/modelm/mschwingen/led_wired/readme.md rename to keyboards/ibm/model_m/mschwingen/led_wired/readme.md diff --git a/keyboards/modelm/mschwingen/led_wired/rules.mk b/keyboards/ibm/model_m/mschwingen/led_wired/rules.mk similarity index 100% rename from keyboards/modelm/mschwingen/led_wired/rules.mk rename to keyboards/ibm/model_m/mschwingen/led_wired/rules.mk diff --git a/keyboards/modelm/mschwingen/led_ws2812/readme.md b/keyboards/ibm/model_m/mschwingen/led_ws2812/readme.md similarity index 100% rename from keyboards/modelm/mschwingen/led_ws2812/readme.md rename to keyboards/ibm/model_m/mschwingen/led_ws2812/readme.md diff --git a/keyboards/modelm/mschwingen/led_ws2812/rules.mk b/keyboards/ibm/model_m/mschwingen/led_ws2812/rules.mk similarity index 100% rename from keyboards/modelm/mschwingen/led_ws2812/rules.mk rename to keyboards/ibm/model_m/mschwingen/led_ws2812/rules.mk diff --git a/keyboards/modelm/mschwingen/matrix.c b/keyboards/ibm/model_m/mschwingen/matrix.c similarity index 100% rename from keyboards/modelm/mschwingen/matrix.c rename to keyboards/ibm/model_m/mschwingen/matrix.c diff --git a/keyboards/modelm/mschwingen/mschwingen.c b/keyboards/ibm/model_m/mschwingen/mschwingen.c similarity index 100% rename from keyboards/modelm/mschwingen/mschwingen.c rename to keyboards/ibm/model_m/mschwingen/mschwingen.c diff --git a/keyboards/modelm/mschwingen/mschwingen.h b/keyboards/ibm/model_m/mschwingen/mschwingen.h similarity index 100% rename from keyboards/modelm/mschwingen/mschwingen.h rename to keyboards/ibm/model_m/mschwingen/mschwingen.h diff --git a/keyboards/modelm/mschwingen/post_rules.mk b/keyboards/ibm/model_m/mschwingen/post_rules.mk similarity index 100% rename from keyboards/modelm/mschwingen/post_rules.mk rename to keyboards/ibm/model_m/mschwingen/post_rules.mk diff --git a/keyboards/modelm/mschwingen/readme.md b/keyboards/ibm/model_m/mschwingen/readme.md similarity index 100% rename from keyboards/modelm/mschwingen/readme.md rename to keyboards/ibm/model_m/mschwingen/readme.md diff --git a/keyboards/modelm/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk similarity index 100% rename from keyboards/modelm/mschwingen/rules.mk rename to keyboards/ibm/model_m/mschwingen/rules.mk diff --git a/keyboards/modelm/teensy2/config.h b/keyboards/ibm/model_m/teensy2/config.h similarity index 100% rename from keyboards/modelm/teensy2/config.h rename to keyboards/ibm/model_m/teensy2/config.h diff --git a/keyboards/modelm/teensy2/info.json b/keyboards/ibm/model_m/teensy2/info.json similarity index 100% rename from keyboards/modelm/teensy2/info.json rename to keyboards/ibm/model_m/teensy2/info.json diff --git a/keyboards/modelm/teensy2/keymaps/default/keymap.c b/keyboards/ibm/model_m/teensy2/keymaps/default/keymap.c similarity index 100% rename from keyboards/modelm/teensy2/keymaps/default/keymap.c rename to keyboards/ibm/model_m/teensy2/keymaps/default/keymap.c diff --git a/keyboards/modelm/teensy2/keymaps/default/readme.md b/keyboards/ibm/model_m/teensy2/keymaps/default/readme.md similarity index 100% rename from keyboards/modelm/teensy2/keymaps/default/readme.md rename to keyboards/ibm/model_m/teensy2/keymaps/default/readme.md diff --git a/keyboards/modelm/teensy2/readme.md b/keyboards/ibm/model_m/teensy2/readme.md similarity index 100% rename from keyboards/modelm/teensy2/readme.md rename to keyboards/ibm/model_m/teensy2/readme.md diff --git a/keyboards/modelm/teensy2/rules.mk b/keyboards/ibm/model_m/teensy2/rules.mk similarity index 100% rename from keyboards/modelm/teensy2/rules.mk rename to keyboards/ibm/model_m/teensy2/rules.mk diff --git a/keyboards/modelm/teensy2/teensy2.c b/keyboards/ibm/model_m/teensy2/teensy2.c similarity index 100% rename from keyboards/modelm/teensy2/teensy2.c rename to keyboards/ibm/model_m/teensy2/teensy2.c diff --git a/keyboards/modelm/teensypp/config.h b/keyboards/ibm/model_m/teensypp/config.h similarity index 100% rename from keyboards/modelm/teensypp/config.h rename to keyboards/ibm/model_m/teensypp/config.h diff --git a/keyboards/modelm/teensypp/info.json b/keyboards/ibm/model_m/teensypp/info.json similarity index 100% rename from keyboards/modelm/teensypp/info.json rename to keyboards/ibm/model_m/teensypp/info.json diff --git a/keyboards/modelm/teensypp/keymaps/default/keymap.c b/keyboards/ibm/model_m/teensypp/keymaps/default/keymap.c similarity index 100% rename from keyboards/modelm/teensypp/keymaps/default/keymap.c rename to keyboards/ibm/model_m/teensypp/keymaps/default/keymap.c diff --git a/keyboards/modelm/teensypp/keymaps/default/readme.md b/keyboards/ibm/model_m/teensypp/keymaps/default/readme.md similarity index 100% rename from keyboards/modelm/teensypp/keymaps/default/readme.md rename to keyboards/ibm/model_m/teensypp/keymaps/default/readme.md diff --git a/keyboards/modelm/teensypp/keymaps/iw0rm3r/config.h b/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/config.h similarity index 100% rename from keyboards/modelm/teensypp/keymaps/iw0rm3r/config.h rename to keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/config.h diff --git a/keyboards/modelm/teensypp/keymaps/iw0rm3r/keymap.c b/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c similarity index 100% rename from keyboards/modelm/teensypp/keymaps/iw0rm3r/keymap.c rename to keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/keymap.c diff --git a/keyboards/modelm/teensypp/keymaps/iw0rm3r/readme.md b/keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/readme.md similarity index 100% rename from keyboards/modelm/teensypp/keymaps/iw0rm3r/readme.md rename to keyboards/ibm/model_m/teensypp/keymaps/iw0rm3r/readme.md diff --git a/keyboards/modelm/teensypp/readme.md b/keyboards/ibm/model_m/teensypp/readme.md similarity index 100% rename from keyboards/modelm/teensypp/readme.md rename to keyboards/ibm/model_m/teensypp/readme.md diff --git a/keyboards/modelm/teensypp/rules.mk b/keyboards/ibm/model_m/teensypp/rules.mk similarity index 100% rename from keyboards/modelm/teensypp/rules.mk rename to keyboards/ibm/model_m/teensypp/rules.mk diff --git a/keyboards/modelm/teensypp/teensypp.c b/keyboards/ibm/model_m/teensypp/teensypp.c similarity index 100% rename from keyboards/modelm/teensypp/teensypp.c rename to keyboards/ibm/model_m/teensypp/teensypp.c diff --git a/keyboards/modelm/yugo_m/config.h b/keyboards/ibm/model_m/yugo_m/config.h similarity index 100% rename from keyboards/modelm/yugo_m/config.h rename to keyboards/ibm/model_m/yugo_m/config.h diff --git a/keyboards/modelm/yugo_m/info.json b/keyboards/ibm/model_m/yugo_m/info.json similarity index 100% rename from keyboards/modelm/yugo_m/info.json rename to keyboards/ibm/model_m/yugo_m/info.json diff --git a/keyboards/modelm/yugo_m/keymaps/default/keymap.c b/keyboards/ibm/model_m/yugo_m/keymaps/default/keymap.c similarity index 100% rename from keyboards/modelm/yugo_m/keymaps/default/keymap.c rename to keyboards/ibm/model_m/yugo_m/keymaps/default/keymap.c diff --git a/keyboards/modelm/yugo_m/keymaps/default/readme.md b/keyboards/ibm/model_m/yugo_m/keymaps/default/readme.md similarity index 100% rename from keyboards/modelm/yugo_m/keymaps/default/readme.md rename to keyboards/ibm/model_m/yugo_m/keymaps/default/readme.md diff --git a/keyboards/modelm/yugo_m/readme.md b/keyboards/ibm/model_m/yugo_m/readme.md similarity index 100% rename from keyboards/modelm/yugo_m/readme.md rename to keyboards/ibm/model_m/yugo_m/readme.md diff --git a/keyboards/modelm/yugo_m/rules.mk b/keyboards/ibm/model_m/yugo_m/rules.mk similarity index 100% rename from keyboards/modelm/yugo_m/rules.mk rename to keyboards/ibm/model_m/yugo_m/rules.mk diff --git a/keyboards/modelm/yugo_m/yugo_m.c b/keyboards/ibm/model_m/yugo_m/yugo_m.c similarity index 100% rename from keyboards/modelm/yugo_m/yugo_m.c rename to keyboards/ibm/model_m/yugo_m/yugo_m.c diff --git a/keyboards/modelm/ibm122m/config.h b/keyboards/ibm/model_m_122/ibm122m/config.h similarity index 100% rename from keyboards/modelm/ibm122m/config.h rename to keyboards/ibm/model_m_122/ibm122m/config.h diff --git a/keyboards/modelm/ibm122m/info.json b/keyboards/ibm/model_m_122/ibm122m/info.json similarity index 100% rename from keyboards/modelm/ibm122m/info.json rename to keyboards/ibm/model_m_122/ibm122m/info.json diff --git a/keyboards/modelm/ibm122m/keymaps/andresteare/keymap.c b/keyboards/ibm/model_m_122/ibm122m/keymaps/andresteare/keymap.c similarity index 100% rename from keyboards/modelm/ibm122m/keymaps/andresteare/keymap.c rename to keyboards/ibm/model_m_122/ibm122m/keymaps/andresteare/keymap.c diff --git a/keyboards/modelm/ibm122m/keymaps/default/config.h b/keyboards/ibm/model_m_122/ibm122m/keymaps/default/config.h similarity index 100% rename from keyboards/modelm/ibm122m/keymaps/default/config.h rename to keyboards/ibm/model_m_122/ibm122m/keymaps/default/config.h diff --git a/keyboards/modelm/ibm122m/keymaps/default/keymap.c b/keyboards/ibm/model_m_122/ibm122m/keymaps/default/keymap.c similarity index 100% rename from keyboards/modelm/ibm122m/keymaps/default/keymap.c rename to keyboards/ibm/model_m_122/ibm122m/keymaps/default/keymap.c diff --git a/keyboards/modelm/ibm122m/keymaps/default/readme.md b/keyboards/ibm/model_m_122/ibm122m/keymaps/default/readme.md similarity index 100% rename from keyboards/modelm/ibm122m/keymaps/default/readme.md rename to keyboards/ibm/model_m_122/ibm122m/keymaps/default/readme.md diff --git a/keyboards/modelm/ibm122m/keymaps/lukaus/config.h b/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/config.h similarity index 100% rename from keyboards/modelm/ibm122m/keymaps/lukaus/config.h rename to keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/config.h diff --git a/keyboards/modelm/ibm122m/keymaps/lukaus/keymap.c b/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/keymap.c similarity index 100% rename from keyboards/modelm/ibm122m/keymaps/lukaus/keymap.c rename to keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/keymap.c diff --git a/keyboards/modelm/ibm122m/keymaps/lukaus/readme.md b/keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/readme.md similarity index 100% rename from keyboards/modelm/ibm122m/keymaps/lukaus/readme.md rename to keyboards/ibm/model_m_122/ibm122m/keymaps/lukaus/readme.md diff --git a/keyboards/modelm/ibm122m/keymaps/via/keymap.c b/keyboards/ibm/model_m_122/ibm122m/keymaps/via/keymap.c similarity index 100% rename from keyboards/modelm/ibm122m/keymaps/via/keymap.c rename to keyboards/ibm/model_m_122/ibm122m/keymaps/via/keymap.c diff --git a/keyboards/modelm/ibm122m/keymaps/via/rules.mk b/keyboards/ibm/model_m_122/ibm122m/keymaps/via/rules.mk similarity index 100% rename from keyboards/modelm/ibm122m/keymaps/via/rules.mk rename to keyboards/ibm/model_m_122/ibm122m/keymaps/via/rules.mk diff --git a/keyboards/modelm/ibm122m/readme.md b/keyboards/ibm/model_m_122/ibm122m/readme.md similarity index 100% rename from keyboards/modelm/ibm122m/readme.md rename to keyboards/ibm/model_m_122/ibm122m/readme.md diff --git a/keyboards/modelm/ibm122m/rules.mk b/keyboards/ibm/model_m_122/ibm122m/rules.mk similarity index 100% rename from keyboards/modelm/ibm122m/rules.mk rename to keyboards/ibm/model_m_122/ibm122m/rules.mk diff --git a/keyboards/modelm/m122_3270/blackpill/info.json b/keyboards/ibm/model_m_122/m122_3270/blackpill/info.json similarity index 100% rename from keyboards/modelm/m122_3270/blackpill/info.json rename to keyboards/ibm/model_m_122/m122_3270/blackpill/info.json diff --git a/keyboards/modelm/m122_3270/blackpill/readme.md b/keyboards/ibm/model_m_122/m122_3270/blackpill/readme.md similarity index 100% rename from keyboards/modelm/m122_3270/blackpill/readme.md rename to keyboards/ibm/model_m_122/m122_3270/blackpill/readme.md diff --git a/keyboards/modelm/m122_3270/blackpill/rules.mk b/keyboards/ibm/model_m_122/m122_3270/blackpill/rules.mk similarity index 100% rename from keyboards/modelm/m122_3270/blackpill/rules.mk rename to keyboards/ibm/model_m_122/m122_3270/blackpill/rules.mk diff --git a/keyboards/modelm/m122_3270/bluepill/info.json b/keyboards/ibm/model_m_122/m122_3270/bluepill/info.json similarity index 100% rename from keyboards/modelm/m122_3270/bluepill/info.json rename to keyboards/ibm/model_m_122/m122_3270/bluepill/info.json diff --git a/keyboards/modelm/m122_3270/bluepill/readme.md b/keyboards/ibm/model_m_122/m122_3270/bluepill/readme.md similarity index 100% rename from keyboards/modelm/m122_3270/bluepill/readme.md rename to keyboards/ibm/model_m_122/m122_3270/bluepill/readme.md diff --git a/keyboards/modelm/m122_3270/bluepill/rules.mk b/keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk similarity index 100% rename from keyboards/modelm/m122_3270/bluepill/rules.mk rename to keyboards/ibm/model_m_122/m122_3270/bluepill/rules.mk diff --git a/keyboards/modelm/m122_3270/info.json b/keyboards/ibm/model_m_122/m122_3270/info.json similarity index 100% rename from keyboards/modelm/m122_3270/info.json rename to keyboards/ibm/model_m_122/m122_3270/info.json diff --git a/keyboards/modelm/m122_3270/keymaps/default/keymap.c b/keyboards/ibm/model_m_122/m122_3270/keymaps/default/keymap.c similarity index 100% rename from keyboards/modelm/m122_3270/keymaps/default/keymap.c rename to keyboards/ibm/model_m_122/m122_3270/keymaps/default/keymap.c diff --git a/keyboards/modelm/m122_3270/keymaps/default/readme.md b/keyboards/ibm/model_m_122/m122_3270/keymaps/default/readme.md similarity index 100% rename from keyboards/modelm/m122_3270/keymaps/default/readme.md rename to keyboards/ibm/model_m_122/m122_3270/keymaps/default/readme.md diff --git a/keyboards/modelm/m122_3270/readme.md b/keyboards/ibm/model_m_122/m122_3270/readme.md similarity index 100% rename from keyboards/modelm/m122_3270/readme.md rename to keyboards/ibm/model_m_122/m122_3270/readme.md diff --git a/keyboards/modelm/m122_3270/teensy/info.json b/keyboards/ibm/model_m_122/m122_3270/teensy/info.json similarity index 100% rename from keyboards/modelm/m122_3270/teensy/info.json rename to keyboards/ibm/model_m_122/m122_3270/teensy/info.json diff --git a/keyboards/modelm/m122_3270/teensy/readme.md b/keyboards/ibm/model_m_122/m122_3270/teensy/readme.md similarity index 100% rename from keyboards/modelm/m122_3270/teensy/readme.md rename to keyboards/ibm/model_m_122/m122_3270/teensy/readme.md diff --git a/keyboards/modelm/m122_3270/teensy/rules.mk b/keyboards/ibm/model_m_122/m122_3270/teensy/rules.mk similarity index 100% rename from keyboards/modelm/m122_3270/teensy/rules.mk rename to keyboards/ibm/model_m_122/m122_3270/teensy/rules.mk diff --git a/keyboards/modelm/teensypp_ssk/config.h b/keyboards/ibm/model_m_ssk/teensypp_ssk/config.h similarity index 100% rename from keyboards/modelm/teensypp_ssk/config.h rename to keyboards/ibm/model_m_ssk/teensypp_ssk/config.h diff --git a/keyboards/modelm/teensypp_ssk/info.json b/keyboards/ibm/model_m_ssk/teensypp_ssk/info.json similarity index 100% rename from keyboards/modelm/teensypp_ssk/info.json rename to keyboards/ibm/model_m_ssk/teensypp_ssk/info.json diff --git a/keyboards/modelm/teensypp_ssk/keymaps/default/keymap.c b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/default/keymap.c similarity index 100% rename from keyboards/modelm/teensypp_ssk/keymaps/default/keymap.c rename to keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/default/keymap.c diff --git a/keyboards/modelm/teensypp_ssk/keymaps/default/readme.md b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/default/readme.md similarity index 100% rename from keyboards/modelm/teensypp_ssk/keymaps/default/readme.md rename to keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/default/readme.md diff --git a/keyboards/modelm/teensypp_ssk/keymaps/tiltowait/config.h b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/config.h similarity index 100% rename from keyboards/modelm/teensypp_ssk/keymaps/tiltowait/config.h rename to keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/config.h diff --git a/keyboards/modelm/teensypp_ssk/keymaps/tiltowait/keymap.c b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/keymap.c similarity index 100% rename from keyboards/modelm/teensypp_ssk/keymaps/tiltowait/keymap.c rename to keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/keymap.c diff --git a/keyboards/modelm/teensypp_ssk/keymaps/tiltowait/readme.md b/keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/readme.md similarity index 100% rename from keyboards/modelm/teensypp_ssk/keymaps/tiltowait/readme.md rename to keyboards/ibm/model_m_ssk/teensypp_ssk/keymaps/tiltowait/readme.md diff --git a/keyboards/modelm/teensypp_ssk/readme.md b/keyboards/ibm/model_m_ssk/teensypp_ssk/readme.md similarity index 100% rename from keyboards/modelm/teensypp_ssk/readme.md rename to keyboards/ibm/model_m_ssk/teensypp_ssk/readme.md diff --git a/keyboards/modelm/teensypp_ssk/rules.mk b/keyboards/ibm/model_m_ssk/teensypp_ssk/rules.mk similarity index 100% rename from keyboards/modelm/teensypp_ssk/rules.mk rename to keyboards/ibm/model_m_ssk/teensypp_ssk/rules.mk From 2cb4d7f22ae65cd5d20156a722c1c4ce46b5321c Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Sat, 29 Apr 2023 20:11:42 +0200 Subject: [PATCH 22/25] Update URLs and paths for all moved Model M variants --- keyboards/ibm/model_m/ashpil_usbc/info.json | 2 +- keyboards/ibm/model_m/ashpil_usbc/readme.md | 2 +- keyboards/ibm/model_m/mschwingen/info.json | 2 +- keyboards/ibm/model_m/mschwingen/readme.md | 12 +++++----- keyboards/ibm/model_m/teensy2/info.json | 2 +- keyboards/ibm/model_m/teensy2/readme.md | 4 ++-- keyboards/ibm/model_m/teensypp/info.json | 2 +- keyboards/ibm/model_m/teensypp/readme.md | 2 +- keyboards/ibm/model_m/yugo_m/info.json | 2 +- keyboards/ibm/model_m/yugo_m/readme.md | 4 ++-- keyboards/ibm/model_m_122/ibm122m/info.json | 2 +- keyboards/ibm/model_m_122/ibm122m/readme.md | 2 +- keyboards/ibm/model_m_122/m122_3270/info.json | 1 + keyboards/ibm/model_m_122/m122_3270/readme.md | 5 ++-- keyboards/ibm/model_m_122/readme.md | 24 +++++++++++++++++++ keyboards/ibm/model_m_ssk/readme.md | 24 +++++++++++++++++++ .../ibm/model_m_ssk/teensypp_ssk/info.json | 2 +- .../ibm/model_m_ssk/teensypp_ssk/readme.md | 6 ++--- 18 files changed, 75 insertions(+), 25 deletions(-) create mode 100644 keyboards/ibm/model_m_122/readme.md create mode 100644 keyboards/ibm/model_m_ssk/readme.md diff --git a/keyboards/ibm/model_m/ashpil_usbc/info.json b/keyboards/ibm/model_m/ashpil_usbc/info.json index 797ed5a5c945..ffdb608edc55 100644 --- a/keyboards/ibm/model_m/ashpil_usbc/info.json +++ b/keyboards/ibm/model_m/ashpil_usbc/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "IBM Model M 101/102", "manufacturer": "ashpil", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/ashpil_usbc", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/ashpil_usbc", "maintainer": "ashpil", "usb": { "vid": "0xFEED", diff --git a/keyboards/ibm/model_m/ashpil_usbc/readme.md b/keyboards/ibm/model_m/ashpil_usbc/readme.md index 8921a64b857f..801cb612fd4d 100644 --- a/keyboards/ibm/model_m/ashpil_usbc/readme.md +++ b/keyboards/ibm/model_m/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 modelm/ashpil_usbc:default + make ibm/model_m/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/ibm/model_m/mschwingen/info.json b/keyboards/ibm/model_m/mschwingen/info.json index db9b9814ceb7..1ba525de6c8f 100644 --- a/keyboards/ibm/model_m/mschwingen/info.json +++ b/keyboards/ibm/model_m/mschwingen/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "atmega32U4 board for IBM Model M", "manufacturer": "mschwingen", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/mschwingen", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/mschwingen", "maintainer": "mschwingen", "usb": { "vid": "0xFEED", diff --git a/keyboards/ibm/model_m/mschwingen/readme.md b/keyboards/ibm/model_m/mschwingen/readme.md index fd47af346a58..69c5c8b268b0 100644 --- a/keyboards/ibm/model_m/mschwingen/readme.md +++ b/keyboards/ibm/model_m/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 modelm/mschwingen/led_wired:default - make modelm/mschwingen/led_ffc:default - make modelm/mschwingen/led_ws2812:default + make ibm/model_m/mschwingen/led_wired:default + make ibm/model_m/mschwingen/led_ffc:default + make ibm/model_m/mschwingen/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 + make ibm/model_m/mschwingen/led_wired:default:flash + make ibm/model_m/mschwingen/led_ffc:default:flash + make ibm/model_m/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/ibm/model_m/teensy2/info.json b/keyboards/ibm/model_m/teensy2/info.json index dc51880d5f9f..19603adb7a50 100644 --- a/keyboards/ibm/model_m/teensy2/info.json +++ b/keyboards/ibm/model_m/teensy2/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "IBM Model M 101/102", "manufacturer": "wangfuco", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/teensy2", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/teensy2", "maintainer": "wangfuco", "usb": { "vid": "0xFEED", diff --git a/keyboards/ibm/model_m/teensy2/readme.md b/keyboards/ibm/model_m/teensy2/readme.md index 53b32fed6724..20f10d47914e 100644 --- a/keyboards/ibm/model_m/teensy2/readme.md +++ b/keyboards/ibm/model_m/teensy2/readme.md @@ -18,12 +18,12 @@ Status LEDs: CapsLock +5V ScrollLock NumLock Pins: E6 5V - - ``` -Keyboard Maintainer: [wangfuco](https://github.com/wangfuco) +Keyboard Maintainer: [wangfuco](https://github.com/wangfuco) Hardware Supported: Teensy 2.0 board by PJRC Hardware Availability: https://www.pjrc.com/store/teensy.html Make example for this keyboard (after setting up your build environment): - make modelm/teensy2:default:teensy + make ibm/model_m/teensy2: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/ibm/model_m/teensypp/info.json b/keyboards/ibm/model_m/teensypp/info.json index 0f546f7d2b2a..dcbed72aebf8 100644 --- a/keyboards/ibm/model_m/teensypp/info.json +++ b/keyboards/ibm/model_m/teensypp/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "IBM Model M 101/102", "manufacturer": "iw0rm3r", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/teensypp", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/teensypp", "maintainer": "iw0rm3r", "usb": { "vid": "0xFEED", diff --git a/keyboards/ibm/model_m/teensypp/readme.md b/keyboards/ibm/model_m/teensypp/readme.md index 8e3988e6626e..e05d68b81c5d 100644 --- a/keyboards/ibm/model_m/teensypp/readme.md +++ b/keyboards/ibm/model_m/teensypp/readme.md @@ -37,6 +37,6 @@ Please note that some versions of Model M have LED connected with a ribbon cable Make example for this keyboard (after setting up your build environment): - make modelm/teensypp:default:teensy + make ibm/model_m/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/ibm/model_m/yugo_m/info.json b/keyboards/ibm/model_m/yugo_m/info.json index 11d66dc1a253..6e3a0b39c61a 100644 --- a/keyboards/ibm/model_m/yugo_m/info.json +++ b/keyboards/ibm/model_m/yugo_m/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "Yugo-M (IBM Model M replacment controller)", "manufacturer": "IBM", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/yugo_m", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/yugo_m", "maintainer": "Nidzo Tomic", "usb": { "vid": "0xFEED", diff --git a/keyboards/ibm/model_m/yugo_m/readme.md b/keyboards/ibm/model_m/yugo_m/readme.md index 89e1fae7676d..87ca8354fb98 100644 --- a/keyboards/ibm/model_m/yugo_m/readme.md +++ b/keyboards/ibm/model_m/yugo_m/readme.md @@ -12,7 +12,7 @@ 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 modelm/yugo_m:default + make ibm/model_m/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). @@ -22,4 +22,4 @@ Note regarding 2022 matrix update: The original author's firmware did not make several lesser-used membrane/matrix positions available to the controller. These are useful for JIS users and/or if you simply want to create a more unique layout. I've added all of the unused membrane positions to the firmware, except for an extremely seldom used one that sits in the left side of the space bar on some later membranes (I would have added it if I knew its matrix position, but I haven't mapped that out yet). The default mappings for these additional keys follow JIS conventions, except for the extra key on the bottom right corner of the numpad (lower half of vertical 2u Enter), which I've mapped to the LGUI key a.k.a. left Windows/Command key for now. Remap as you wish! -- an_achronism, February 2022 \ No newline at end of file +- an_achronism, February 2022 diff --git a/keyboards/ibm/model_m_122/ibm122m/info.json b/keyboards/ibm/model_m_122/ibm122m/info.json index a1f1698455c5..54b0e9badea7 100644 --- a/keyboards/ibm/model_m_122/ibm122m/info.json +++ b/keyboards/ibm/model_m_122/ibm122m/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "IBM Model M 122 key", "manufacturer": "IBM", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/ibm122m", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m_122/ibm122m", "maintainer": "qmk", "usb": { "vid": "0xFEED", diff --git a/keyboards/ibm/model_m_122/ibm122m/readme.md b/keyboards/ibm/model_m_122/ibm122m/readme.md index 54494f2d5bec..87b145cd5ba5 100644 --- a/keyboards/ibm/model_m_122/ibm122m/readme.md +++ b/keyboards/ibm/model_m_122/ibm122m/readme.md @@ -26,6 +26,6 @@ Pins: C6 GND B6 GND Make example for this keyboard (after setting up your build environment): - make modelm/ibm122m:default + make ibm/model_m_122/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/ibm/model_m_122/m122_3270/info.json b/keyboards/ibm/model_m_122/m122_3270/info.json index 364ab250dccd..9b7a78c7f71f 100644 --- a/keyboards/ibm/model_m_122/m122_3270/info.json +++ b/keyboards/ibm/model_m_122/m122_3270/info.json @@ -1,6 +1,7 @@ { "keyboard_name": "Model M PC/3270 122 key", "manufacturer": "IBM", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m_122/m122_3270", "maintainer": "jmaynard", "usb": { "vid": "0x1209", diff --git a/keyboards/ibm/model_m_122/m122_3270/readme.md b/keyboards/ibm/model_m_122/m122_3270/readme.md index 7c7852d5d77f..14b8684897ad 100644 --- a/keyboards/ibm/model_m_122/m122_3270/readme.md +++ b/keyboards/ibm/model_m_122/m122_3270/readme.md @@ -12,8 +12,9 @@ keyboard's functioning as possible while still being usable on a PC. Make example for this keyboard (after setting up your build environment): - make modelm/m122_3270/blackpill:default - make modelm/m122_3270/teensy:default + make ibm/model_m_122/m122_3270/blackpill:default + make ibm/model_m_122/m122_3270/bluepill:default + make ibm/model_m_122/m122_3270/teensy: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) diff --git a/keyboards/ibm/model_m_122/readme.md b/keyboards/ibm/model_m_122/readme.md new file mode 100644 index 000000000000..0f11f3cf99a4 --- /dev/null +++ b/keyboards/ibm/model_m_122/readme.md @@ -0,0 +1,24 @@ +# IBM Model M Terminal with 122 keys + +This is the parent directory for all projects that replace the controller +of IBM's Model M terminal keyboard with 122 keys 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 variants with 101/102 keys, the +space saving keyboard (SSK, 84-key) etc. diff --git a/keyboards/ibm/model_m_ssk/readme.md b/keyboards/ibm/model_m_ssk/readme.md new file mode 100644 index 000000000000..aa9ee490c4c4 --- /dev/null +++ b/keyboards/ibm/model_m_ssk/readme.md @@ -0,0 +1,24 @@ +# IBM Model M Space Saving Keyboard (SSK, 84-key) + +This is the parent directory for all projects that replace the controller +of IBM's Model M space saving keyboard keyboard with 84 keys 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 variants with 101/102 keys, the +terminal keyboard with 122 keys etc. diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/info.json b/keyboards/ibm/model_m_ssk/teensypp_ssk/info.json index ff2c6cc21777..fbc3076c4728 100644 --- a/keyboards/ibm/model_m_ssk/teensypp_ssk/info.json +++ b/keyboards/ibm/model_m_ssk/teensypp_ssk/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "IBM Model M Space-Saving Keyboard", "manufacturer": "tiltowait", - "url": "https://github.com/tiltowait/qmk_firmware/tree/modelm_ssk/keyboards/converter/modelm_ssk", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m_ssk/teensypp_ssk", "maintainer": "tiltowait", "usb": { "vid": "0xFEED", diff --git a/keyboards/ibm/model_m_ssk/teensypp_ssk/readme.md b/keyboards/ibm/model_m_ssk/teensypp_ssk/readme.md index d413a0fbf6d5..14c0e93dbd5a 100644 --- a/keyboards/ibm/model_m_ssk/teensypp_ssk/readme.md +++ b/keyboards/ibm/model_m_ssk/teensypp_ssk/readme.md @@ -2,11 +2,11 @@ ![IBM Model M Space-Saving Keyboard](https://i.imgur.com/CSXrQI5.jpg) -This is a QMK firmware configuration for the IBM Model M Space-Saving Keyboard (SSK). Based on [this project](https://github.com/qmk/qmk_firmware/tree/master/keyboards/modelm/teensypp), it features a few slight improvements and, most importantly, a full remapping to match the SSK's matrix, which differs from its full-sized cousins. The modification is easily reversible, as no part of the keyboard is permanently changed. Just take out the replacement controller and reinstall the original, should you desire. +This is a QMK firmware configuration for the IBM Model M Space-Saving Keyboard (SSK). Based on [this project](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ibm/model_m/teensypp), it features a few slight improvements and, most importantly, a full remapping to match the SSK's matrix, which differs from its full-sized cousins. The modification is easily reversible, as no part of the keyboard is permanently changed. Just take out the replacement controller and reinstall the original, should you desire. The numpad layer (accessed with Shift + Scroll Lock as with the original controller) is mapped to layer 7 by default. All non-numpad keys are transparent. -**Note:** As of this writing, this configuration has only been tested on the 1392464 SSK. It's possible other models differ in their internal matrices. Should the provided matrix not work for you (and you are certain of your connections), you can enable debugging with `CONSOLE_ENABLE = yes` in `rules.mk` and by following the directions in `default/keymap.c`. Once done, [QMK Toolbox](https://github.com/qmk/qmk_toolbox) will display row/col information to help you remap `modelm_ssk.h`. +**Note:** As of this writing, this configuration has only been tested on the 1392464 SSK. It's possible other models differ in their internal matrices. Should the provided matrix not work for you (and you are certain of your connections), you can enable debugging with `CONSOLE_ENABLE = yes` in `rules.mk` and by following the directions in `default/keymap.c`. Once done, [QMK Toolbox](https://github.com/qmk/qmk_toolbox) will display row/col information to help you remap `keymap.c`. ## Requirements @@ -48,7 +48,7 @@ This configuration will not work out of the box with the [Unicomp Mini M](https: Make example for this keyboard (after setting up your build environment): - make converter/modelm_ssk:default + make ibm/model_m_ssk/teensypp_ssk:default You must press the button on the Teensy to enter the bootloader the first time. Afterward, so long as you keep `COMMAND_ENABLE = yes` in `rules.mk` (enabled by default), you can use `Left Shift + Right Shift + B` to enter the bootloader. With this method, you can omit `:teensy` from the end of the `make` command. From be55388aa018597a6c893f9dd14284253c2628b2 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Sat, 29 Apr 2023 20:25:39 +0200 Subject: [PATCH 23/25] Update pull-request files --- data/mappings/keyboard_aliases.hjson | 16 ++++++++-------- .../{20230226/20221126 => 20230528}/PR14996.md | 4 +++- 2 files changed, 11 insertions(+), 9 deletions(-) rename docs/ChangeLog/{20230226/20221126 => 20230528}/PR14996.md (88%) diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson index 7c0bc73fa1b7..dd6a74d6cd42 100644 --- a/data/mappings/keyboard_aliases.hjson +++ b/data/mappings/keyboard_aliases.hjson @@ -42,7 +42,7 @@ "target": "angel64/alpha" }, "ashpil/modelm_usbc": { - "target": "modelm/ashpil_usbc" + "target": "ibm/model_m/ashpil_usbc" }, "at101_blackheart": { "target": "viktus/at101_bh" @@ -117,13 +117,13 @@ "target": "cmm_studio/saka68/solder" }, "converter/modelm101": { - "target": "modelm/teensypp" + "target": "ibm/model_m/teensypp" }, "converter/modelm101_teensy2": { - "target": "modelm/teensy2" + "target": "ibm/model_m/teensy2" }, "converter/modelm_ssk": { - "target": "modelm/teensypp_ssk" + "target": "ibm/model_m_ssk/teensypp_ssk" }, "cospad": { "target": "kprepublic/cospad" @@ -216,7 +216,7 @@ "target": "ferris/0_1" }, "handwired/ibm122m": { - "target": "modelm/ibm122m" + "target": "ibm/model_m_122/ibm122m" }, "handwired/p1800fl": { "target": "team0110/p1800fl" @@ -435,7 +435,7 @@ "target": "montsinger/rebound/rev1" }, "mschwingen/modelm": { - "target": "modelm/mschwingen" + "target": "ibm/model_m/mschwingen" }, "noxary/268_2": { "layouts": { @@ -1253,7 +1253,7 @@ "target": "marksard/treadstone48/rev2" }, "tronguylabs/m122_3270": { - "target": "modelm/m122_3270" + "target": "ibm/model_m_122/m122_3270" }, "ua62": { "target": "nacly/ua62" @@ -1316,7 +1316,7 @@ "target": "ymdk/np21" }, "yugo_m/model_m_101": { - "target": "modelm/yugo_m" + "target": "ibm/model_m/yugo_m" }, "yurei": { "target": "kkatano/yurei" diff --git a/docs/ChangeLog/20230226/20221126/PR14996.md b/docs/ChangeLog/20230528/PR14996.md similarity index 88% rename from docs/ChangeLog/20230226/20221126/PR14996.md rename to docs/ChangeLog/20230528/PR14996.md index 94482bb1071f..d59b407e4cc5 100644 --- a/docs/ChangeLog/20230226/20221126/PR14996.md +++ b/docs/ChangeLog/20230528/PR14996.md @@ -1,4 +1,4 @@ -# QMK Breaking Changes - 2022 November 26 Changelog +# QMK Breaking Changes - 2023 May 28 Changelog ## Notable Features :id=notable-features @@ -16,4 +16,6 @@ List of the consolidations now in keyboards/modelm/: - teensy2 (renamed from modelm101_teensy2) - teensypp (renamed from modelm101) - teensypp_ssk (renamed from modelm_ssk) +- ibm122m +- m122_3270 - yugo_m From bd6242e2226d62b08d7eeaa5a46c48760afdb466 Mon Sep 17 00:00:00 2001 From: Christoph Zimmermann Date: Mon, 22 May 2023 06:46:24 +0200 Subject: [PATCH 24/25] Fixed unresolved merge conflict found by keyboard-magpie --- keyboards/kprepublic/bm80v2/keymaps/smooted/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h b/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h index 6a2811dfbd7a..88fa41d11098 100644 --- a/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h +++ b/keyboards/kprepublic/bm80v2/keymaps/smooted/config.h @@ -12,10 +12,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -<<<<<<<< HEAD:keyboards/kprepublic/bm80v2/keymaps/smooted/config.h #pragma once #define FORCE_NKRO -======== -#include "teensypp_ssk.h" ->>>>>>>> 34da7a0efa (For teensypp_ssk adjust file names according to new folder name):keyboards/modelm/teensypp_ssk/teensypp_ssk.c From 108191e5735daf582fcb36b9be706692080e2799 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 27 May 2023 22:14:27 +1000 Subject: [PATCH 25/25] Fixup build errors. --- keyboards/ibm/model_m/mschwingen/config.h | 6 +++--- .../ibm/model_m/mschwingen/led_ffc/readme.md | 4 ++-- .../ibm/model_m/mschwingen/led_wired/readme.md | 4 ++-- .../ibm/model_m/mschwingen/led_ws2812/readme.md | 4 ++-- keyboards/ibm/model_m/mschwingen/mschwingen.c | 8 ++++---- keyboards/ibm/model_m/mschwingen/rules.mk | 2 +- keyboards/ibm/model_m/teensy2/teensy2.c | 16 ---------------- keyboards/lxxt/config.h | 2 +- 8 files changed, 15 insertions(+), 31 deletions(-) delete mode 100644 keyboards/ibm/model_m/teensy2/teensy2.c diff --git a/keyboards/ibm/model_m/mschwingen/config.h b/keyboards/ibm/model_m/mschwingen/config.h index 4e83b0494286..b1dc81b8c780 100644 --- a/keyboards/ibm/model_m/mschwingen/config.h +++ b/keyboards/ibm/model_m/mschwingen/config.h @@ -56,15 +56,15 @@ #define MODELM_LED2 B6 #define MODELM_LED3 D0 -#if defined(KEYBOARD_modelm_mschwingen_led_wired) +#if defined(KEYBOARD_ibm_model_m_mschwingen_led_wired) # define MODELM_LED_CAPSLOCK MODELM_LED1 # define MODELM_LED_SCROLLOCK MODELM_LED2 # define MODELM_LED_NUMLOCK MODELM_LED3 -#elif defined(KEYBOARD_modelm_mschwingen_led_ffc) +#elif defined(KEYBOARD_ibm_model_m_mschwingen_led_ffc) # define MODELM_LED_CAPSLOCK MODELM_LED2 # define MODELM_LED_SCROLLOCK MODELM_LED3 # define MODELM_LED_NUMLOCK MODELM_LED1 -#elif defined(KEYBOARD_modelm_mschwingen_led_ws2812) +#elif defined(KEYBOARD_ibm_model_m_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/ibm/model_m/mschwingen/led_ffc/readme.md b/keyboards/ibm/model_m/mschwingen/led_ffc/readme.md index ae142554e11e..722567c18f0a 100644 --- a/keyboards/ibm/model_m/mschwingen/led_ffc/readme.md +++ b/keyboards/ibm/model_m/mschwingen/led_ffc/readme.md @@ -10,11 +10,11 @@ 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 modelm/mschwingen/led_ffc:default + make ibm/model_m/mschwingen/led_ffc:default Flashing example for this keyboard: - make modelm/mschwingen/led_ffc:default:flash + make ibm/model_m/mschwingen/led_ffc: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/ibm/model_m/mschwingen/led_wired/readme.md b/keyboards/ibm/model_m/mschwingen/led_wired/readme.md index 2ddca7cda792..073c75c10dc3 100644 --- a/keyboards/ibm/model_m/mschwingen/led_wired/readme.md +++ b/keyboards/ibm/model_m/mschwingen/led_wired/readme.md @@ -10,11 +10,11 @@ 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 modelm/mschwingen/led_wired:default + make ibm/model_m/mschwingen/led_wired:default Flashing example for this keyboard: - make modelm/mschwingen/led_wired:default:flash + make ibm/model_m/mschwingen/led_wired: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/ibm/model_m/mschwingen/led_ws2812/readme.md b/keyboards/ibm/model_m/mschwingen/led_ws2812/readme.md index 173950da7b2c..669f7f37a1c1 100644 --- a/keyboards/ibm/model_m/mschwingen/led_ws2812/readme.md +++ b/keyboards/ibm/model_m/mschwingen/led_ws2812/readme.md @@ -10,11 +10,11 @@ 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 modelm/mschwingen/led_ws2812:default + make ibm/model_m/mschwingen/led_ws2812:default Flashing example for this keyboard: - make modelm/mschwingen/led_ws2812:default:flash + make ibm/model_m/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/ibm/model_m/mschwingen/mschwingen.c b/keyboards/ibm/model_m/mschwingen/mschwingen.c index 1d04e242c037..b764660e2174 100644 --- a/keyboards/ibm/model_m/mschwingen/mschwingen.c +++ b/keyboards/ibm/model_m/mschwingen/mschwingen.c @@ -35,7 +35,7 @@ static uint16_t blink_cycle_timer; static bool blink_state = false; static uint8_t isRecording = 0; -#ifdef KEYBOARD_modelm_mschwingen_led_ws2812 +#ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 # if RGBLED_NUM < 3 # error we need at least 3 RGB LEDs! # endif @@ -80,7 +80,7 @@ void sleep_led_disable(void) { void sleep_led_enable(void) { suspend_active = true; writePinLow(MODELM_STATUS_LED); -#ifdef KEYBOARD_modelm_mschwingen_led_ws2812 +#ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 led[0] = black; led[1] = black; led[2] = black; @@ -89,7 +89,7 @@ void sleep_led_enable(void) { } void keyboard_pre_init_kb(void) { -#ifdef KEYBOARD_modelm_mschwingen_led_ws2812 +#ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 ws2812_setleds(led, RGBLED_NUM); #else /* Set status LEDs pins to output and Low (on) */ @@ -115,7 +115,7 @@ void keyboard_pre_init_kb(void) { writePinLow(SR_CLK_PIN); } -#ifdef KEYBOARD_modelm_mschwingen_led_ws2812 +#ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 static void led_update_rgb(void) { if (isRecording && blink_state) { led[0] = white; diff --git a/keyboards/ibm/model_m/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk index 334298d93ba9..5ccab87d9b62 100644 --- a/keyboards/ibm/model_m/mschwingen/rules.mk +++ b/keyboards/ibm/model_m/mschwingen/rules.mk @@ -26,4 +26,4 @@ OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS28 LTO_ENABLE = yes -DEFAULT_FOLDER = modelm/mschwingen/led_wired +DEFAULT_FOLDER = ibm/model_m/mschwingen/led_wired diff --git a/keyboards/ibm/model_m/teensy2/teensy2.c b/keyboards/ibm/model_m/teensy2/teensy2.c deleted file mode 100644 index 6a9b37769bdd..000000000000 --- a/keyboards/ibm/model_m/teensy2/teensy2.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 iw0rm3r - * - * 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 "teensy2.h" diff --git a/keyboards/lxxt/config.h b/keyboards/lxxt/config.h index df0d65abbb6b..03ef56622c0c 100644 --- a/keyboards/lxxt/config.h +++ b/keyboards/lxxt/config.h @@ -16,4 +16,4 @@ #pragma once -#define WS2812_PIO_USE_PIO1 +#define WS2812_PIO_USE_PIO1 \ No newline at end of file