From 9a7cf626924c5e8750972d6d00d114d9ac34e938 Mon Sep 17 00:00:00 2001 From: nuess0r Date: Mon, 3 May 2021 22:11:18 +0200 Subject: [PATCH] Putting all IBM Model M projects under one folder As discussed in #12370: The maintainers of several Model M replacement controller projects agreed to cosolidate them under one common folder. --- keyboards/handwired/ibm122m/readme.md | 16 ---------- 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