From dc8cd570cf08e364b9cc4bce6538d6983677f71e Mon Sep 17 00:00:00 2001 From: mtei <2170248+mtei@users.noreply.github.com> Date: Thu, 26 Sep 2019 16:43:52 +0900 Subject: [PATCH] helix/{i2c.[ch], serial.[ch], ssd1306.[ch]} move into helix/local_drivers/ No change in build result. --- keyboards/helix/{ => local_drivers}/i2c.c | 0 keyboards/helix/{ => local_drivers}/i2c.h | 0 keyboards/helix/{ => local_drivers}/serial.c | 0 keyboards/helix/{ => local_drivers}/serial.h | 0 keyboards/helix/{ => local_drivers}/ssd1306.c | 0 keyboards/helix/{ => local_drivers}/ssd1306.h | 0 keyboards/helix/pico/rules.mk | 7 ++++--- keyboards/helix/rev1/rules.mk | 7 ++++--- keyboards/helix/rev2/rules.mk | 7 ++++--- keyboards/helix/rules.mk | 2 ++ 10 files changed, 14 insertions(+), 9 deletions(-) rename keyboards/helix/{ => local_drivers}/i2c.c (100%) rename keyboards/helix/{ => local_drivers}/i2c.h (100%) rename keyboards/helix/{ => local_drivers}/serial.c (100%) rename keyboards/helix/{ => local_drivers}/serial.h (100%) rename keyboards/helix/{ => local_drivers}/ssd1306.c (100%) rename keyboards/helix/{ => local_drivers}/ssd1306.h (100%) diff --git a/keyboards/helix/i2c.c b/keyboards/helix/local_drivers/i2c.c similarity index 100% rename from keyboards/helix/i2c.c rename to keyboards/helix/local_drivers/i2c.c diff --git a/keyboards/helix/i2c.h b/keyboards/helix/local_drivers/i2c.h similarity index 100% rename from keyboards/helix/i2c.h rename to keyboards/helix/local_drivers/i2c.h diff --git a/keyboards/helix/serial.c b/keyboards/helix/local_drivers/serial.c similarity index 100% rename from keyboards/helix/serial.c rename to keyboards/helix/local_drivers/serial.c diff --git a/keyboards/helix/serial.h b/keyboards/helix/local_drivers/serial.h similarity index 100% rename from keyboards/helix/serial.h rename to keyboards/helix/local_drivers/serial.h diff --git a/keyboards/helix/ssd1306.c b/keyboards/helix/local_drivers/ssd1306.c similarity index 100% rename from keyboards/helix/ssd1306.c rename to keyboards/helix/local_drivers/ssd1306.c diff --git a/keyboards/helix/ssd1306.h b/keyboards/helix/local_drivers/ssd1306.h similarity index 100% rename from keyboards/helix/ssd1306.h rename to keyboards/helix/local_drivers/ssd1306.h diff --git a/keyboards/helix/pico/rules.mk b/keyboards/helix/pico/rules.mk index 9b1fe093aa9..69297d46366 100644 --- a/keyboards/helix/pico/rules.mk +++ b/keyboards/helix/pico/rules.mk @@ -1,6 +1,7 @@ -SRC += i2c.c -SRC += serial.c -SRC += ssd1306.c +SRC += local_drivers/i2c.c +SRC += local_drivers/serial.c +SRC += local_drivers/ssd1306.c +KEYBOARD_PATHS += $(KEYBOARD_TOP_DIR)/local_drivers CUSTOM_MATRIX = yes diff --git a/keyboards/helix/rev1/rules.mk b/keyboards/helix/rev1/rules.mk index 83fa11a25b2..f617d0fa2ef 100644 --- a/keyboards/helix/rev1/rules.mk +++ b/keyboards/helix/rev1/rules.mk @@ -1,6 +1,7 @@ -SRC += i2c.c -SRC += serial.c -SRC += ssd1306.c +SRC += local_drivers/i2c.c +SRC += local_drivers/serial.c +SRC += local_drivers/ssd1306.c +KEYBOARD_PATHS += $(KEYBOARD_TOP_DIR)/local_drivers CUSTOM_MATRIX = yes diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk index d025511005b..f199a7826e5 100644 --- a/keyboards/helix/rev2/rules.mk +++ b/keyboards/helix/rev2/rules.mk @@ -1,6 +1,7 @@ -SRC += i2c.c -SRC += serial.c -SRC += ssd1306.c +SRC += local_drivers/i2c.c +SRC += local_drivers/serial.c +SRC += local_drivers/ssd1306.c +KEYBOARD_PATHS += $(KEYBOARD_TOP_DIR)/local_drivers CUSTOM_MATRIX = yes diff --git a/keyboards/helix/rules.mk b/keyboards/helix/rules.mk index d1b198def5c..5607b3226ae 100644 --- a/keyboards/helix/rules.mk +++ b/keyboards/helix/rules.mk @@ -42,6 +42,8 @@ F_USB = $(F_CPU) # atmega32a bootloadHID BOOTLOADER = caterina +KEYBOARD_TOP_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST)))) + # Interrupt driven control endpoint task(+60) OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT