summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2016-07-10 13:29:00 +0200
committerFred Sundvik <fsundvik@gmail.com>2016-07-29 20:09:36 +0200
commit592ef7c6f0441216d2dbfb08af4e20ed35581102 (patch)
tree685a5de18a7022c51f87a23d742637ea6d2b4957
parent37052a53f15ea5540b20e2d81a6992f34ebb84fe (diff)
downloadqmk_firmware-592ef7c6f0441216d2dbfb08af4e20ed35581102.tar.gz
qmk_firmware-592ef7c6f0441216d2dbfb08af4e20ed35581102.tar.xz
Move Infinity Ergodox drivers to subproject, and fix makefile
-rw-r--r--keyboards/ergodox/infinity/Makefile4
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h (renamed from keyboards/ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk (renamed from keyboards/ergodox/drivers/gdisp/IS31FL3731C/driver.mk)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c (renamed from keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h (renamed from keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk (renamed from keyboards/ergodox/drivers/gdisp/emulator_lcd/driver.mk)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c (renamed from keyboards/ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk (renamed from keyboards/ergodox/drivers/gdisp/emulator_led/driver.mk)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c (renamed from keyboards/ergodox/drivers/gdisp/emulator_led/emulator_led.c)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h (renamed from keyboards/ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk (renamed from keyboards/ergodox/drivers/gdisp/st7565ergodox/driver.mk)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c (renamed from keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h (renamed from keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h)0
-rw-r--r--keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h (renamed from keyboards/ergodox/drivers/gdisp/st7565ergodox/st7565.h)0
14 files changed, 2 insertions, 2 deletions
diff --git a/keyboards/ergodox/infinity/Makefile b/keyboards/ergodox/infinity/Makefile
index 22065e4d2..d1ec266d0 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
index 2ea73f1fb..2ea73f1fb 100644
--- a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
+++ b/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
index f32d0d868..f32d0d868 100644
--- a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/driver.mk
+++ b/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
index 1d21f0c49..1d21f0c49 100644
--- a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
+++ b/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
index bb28ad775..bb28ad775 100644
--- a/keyboards/ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
+++ b/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
index 16c3f80f5..16c3f80f5 100644
--- a/keyboards/ergodox/drivers/gdisp/emulator_lcd/driver.mk
+++ b/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
index babfe2b36..babfe2b36 100644
--- a/keyboards/ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c
+++ b/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
index 255434432..255434432 100644
--- a/keyboards/ergodox/drivers/gdisp/emulator_led/driver.mk
+++ b/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
index b0ebcdc47..b0ebcdc47 100644
--- a/keyboards/ergodox/drivers/gdisp/emulator_led/emulator_led.c
+++ b/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
index 290571ce5..290571ce5 100644
--- a/keyboards/ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h
+++ b/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
index 889a1a031..889a1a031 100644
--- a/keyboards/ergodox/drivers/gdisp/st7565ergodox/driver.mk
+++ b/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
index c33aea81a..c33aea81a 100644
--- a/keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
+++ b/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
index 48587b9e1..48587b9e1 100644
--- a/keyboards/ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
+++ b/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
index 48636b33d..48636b33d 100644
--- a/keyboards/ergodox/drivers/gdisp/st7565ergodox/st7565.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h