From 800ec55dfca06b4630acf62cbb5f130c4031e4f1 Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sat, 14 Oct 2017 11:32:19 -1000 Subject: Make arguments redo, subproject elimination (#1784) * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * redo make args to use colons, better folder structuring system [skip ci] * don't put spaces after statements - hard lessons in makefile development * fix-up some other rules.mk * give travis a chance * reset KEYMAPS variable * start converting keyboards to new system * try making all with travis * start to update readmes and keyboards * look in keyboard directories for board.mk * update visualizer rules * fix up some other keyboards/keymaps * fix arm board ld includes * fix board rules * fix up remaining keyboards * reset layout variable * reset keyboard_layouts * fix remainging keymaps/boards * update readmes, docs * add note to makefile error * update readmes * remove planck keymap warnings * update references and docs * test out tarvis build stages * don't use stages for now * don't use stages for now --- keyboards/nyquist/config.h | 2 -- keyboards/nyquist/keymaps/default/config.h | 2 +- keyboards/nyquist/keymaps/hexwire/config.h | 2 +- keyboards/nyquist/nyquist.h | 4 +++- keyboards/nyquist/readme.md | 4 ++-- keyboards/nyquist/rev1/rev1.c | 2 +- keyboards/nyquist/rev1/rev1.h | 2 +- keyboards/nyquist/rules.mk | 4 +++- keyboards/nyquist/subproject.mk | 1 - 9 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 keyboards/nyquist/subproject.mk (limited to 'keyboards/nyquist') diff --git a/keyboards/nyquist/config.h b/keyboards/nyquist/config.h index 5e3dc9188..863722d7d 100644 --- a/keyboards/nyquist/config.h +++ b/keyboards/nyquist/config.h @@ -20,6 +20,4 @@ along with this program. If not, see . #include "config_common.h" -#include QMK_SUBPROJECT_CONFIG_H - #endif // CONFIG_H diff --git a/keyboards/nyquist/keymaps/default/config.h b/keyboards/nyquist/keymaps/default/config.h index 072d4a7ce..a6246262e 100644 --- a/keyboards/nyquist/keymaps/default/config.h +++ b/keyboards/nyquist/keymaps/default/config.h @@ -18,7 +18,7 @@ along with this program. If not, see . #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "../../config.h" +#include "config_common.h" /* Use I2C or Serial, not both */ diff --git a/keyboards/nyquist/keymaps/hexwire/config.h b/keyboards/nyquist/keymaps/hexwire/config.h index 23abba0aa..4a5b7513a 100644 --- a/keyboards/nyquist/keymaps/hexwire/config.h +++ b/keyboards/nyquist/keymaps/hexwire/config.h @@ -18,7 +18,7 @@ along with this program. If not, see . #ifndef CONFIG_USER_H #define CONFIG_USER_H -#include "../../config.h" +#include "config_common.h" /* Use I2C or Serial, not both */ diff --git a/keyboards/nyquist/nyquist.h b/keyboards/nyquist/nyquist.h index dcc2a4ffd..8d031b050 100644 --- a/keyboards/nyquist/nyquist.h +++ b/keyboards/nyquist/nyquist.h @@ -1,7 +1,9 @@ #ifndef NYQUIST_H #define NYQUIST_H -#include QMK_SUBPROJECT_H +#ifdef KEYBOARD_nyquist_rev1 + #include "rev1.h" +#endif #include "quantum.h" diff --git a/keyboards/nyquist/readme.md b/keyboards/nyquist/readme.md index 16debb987..1b417a658 100644 --- a/keyboards/nyquist/readme.md +++ b/keyboards/nyquist/readme.md @@ -9,11 +9,11 @@ Hardware Availability: [Keebio](https://keeb.io) Make example for this keyboard (after setting up your build environment): - make nyquist-rev1-default + make nyquist/rev1:default Example of flashing this keyboard: - make nyquist-rev1-default-avrdude + make nyquist/rev1:default:avrdude See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information. diff --git a/keyboards/nyquist/rev1/rev1.c b/keyboards/nyquist/rev1/rev1.c index 7b3228fa6..99bd781d5 100644 --- a/keyboards/nyquist/rev1/rev1.c +++ b/keyboards/nyquist/rev1/rev1.c @@ -1,4 +1,4 @@ -#include QMK_SUBPROJECT_H +#include "rev1.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 cf9bf8020..eeaf15272 100644 --- a/keyboards/nyquist/rev1/rev1.h +++ b/keyboards/nyquist/rev1/rev1.h @@ -1,7 +1,7 @@ #ifndef REV1_H #define REV1_H -#include QMK_KEYBOARD_H +#include "nyquist.h" //void promicro_bootloader_jmp(bool program); #include "quantum.h" diff --git a/keyboards/nyquist/rules.mk b/keyboards/nyquist/rules.mk index 07cdba4bf..f2bc59cc5 100644 --- a/keyboards/nyquist/rules.mk +++ b/keyboards/nyquist/rules.mk @@ -74,4 +74,6 @@ SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend CUSTOM_MATRIX = yes -LAYOUTS = ortho_5x12 \ No newline at end of file +LAYOUTS = ortho_5x12 + +DEFAULT_FOLDER = nyquist/rev1 \ No newline at end of file diff --git a/keyboards/nyquist/subproject.mk b/keyboards/nyquist/subproject.mk deleted file mode 100644 index 928b1edd0..000000000 --- a/keyboards/nyquist/subproject.mk +++ /dev/null @@ -1 +0,0 @@ -SUBPROJECT_DEFAULT = rev1 -- cgit v1.2.3