diff options
| author | Ryan <fauxpark@gmail.com> | 2025-01-25 17:38:12 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-25 17:38:12 +1100 |
| commit | a6e931400ead19d3d34ca4a57785d1512dc2d12b (patch) | |
| tree | 7bd11496da317433f129f2736a94939987ccbac8 | |
| parent | 2dd2d4eb8124cc92c9fb27d657fd9742a75a51e4 (diff) | |
Relocate base WS2812 code (#24850)
| -rw-r--r-- | builddefs/common_features.mk | 2 | ||||
| -rw-r--r-- | drivers/led/ws2812.c (renamed from drivers/ws2812.c) | 0 | ||||
| -rw-r--r-- | drivers/led/ws2812.h (renamed from drivers/ws2812.h) | 0 | ||||
| -rw-r--r-- | keyboards/ibm/model_m/mschwingen/mschwingen.c | 5 |
4 files changed, 6 insertions, 1 deletions
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk index 989048d717..c88ce36011 100644 --- a/builddefs/common_features.mk +++ b/builddefs/common_features.mk | |||
| @@ -944,6 +944,8 @@ ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes) | |||
| 944 | 944 | ||
| 945 | OPT_DEFS += -DWS2812_$(strip $(shell echo $(WS2812_DRIVER) | tr '[:lower:]' '[:upper:]')) | 945 | OPT_DEFS += -DWS2812_$(strip $(shell echo $(WS2812_DRIVER) | tr '[:lower:]' '[:upper:]')) |
| 946 | 946 | ||
| 947 | COMMON_VPATH += $(DRIVER_PATH)/led | ||
| 948 | |||
| 947 | SRC += ws2812.c ws2812_$(strip $(WS2812_DRIVER)).c | 949 | SRC += ws2812.c ws2812_$(strip $(WS2812_DRIVER)).c |
| 948 | 950 | ||
| 949 | ifeq ($(strip $(PLATFORM)), CHIBIOS) | 951 | ifeq ($(strip $(PLATFORM)), CHIBIOS) |
diff --git a/drivers/ws2812.c b/drivers/led/ws2812.c index bf234c6f7d..bf234c6f7d 100644 --- a/drivers/ws2812.c +++ b/drivers/led/ws2812.c | |||
diff --git a/drivers/ws2812.h b/drivers/led/ws2812.h index 8013e5bd2d..8013e5bd2d 100644 --- a/drivers/ws2812.h +++ b/drivers/led/ws2812.h | |||
diff --git a/keyboards/ibm/model_m/mschwingen/mschwingen.c b/keyboards/ibm/model_m/mschwingen/mschwingen.c index cb4854d8d1..34a878c769 100644 --- a/keyboards/ibm/model_m/mschwingen/mschwingen.c +++ b/keyboards/ibm/model_m/mschwingen/mschwingen.c | |||
| @@ -19,9 +19,12 @@ | |||
| 19 | #include "uart.h" | 19 | #include "uart.h" |
| 20 | #include "print.h" | 20 | #include "print.h" |
| 21 | #include "sendchar.h" | 21 | #include "sendchar.h" |
| 22 | #include "ws2812.h" | ||
| 23 | #include "sleep_led.h" | 22 | #include "sleep_led.h" |
| 24 | 23 | ||
| 24 | #ifdef KEYBOARD_ibm_model_m_mschwingen_led_ws2812 | ||
| 25 | #include "ws2812.h" | ||
| 26 | #endif | ||
| 27 | |||
| 25 | #ifdef UART_DEBUG | 28 | #ifdef UART_DEBUG |
| 26 | # undef sendchar | 29 | # undef sendchar |
| 27 | static int8_t capture_sendchar(uint8_t c) { | 30 | static int8_t capture_sendchar(uint8_t c) { |
