Skip to content

Commit

Permalink
Fixup build errors.
Browse files Browse the repository at this point in the history
  • Loading branch information
@tzarc
tzarc committed May 27, 2023
1 parent ee9cb2f commit 108191e
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 31 deletions.
6 changes: 3 additions & 3 deletions keyboards/ibm/model_m/mschwingen/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions keyboards/ibm/model_m/mschwingen/led_ffc/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions keyboards/ibm/model_m/mschwingen/led_wired/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions keyboards/ibm/model_m/mschwingen/led_ws2812/readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions keyboards/ibm/model_m/mschwingen/mschwingen.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -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) */
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion keyboards/ibm/model_m/mschwingen/rules.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
16 changes: 0 additions & 16 deletions keyboards/ibm/model_m/teensy2/teensy2.c
View file

This file was deleted.

2 changes: 1 addition & 1 deletion keyboards/lxxt/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@

#pragma once

#define WS2812_PIO_USE_PIO1
#define WS2812_PIO_USE_PIO1

0 comments on commit 108191e

Please sign in to comment.