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/nyquist/rev1/config.h | 2 +- keyboards/nyquist/rev1/rev1.c | 2 +- keyboards/nyquist/rev1/rev1.h | 2 +- keyboards/nyquist/rev1/rules.mk | 4 ---- 4 files changed, 3 insertions(+), 7 deletions(-) (limited to 'keyboards/nyquist/rev1') diff --git a/keyboards/nyquist/rev1/config.h b/keyboards/nyquist/rev1/config.h index af4f7dbb1..361576887 100644 --- a/keyboards/nyquist/rev1/config.h +++ b/keyboards/nyquist/rev1/config.h @@ -18,7 +18,7 @@ along with this program. If not, see . #ifndef REV1_CONFIG_H #define REV1_CONFIG_H -#include "../config.h" +#include QMK_KEYBOARD_CONFIG_H /* USB Device descriptor parameter */ #define VENDOR_ID 0xCEEB diff --git a/keyboards/nyquist/rev1/rev1.c b/keyboards/nyquist/rev1/rev1.c index 80780831f..7b3228fa6 100644 --- a/keyboards/nyquist/rev1/rev1.c +++ b/keyboards/nyquist/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "nyquist.h" +#include QMK_SUBPROJECT_H #ifdef AUDIO_ENABLE float tone_startup[][2] = SONG(STARTUP_SOUND); diff --git a/keyboards/nyquist/rev1/rev1.h b/keyboards/nyquist/rev1/rev1.h index f2d0ece79..cf9bf8020 100644 --- a/keyboards/nyquist/rev1/rev1.h +++ b/keyboards/nyquist/rev1/rev1.h @@ -1,7 +1,7 @@ #ifndef REV1_H #define REV1_H -#include "../nyquist.h" +#include QMK_KEYBOARD_H //void promicro_bootloader_jmp(bool program); #include "quantum.h" diff --git a/keyboards/nyquist/rev1/rules.mk b/keyboards/nyquist/rev1/rules.mk index 80a942d06..7b30c0bef 100644 --- a/keyboards/nyquist/rev1/rules.mk +++ b/keyboards/nyquist/rev1/rules.mk @@ -1,5 +1 @@ BACKLIGHT_ENABLE = no - -ifndef QUANTUM_DIR - include ../../../Makefile -endif -- cgit v1.2.3