From 592ef7c6f0441216d2dbfb08af4e20ed35581102 Mon Sep 17 00:00:00 2001 From: Fred Sundvik Date: Sun, 10 Jul 2016 14:29:00 +0300 Subject: [PATCH] Move Infinity Ergodox drivers to subproject, and fix makefile --- keyboards/ergodox/infinity/Makefile | 4 ++-- .../drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h | 0 .../{ => infinity}/drivers/gdisp/IS31FL3731C/driver.mk | 0 .../drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c | 0 .../drivers/gdisp/IS31FL3731C/gdisp_lld_config.h | 0 .../{ => infinity}/drivers/gdisp/emulator_lcd/driver.mk | 0 .../{ => infinity}/drivers/gdisp/emulator_lcd/emulator_lcd.c | 0 .../{ => infinity}/drivers/gdisp/emulator_led/driver.mk | 0 .../{ => infinity}/drivers/gdisp/emulator_led/emulator_led.c | 0 .../{ => infinity}/drivers/gdisp/st7565ergodox/board_ST7565.h | 0 .../{ => infinity}/drivers/gdisp/st7565ergodox/driver.mk | 0 .../drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c | 0 .../drivers/gdisp/st7565ergodox/gdisp_lld_config.h | 0 .../{ => infinity}/drivers/gdisp/st7565ergodox/st7565.h | 0 14 files changed, 2 insertions(+), 2 deletions(-) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/IS31FL3731C/driver.mk (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/emulator_lcd/driver.mk (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/emulator_lcd/emulator_lcd.c (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/emulator_led/driver.mk (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/emulator_led/emulator_led.c (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/st7565ergodox/board_ST7565.h (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/st7565ergodox/driver.mk (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/st7565ergodox/gdisp_lld_config.h (100%) rename keyboards/ergodox/{ => infinity}/drivers/gdisp/st7565ergodox/st7565.h (100%) diff --git a/keyboards/ergodox/infinity/Makefile b/keyboards/ergodox/infinity/Makefile index 22065e4d2db..d1ec266d047 100644 --- a/keyboards/ergodox/infinity/Makefile +++ b/keyboards/ergodox/infinity/Makefile @@ -65,11 +65,11 @@ LED_ENABLE ?= yes LCD_BACKLIGHT_ENABLE ?= yes ifdef LCD_ENABLE -include drivers/gdisp/st7565ergodox/driver.mk +include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk endif ifdef LED_ENABLE -include drivers/gdisp/IS31FL3731C/driver.mk +include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk endif ifndef QUANTUM_DIR diff --git a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h similarity index 100% rename from keyboards/ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h rename to keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h diff --git a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk similarity index 100% rename from keyboards/ergodox/drivers/gdisp/IS31FL3731C/driver.mk rename to keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk diff --git a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c similarity index 100% rename from keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c rename to keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c diff --git a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h similarity index 100% rename from keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h rename to keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h diff --git a/keyboards/ergodox/drivers/gdisp/emulator_lcd/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk similarity index 100% rename from keyboards/ergodox/drivers/gdisp/emulator_lcd/driver.mk rename to keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk diff --git a/keyboards/ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c similarity index 100% rename from keyboards/ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c rename to keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c diff --git a/keyboards/ergodox/drivers/gdisp/emulator_led/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk similarity index 100% rename from keyboards/ergodox/drivers/gdisp/emulator_led/driver.mk rename to keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk diff --git a/keyboards/ergodox/drivers/gdisp/emulator_led/emulator_led.c b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c similarity index 100% rename from keyboards/ergodox/drivers/gdisp/emulator_led/emulator_led.c rename to keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c diff --git a/keyboards/ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h similarity index 100% rename from keyboards/ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h rename to keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h diff --git a/keyboards/ergodox/drivers/gdisp/st7565ergodox/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk similarity index 100% rename from keyboards/ergodox/drivers/gdisp/st7565ergodox/driver.mk rename to keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk diff --git a/keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c similarity index 100% rename from keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c rename to keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c diff --git a/keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h similarity index 100% rename from keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h rename to keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h diff --git a/keyboards/ergodox/drivers/gdisp/st7565ergodox/st7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h similarity index 100% rename from keyboards/ergodox/drivers/gdisp/st7565ergodox/st7565.h rename to keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h