From 630f065376618d94f4616687629aadb3ee91e562 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 9 Jul 2017 13:37:24 +0300 Subject: [PATCH] Remove ergodox from gdisp driver names --- drivers/ugfx/gdisp/IS31FL3731C/driver.mk | 2 -- drivers/ugfx/gdisp/is31fl3731c/driver.mk | 2 ++ .../gdisp_IS31FL3731C.c => is31fl3731c/gdisp_is31fl3731c.c} | 2 +- .../gdisp/{IS31FL3731C => is31fl3731c}/gdisp_lld_config.h | 0 drivers/ugfx/gdisp/st7565/driver.mk | 2 ++ .../ugfx/gdisp/{st7565ergodox => st7565}/gdisp_lld_ST7565.c | 2 +- .../ugfx/gdisp/{st7565ergodox => st7565}/gdisp_lld_config.h | 0 drivers/ugfx/gdisp/{st7565ergodox => st7565}/st7565.h | 0 drivers/ugfx/gdisp/st7565ergodox/driver.mk | 2 -- keyboards/ergodox/infinity/gfxconf.h | 2 +- keyboards/ergodox/infinity/rules.mk | 4 ++-- keyboards/whitefox/gfxconf.h | 2 +- keyboards/whitefox/rules.mk | 2 +- 13 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 drivers/ugfx/gdisp/IS31FL3731C/driver.mk create mode 100644 drivers/ugfx/gdisp/is31fl3731c/driver.mk rename drivers/ugfx/gdisp/{IS31FL3731C/gdisp_IS31FL3731C.c => is31fl3731c/gdisp_is31fl3731c.c} (99%) rename drivers/ugfx/gdisp/{IS31FL3731C => is31fl3731c}/gdisp_lld_config.h (100%) create mode 100644 drivers/ugfx/gdisp/st7565/driver.mk rename drivers/ugfx/gdisp/{st7565ergodox => st7565}/gdisp_lld_ST7565.c (99%) rename drivers/ugfx/gdisp/{st7565ergodox => st7565}/gdisp_lld_config.h (100%) rename drivers/ugfx/gdisp/{st7565ergodox => st7565}/st7565.h (100%) delete mode 100644 drivers/ugfx/gdisp/st7565ergodox/driver.mk diff --git a/drivers/ugfx/gdisp/IS31FL3731C/driver.mk b/drivers/ugfx/gdisp/IS31FL3731C/driver.mk deleted file mode 100644 index 58a16d20..00000000 --- a/drivers/ugfx/gdisp/IS31FL3731C/driver.mk +++ /dev/null @@ -1,2 +0,0 @@ -GFXINC += drivers/ugfx/gdisp/IS31FL3731C -GFXSRC += drivers/ugfx/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c diff --git a/drivers/ugfx/gdisp/is31fl3731c/driver.mk b/drivers/ugfx/gdisp/is31fl3731c/driver.mk new file mode 100644 index 00000000..c9de62d1 --- /dev/null +++ b/drivers/ugfx/gdisp/is31fl3731c/driver.mk @@ -0,0 +1,2 @@ +GFXINC += drivers/ugfx/gdisp/is31fl3731c +GFXSRC += drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c diff --git a/drivers/ugfx/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c b/drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c similarity index 99% rename from drivers/ugfx/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c rename to drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c index 2d78a553..c55dd0a0 100644 --- a/drivers/ugfx/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c +++ b/drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c @@ -19,7 +19,7 @@ along with this program. If not, see . #if GFX_USE_GDISP -#define GDISP_DRIVER_VMT GDISPVMT_IS31FL3731C_ERGODOX +#define GDISP_DRIVER_VMT GDISPVMT_IS31FL3731C_QMK #include "gdisp_lld_config.h" #include "src/gdisp/gdisp_driver.h" diff --git a/drivers/ugfx/gdisp/IS31FL3731C/gdisp_lld_config.h b/drivers/ugfx/gdisp/is31fl3731c/gdisp_lld_config.h similarity index 100% rename from drivers/ugfx/gdisp/IS31FL3731C/gdisp_lld_config.h rename to drivers/ugfx/gdisp/is31fl3731c/gdisp_lld_config.h diff --git a/drivers/ugfx/gdisp/st7565/driver.mk b/drivers/ugfx/gdisp/st7565/driver.mk new file mode 100644 index 00000000..0190b601 --- /dev/null +++ b/drivers/ugfx/gdisp/st7565/driver.mk @@ -0,0 +1,2 @@ +GFXINC += drivers/ugfx/gdisp/st7565 +GFXSRC += drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c diff --git a/drivers/ugfx/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c similarity index 99% rename from drivers/ugfx/gdisp/st7565ergodox/gdisp_lld_ST7565.c rename to drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c index c576280a..69c57477 100644 --- a/drivers/ugfx/gdisp/st7565ergodox/gdisp_lld_ST7565.c +++ b/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c @@ -9,7 +9,7 @@ #if GFX_USE_GDISP -#define GDISP_DRIVER_VMT GDISPVMT_ST7565_ERGODOX +#define GDISP_DRIVER_VMT GDISPVMT_ST7565_QMK #include "gdisp_lld_config.h" #include "src/gdisp/gdisp_driver.h" diff --git a/drivers/ugfx/gdisp/st7565ergodox/gdisp_lld_config.h b/drivers/ugfx/gdisp/st7565/gdisp_lld_config.h similarity index 100% rename from drivers/ugfx/gdisp/st7565ergodox/gdisp_lld_config.h rename to drivers/ugfx/gdisp/st7565/gdisp_lld_config.h diff --git a/drivers/ugfx/gdisp/st7565ergodox/st7565.h b/drivers/ugfx/gdisp/st7565/st7565.h similarity index 100% rename from drivers/ugfx/gdisp/st7565ergodox/st7565.h rename to drivers/ugfx/gdisp/st7565/st7565.h diff --git a/drivers/ugfx/gdisp/st7565ergodox/driver.mk b/drivers/ugfx/gdisp/st7565ergodox/driver.mk deleted file mode 100644 index 401e15e6..00000000 --- a/drivers/ugfx/gdisp/st7565ergodox/driver.mk +++ /dev/null @@ -1,2 +0,0 @@ -GFXINC += drivers/ugfx/gdisp/st7565ergodox -GFXSRC += drivers/ugfx/gdisp/st7565ergodox/gdisp_lld_ST7565.c diff --git a/keyboards/ergodox/infinity/gfxconf.h b/keyboards/ergodox/infinity/gfxconf.h index 45b9f585..a3fb5b0c 100644 --- a/keyboards/ergodox/infinity/gfxconf.h +++ b/keyboards/ergodox/infinity/gfxconf.h @@ -130,7 +130,7 @@ //#define GDISP_TOTAL_DISPLAYS 2 #ifndef EMULATOR -#define GDISP_DRIVER_LIST GDISPVMT_ST7565_ERGODOX, GDISPVMT_IS31FL3731C_ERGODOX +#define GDISP_DRIVER_LIST GDISPVMT_ST7565_QMK, GDISPVMT_IS31FL3731C_QMK #else #define GDISP_DRIVER_LIST GDISPVMT_EMULATOR_LCD_ERGODOX, GDISPVMT_EMULATOR_LED_ERGODOX #endif diff --git a/keyboards/ergodox/infinity/rules.mk b/keyboards/ergodox/infinity/rules.mk index 9e224636..18171560 100644 --- a/keyboards/ergodox/infinity/rules.mk +++ b/keyboards/ergodox/infinity/rules.mk @@ -67,5 +67,5 @@ LCD_BACKLIGHT_ENABLE = yes MIDI_ENABLE = no RGBLIGHT_ENABLE = no -include $(TOP_DIR)/drivers/ugfx/gdisp/st7565ergodox/driver.mk -include $(TOP_DIR)/drivers/ugfx/gdisp/IS31FL3731C/driver.mk \ No newline at end of file +include $(TOP_DIR)/drivers/ugfx/gdisp/st7565/driver.mk +include $(TOP_DIR)/drivers/ugfx/gdisp/is31fl3731c/driver.mk \ No newline at end of file diff --git a/keyboards/whitefox/gfxconf.h b/keyboards/whitefox/gfxconf.h index 890317a0..27dfb94f 100644 --- a/keyboards/whitefox/gfxconf.h +++ b/keyboards/whitefox/gfxconf.h @@ -130,7 +130,7 @@ //#define GDISP_TOTAL_DISPLAYS 2 #ifndef EMULATOR -#define GDISP_DRIVER_LIST GDISPVMT_IS31FL3731C_WHITEFOX +#define GDISP_DRIVER_LIST GDISPVMT_IS31FL3731C_QMK #endif #ifdef GDISP_DRIVER_LIST diff --git a/keyboards/whitefox/rules.mk b/keyboards/whitefox/rules.mk index 4cf23a39..c0effcb7 100644 --- a/keyboards/whitefox/rules.mk +++ b/keyboards/whitefox/rules.mk @@ -70,4 +70,4 @@ CUSTOM_MATRIX = yes # Custom matrix file BACKLIGHT_ENABLE = yes VISUALIZER_ENABLE = yes -include $(TOP_DIR)/drivers/ugfx/gdisp/IS31FL3731C/driver.mk +include $(TOP_DIR)/drivers/ugfx/gdisp/is31fl3731c/driver.mk