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