Remove ergodox from gdisp driver names

drivers/ugfx/gdisp/IS31FL3731C/driver.mk

@@ -1,2 +0,0 @@
-GFXINC += drivers/ugfx/gdisp/IS31FL3731C
-GFXSRC += drivers/ugfx/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c

drivers/ugfx/gdisp/is31fl3731c/driver.mk

@@ -0,0 +1,2 @@
+GFXINC += drivers/ugfx/gdisp/is31fl3731c
+GFXSRC += drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c

drivers/ugfx/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c → drivers/ugfx/gdisp/is31fl3731c/gdisp_is31fl3731c.c

@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #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"
 

drivers/ugfx/gdisp/st7565/driver.mk

@@ -0,0 +1,2 @@
+GFXINC += drivers/ugfx/gdisp/st7565
+GFXSRC += drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c

drivers/ugfx/gdisp/st7565ergodox/gdisp_lld_ST7565.c → 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"
 

drivers/ugfx/gdisp/st7565ergodox/driver.mk

@@ -1,2 +0,0 @@
-GFXINC += drivers/ugfx/gdisp/st7565ergodox
-GFXSRC += drivers/ugfx/gdisp/st7565ergodox/gdisp_lld_ST7565.c

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

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
+include $(TOP_DIR)/drivers/ugfx/gdisp/st7565/driver.mk
+include $(TOP_DIR)/drivers/ugfx/gdisp/is31fl3731c/driver.mk

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

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