From 377b991e5bde4488e0dd024083c3aec3c1a55a42 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sat, 31 Jul 2021 14:31:09 +0100 Subject: [PATCH] Move some led drivers to common folder (#13749) * Move some led drivers to common folder --- common_features.mk | 14 +++++++------- docs/feature_led_matrix.md | 2 +- docs/feature_rgb_matrix.md | 6 +++--- docs/ja/feature_led_matrix.md | 2 +- drivers/{apa102 => led}/apa102.c | 0 drivers/{apa102 => led}/apa102.h | 0 drivers/{awinic => led}/aw20216.c | 0 drivers/{awinic => led}/aw20216.h | 0 drivers/{ => led}/issi/is31fl3218.c | 0 drivers/{ => led}/issi/is31fl3218.h | 0 drivers/{ => led}/issi/is31fl3731-simple.c | 0 drivers/{ => led}/issi/is31fl3731-simple.h | 0 drivers/{ => led}/issi/is31fl3731.c | 0 drivers/{ => led}/issi/is31fl3731.h | 0 drivers/{ => led}/issi/is31fl3733.c | 0 drivers/{ => led}/issi/is31fl3733.h | 0 drivers/{ => led}/issi/is31fl3736.c | 0 drivers/{ => led}/issi/is31fl3736.h | 0 drivers/{ => led}/issi/is31fl3737.c | 0 drivers/{ => led}/issi/is31fl3737.h | 0 drivers/{ => led}/issi/is31fl3741.c | 0 drivers/{ => led}/issi/is31fl3741.h | 0 22 files changed, 12 insertions(+), 12 deletions(-) rename drivers/{apa102 => led}/apa102.c (100%) rename drivers/{apa102 => led}/apa102.h (100%) rename drivers/{awinic => led}/aw20216.c (100%) rename drivers/{awinic => led}/aw20216.h (100%) rename drivers/{ => led}/issi/is31fl3218.c (100%) rename drivers/{ => led}/issi/is31fl3218.h (100%) rename drivers/{ => led}/issi/is31fl3731-simple.c (100%) rename drivers/{ => led}/issi/is31fl3731-simple.h (100%) rename drivers/{ => led}/issi/is31fl3731.c (100%) rename drivers/{ => led}/issi/is31fl3731.h (100%) rename drivers/{ => led}/issi/is31fl3733.c (100%) rename drivers/{ => led}/issi/is31fl3733.h (100%) rename drivers/{ => led}/issi/is31fl3736.c (100%) rename drivers/{ => led}/issi/is31fl3736.h (100%) rename drivers/{ => led}/issi/is31fl3737.c (100%) rename drivers/{ => led}/issi/is31fl3737.h (100%) rename drivers/{ => led}/issi/is31fl3741.c (100%) rename drivers/{ => led}/issi/is31fl3741.h (100%) diff --git a/common_features.mk b/common_features.mk index d8dce8a6312b..75a9e1f2eba6 100644 --- a/common_features.mk +++ b/common_features.mk @@ -242,7 +242,7 @@ endif ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3731) OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE - COMMON_VPATH += $(DRIVER_PATH)/issi + COMMON_VPATH += $(DRIVER_PATH)/led/issi SRC += is31fl3731-simple.c QUANTUM_LIB_SRC += i2c_master.c endif @@ -272,35 +272,35 @@ endif ifeq ($(strip $(RGB_MATRIX_DRIVER)), AW20216) OPT_DEFS += -DAW20216 -DSTM32_SPI -DHAL_USE_SPI=TRUE - COMMON_VPATH += $(DRIVER_PATH)/awinic + COMMON_VPATH += $(DRIVER_PATH)/led SRC += aw20216.c QUANTUM_LIB_SRC += spi_master.c endif ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3731) OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE - COMMON_VPATH += $(DRIVER_PATH)/issi + COMMON_VPATH += $(DRIVER_PATH)/led/issi SRC += is31fl3731.c QUANTUM_LIB_SRC += i2c_master.c endif ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3733) OPT_DEFS += -DIS31FL3733 -DSTM32_I2C -DHAL_USE_I2C=TRUE - COMMON_VPATH += $(DRIVER_PATH)/issi + COMMON_VPATH += $(DRIVER_PATH)/led/issi SRC += is31fl3733.c QUANTUM_LIB_SRC += i2c_master.c endif ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3737) OPT_DEFS += -DIS31FL3737 -DSTM32_I2C -DHAL_USE_I2C=TRUE - COMMON_VPATH += $(DRIVER_PATH)/issi + COMMON_VPATH += $(DRIVER_PATH)/led/issi SRC += is31fl3737.c QUANTUM_LIB_SRC += i2c_master.c endif ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3741) OPT_DEFS += -DIS31FL3741 -DSTM32_I2C -DHAL_USE_I2C=TRUE - COMMON_VPATH += $(DRIVER_PATH)/issi + COMMON_VPATH += $(DRIVER_PATH)/led/issi SRC += is31fl3741.c QUANTUM_LIB_SRC += i2c_master.c endif @@ -417,7 +417,7 @@ ifeq ($(strip $(WS2812_DRIVER_REQUIRED)), yes) endif ifeq ($(strip $(APA102_DRIVER_REQUIRED)), yes) - COMMON_VPATH += $(DRIVER_PATH)/apa102 + COMMON_VPATH += $(DRIVER_PATH)/led SRC += apa102.c endif diff --git a/docs/feature_led_matrix.md b/docs/feature_led_matrix.md index 018da43dd157..afa11e723246 100644 --- a/docs/feature_led_matrix.md +++ b/docs/feature_led_matrix.md @@ -63,7 +63,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { } ``` -Where `Cx_y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3731.pdf) and the header file `drivers/issi/is31fl3731-simple.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` ). +Where `Cx_y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3731.pdf) and the header file `drivers/led/issi/is31fl3731-simple.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` ). --- diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md index bd47fb6d39f4..18e38955ec01 100644 --- a/docs/feature_rgb_matrix.md +++ b/docs/feature_rgb_matrix.md @@ -64,7 +64,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { } ``` -Where `Cx_y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3731.pdf) and the header file `drivers/issi/is31fl3731.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3`). +Where `Cx_y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3731.pdf) and the header file `drivers/led/issi/is31fl3731.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3`). --- ### IS31FL3733 :id=is31fl3733 @@ -134,7 +134,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { } ``` -Where `X_Y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3733.pdf) and the header file `drivers/issi/is31fl3733.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` for now). +Where `X_Y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3733.pdf) and the header file `drivers/led/issi/is31fl3733.h`. The `driver` is the index of the driver you defined in your `config.h` (`0`, `1`, `2`, or `3` for now). --- ### IS31FL3737 :id=is31fl3737 @@ -198,7 +198,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = { } ``` -Where `X_Y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3737.pdf) and the header file `drivers/issi/is31fl3737.h`. The `driver` is the index of the driver you defined in your `config.h` (Only `0`, `1` for now). +Where `X_Y` is the location of the LED in the matrix defined by [the datasheet](https://www.issi.com/WW/pdf/31FL3737.pdf) and the header file `drivers/led/issi/is31fl3737.h`. The `driver` is the index of the driver you defined in your `config.h` (Only `0`, `1` for now). --- diff --git a/docs/ja/feature_led_matrix.md b/docs/ja/feature_led_matrix.md index 62e22859fb78..f132d716f61a 100644 --- a/docs/ja/feature_led_matrix.md +++ b/docs/ja/feature_led_matrix.md @@ -61,7 +61,7 @@ I2C IS31FL3731 RGB コントローラを使ったアドレス指定可能な LED .... } -ここで、`Cx_y` は[データシート](https://www.issi.com/WW/pdf/31FL3731.pdf)およびヘッダファイル `drivers/issi/is31fl3731-simple.h` で定義されるマトリックス内の LED の位置です。`driver` は `config.h` で定義したドライバのインデックス(`0`、`1`、`2`、`3`のいずれか)です。 +ここで、`Cx_y` は[データシート](https://www.issi.com/WW/pdf/31FL3731.pdf)およびヘッダファイル `drivers/led/issi/is31fl3731-simple.h` で定義されるマトリックス内の LED の位置です。`driver` は `config.h` で定義したドライバのインデックス(`0`、`1`、`2`、`3`のいずれか)です。 ## キーコード diff --git a/drivers/apa102/apa102.c b/drivers/led/apa102.c similarity index 100% rename from drivers/apa102/apa102.c rename to drivers/led/apa102.c diff --git a/drivers/apa102/apa102.h b/drivers/led/apa102.h similarity index 100% rename from drivers/apa102/apa102.h rename to drivers/led/apa102.h diff --git a/drivers/awinic/aw20216.c b/drivers/led/aw20216.c similarity index 100% rename from drivers/awinic/aw20216.c rename to drivers/led/aw20216.c diff --git a/drivers/awinic/aw20216.h b/drivers/led/aw20216.h similarity index 100% rename from drivers/awinic/aw20216.h rename to drivers/led/aw20216.h diff --git a/drivers/issi/is31fl3218.c b/drivers/led/issi/is31fl3218.c similarity index 100% rename from drivers/issi/is31fl3218.c rename to drivers/led/issi/is31fl3218.c diff --git a/drivers/issi/is31fl3218.h b/drivers/led/issi/is31fl3218.h similarity index 100% rename from drivers/issi/is31fl3218.h rename to drivers/led/issi/is31fl3218.h diff --git a/drivers/issi/is31fl3731-simple.c b/drivers/led/issi/is31fl3731-simple.c similarity index 100% rename from drivers/issi/is31fl3731-simple.c rename to drivers/led/issi/is31fl3731-simple.c diff --git a/drivers/issi/is31fl3731-simple.h b/drivers/led/issi/is31fl3731-simple.h similarity index 100% rename from drivers/issi/is31fl3731-simple.h rename to drivers/led/issi/is31fl3731-simple.h diff --git a/drivers/issi/is31fl3731.c b/drivers/led/issi/is31fl3731.c similarity index 100% rename from drivers/issi/is31fl3731.c rename to drivers/led/issi/is31fl3731.c diff --git a/drivers/issi/is31fl3731.h b/drivers/led/issi/is31fl3731.h similarity index 100% rename from drivers/issi/is31fl3731.h rename to drivers/led/issi/is31fl3731.h diff --git a/drivers/issi/is31fl3733.c b/drivers/led/issi/is31fl3733.c similarity index 100% rename from drivers/issi/is31fl3733.c rename to drivers/led/issi/is31fl3733.c diff --git a/drivers/issi/is31fl3733.h b/drivers/led/issi/is31fl3733.h similarity index 100% rename from drivers/issi/is31fl3733.h rename to drivers/led/issi/is31fl3733.h diff --git a/drivers/issi/is31fl3736.c b/drivers/led/issi/is31fl3736.c similarity index 100% rename from drivers/issi/is31fl3736.c rename to drivers/led/issi/is31fl3736.c diff --git a/drivers/issi/is31fl3736.h b/drivers/led/issi/is31fl3736.h similarity index 100% rename from drivers/issi/is31fl3736.h rename to drivers/led/issi/is31fl3736.h diff --git a/drivers/issi/is31fl3737.c b/drivers/led/issi/is31fl3737.c similarity index 100% rename from drivers/issi/is31fl3737.c rename to drivers/led/issi/is31fl3737.c diff --git a/drivers/issi/is31fl3737.h b/drivers/led/issi/is31fl3737.h similarity index 100% rename from drivers/issi/is31fl3737.h rename to drivers/led/issi/is31fl3737.h diff --git a/drivers/issi/is31fl3741.c b/drivers/led/issi/is31fl3741.c similarity index 100% rename from drivers/issi/is31fl3741.c rename to drivers/led/issi/is31fl3741.c diff --git a/drivers/issi/is31fl3741.h b/drivers/led/issi/is31fl3741.h similarity index 100% rename from drivers/issi/is31fl3741.h rename to drivers/led/issi/is31fl3741.h