summaryrefslogtreecommitdiff
path: root/keyboards/nyquist
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-10-14 11:32:19 -1000
committerGitHub <noreply@github.com>2017-10-14 11:32:19 -1000
commit800ec55dfca06b4630acf62cbb5f130c4031e4f1 (patch)
tree718e43d976bc71627558b5f9e1b657e8a64e4131 /keyboards/nyquist
parente5dc2253e26a105a11e0fad3e4e39c306e49cc92 (diff)
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
Diffstat (limited to 'keyboards/nyquist')
-rw-r--r--keyboards/nyquist/config.h2
-rw-r--r--keyboards/nyquist/keymaps/default/config.h2
-rw-r--r--keyboards/nyquist/keymaps/hexwire/config.h2
-rw-r--r--keyboards/nyquist/nyquist.h4
-rw-r--r--keyboards/nyquist/readme.md4
-rw-r--r--keyboards/nyquist/rev1/rev1.c2
-rw-r--r--keyboards/nyquist/rev1/rev1.h2
-rw-r--r--keyboards/nyquist/rules.mk4
-rw-r--r--keyboards/nyquist/subproject.mk1
9 files changed, 12 insertions, 11 deletions
diff --git a/keyboards/nyquist/config.h b/keyboards/nyquist/config.h
index 5e3dc91888..863722d7d0 100644
--- a/keyboards/nyquist/config.h
+++ b/keyboards/nyquist/config.h
@@ -20,6 +20,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#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 072d4a7ce2..a6246262e5 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 <http://www.gnu.org/licenses/>.
#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 23abba0aa4..4a5b7513ae 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 <http://www.gnu.org/licenses/>.
#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 dcc2a4ffd4..8d031b0505 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 16debb9870..1b417a6588 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 7b3228fa65..99bd781d57 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 cf9bf80203..eeaf152728 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 07cdba4bf6..f2bc59cc5d 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 928b1edd02..0000000000
--- a/keyboards/nyquist/subproject.mk
+++ /dev/null
@@ -1 +0,0 @@
-SUBPROJECT_DEFAULT = rev1