summaryrefslogtreecommitdiff
path: root/keyboards/nyquist
diff options
context:
space:
mode:
authorJack Humbert2017-08-23 22:29:07 -0400
committerGitHub2017-08-23 22:29:07 -0400
commitd2ff66a985b938e87fffe55c1d9f1dc55e356f91 (patch)
tree561b3e203033849573a17f5ac6248077ab687676 /keyboards/nyquist
parent7260fc3eef98fb7b0e2ed24d3d0d14cf2e613000 (diff)
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
Diffstat (limited to 'keyboards/nyquist')
-rw-r--r--keyboards/nyquist/config.h4
-rw-r--r--keyboards/nyquist/nyquist.h8
-rw-r--r--keyboards/nyquist/rev1/config.h2
-rw-r--r--keyboards/nyquist/rev1/rev1.c2
-rw-r--r--keyboards/nyquist/rev1/rev1.h2
-rw-r--r--keyboards/nyquist/rev1/rules.mk4
-rw-r--r--keyboards/nyquist/rules.mk2
-rw-r--r--keyboards/nyquist/serial.c2
8 files changed, 11 insertions, 15 deletions
diff --git a/keyboards/nyquist/config.h b/keyboards/nyquist/config.h
index 55500df79..5e3dc9188 100644
--- a/keyboards/nyquist/config.h
+++ b/keyboards/nyquist/config.h
@@ -20,8 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "config_common.h"
-#ifdef SUBPROJECT_rev1
- #include "rev1/config.h"
-#endif
+#include QMK_SUBPROJECT_CONFIG_H
#endif // CONFIG_H
diff --git a/keyboards/nyquist/nyquist.h b/keyboards/nyquist/nyquist.h
index e8cccecf5..dcc2a4ffd 100644
--- a/keyboards/nyquist/nyquist.h
+++ b/keyboards/nyquist/nyquist.h
@@ -1,9 +1,9 @@
#ifndef NYQUIST_H
#define NYQUIST_H
-#ifdef SUBPROJECT_rev1
- #include "rev1.h"
-#endif
+#include QMK_SUBPROJECT_H
+
+#include "quantum.h"
// Used to create a keymap using only KC_ prefixed keys
#define KC_KEYMAP( \
@@ -21,6 +21,6 @@
KC_##L40, KC_##L41, KC_##L42, KC_##L43, KC_##L44, KC_##L45, KC_##R40, KC_##R41, KC_##R42, KC_##R43, KC_##R44, KC_##R45 \
)
-#include "quantum.h"
+#define LAYOUT_ortho_5x12 KEYMAP
#endif \ No newline at end of file
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 <http://www.gnu.org/licenses/>.
#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
diff --git a/keyboards/nyquist/rules.mk b/keyboards/nyquist/rules.mk
index 3f40ff2f8..07cdba4bf 100644
--- a/keyboards/nyquist/rules.mk
+++ b/keyboards/nyquist/rules.mk
@@ -73,3 +73,5 @@ USE_I2C = yes
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
CUSTOM_MATRIX = yes
+
+LAYOUTS = ortho_5x12 \ No newline at end of file
diff --git a/keyboards/nyquist/serial.c b/keyboards/nyquist/serial.c
index 6faed09ce..74bcbb6bf 100644
--- a/keyboards/nyquist/serial.c
+++ b/keyboards/nyquist/serial.c
@@ -12,7 +12,7 @@
#include <stdbool.h>
#include "serial.h"
-#ifdef USE_SERIAL
+#ifndef USE_I2C
// Serial pulse period in microseconds. Its probably a bad idea to lower this
// value.