From d2ff66a985b938e87fffe55c1d9f1dc55e356f91 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Wed, 23 Aug 2017 22:29:07 -0400 Subject: Creates a layouts/ folder for keymaps shared between keyboards (#1609) * include variables and .h files as pp directives * start layout compilation * split ergodoxes up * don't compile all layouts for everything * might seg fault * reset layouts variable * actually reset layouts * include rules.mk instead * remove includes from rules.mk * update variable setting * load visualizer from path * adds some more examples * adds more layouts * more boards added * more boards added * adds documentation for layouts * use lowercase names for LAYOUT_ * add layout.json files for each layout * add community folder, default keymaps for layouts * touch-up default layouts * touch-up layouts, some keyboard rules.mk * update documentation for layouts * fix up serial/i2c switches --- keyboards/chibios_test/stm32_f072_onekey/rules.mk | 5 +---- keyboards/chibios_test/stm32_f103_onekey/rules.mk | 7 +------ keyboards/chibios_test/teensy_lc_onekey/rules.mk | 6 +----- 3 files changed, 3 insertions(+), 15 deletions(-) (limited to 'keyboards/chibios_test') diff --git a/keyboards/chibios_test/stm32_f072_onekey/rules.mk b/keyboards/chibios_test/stm32_f072_onekey/rules.mk index eae38c4b2..91c17c024 100644 --- a/keyboards/chibios_test/stm32_f072_onekey/rules.mk +++ b/keyboards/chibios_test/stm32_f072_onekey/rules.mk @@ -35,7 +35,4 @@ ARMV = 6 # Build Options # comment out to disable the options. -# -ifndef QUANTUM_DIR - include ../../../Makefile -endif +# \ No newline at end of file diff --git a/keyboards/chibios_test/stm32_f103_onekey/rules.mk b/keyboards/chibios_test/stm32_f103_onekey/rules.mk index 307ca5b19..c75738338 100644 --- a/keyboards/chibios_test/stm32_f103_onekey/rules.mk +++ b/keyboards/chibios_test/stm32_f103_onekey/rules.mk @@ -44,9 +44,4 @@ ARMV = 7 # http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf # This also requires a patch to chibios: # /tmk_core/tool/chibios/ch-bootloader-jump.patch -#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 - - -ifndef QUANTUM_DIR - include ../../../Makefile -endif +#STM32_BOOTLOADER_ADDRESS = 0x1FFFC800 \ No newline at end of file diff --git a/keyboards/chibios_test/teensy_lc_onekey/rules.mk b/keyboards/chibios_test/teensy_lc_onekey/rules.mk index 43ea9d82d..4deee1f57 100644 --- a/keyboards/chibios_test/teensy_lc_onekey/rules.mk +++ b/keyboards/chibios_test/teensy_lc_onekey/rules.mk @@ -42,8 +42,4 @@ MCU = cortex-m0plus # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 # I.e. 6 for Teensy LC; 7 for Teensy 3.x -ARMV = 6 - -ifndef QUANTUM_DIR - include ../../../Makefile -endif \ No newline at end of file +ARMV = 6 \ No newline at end of file -- cgit v1.2.3-24-g4f1b