summaryrefslogtreecommitdiff
path: root/keyboards/minidox
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/minidox
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/minidox')
-rw-r--r--keyboards/minidox/minidox.h2
-rw-r--r--keyboards/minidox/readme.md6
-rw-r--r--keyboards/minidox/rev1/rules.mk6
-rw-r--r--keyboards/minidox/rules.mk2
-rw-r--r--keyboards/minidox/subproject.mk1
5 files changed, 7 insertions, 10 deletions
diff --git a/keyboards/minidox/minidox.h b/keyboards/minidox/minidox.h
index 479c7aec71..6e8add206b 100644
--- a/keyboards/minidox/minidox.h
+++ b/keyboards/minidox/minidox.h
@@ -1,7 +1,7 @@
#ifndef MINIDOX_H
#define MINIDOX_H
-#ifdef SUBPROJECT_rev1
+#ifdef KEYBOARD_minidox_rev1
#include "rev1.h"
#endif
diff --git a/keyboards/minidox/readme.md b/keyboards/minidox/readme.md
index c15fd244a4..b44d66660b 100644
--- a/keyboards/minidox/readme.md
+++ b/keyboards/minidox/readme.md
@@ -10,7 +10,7 @@ Hardware Supported: MiniDox PCB rev1 Pro Micro
Make example for this keyboard (after setting up your build environment):
- make minidox-rev1-default
+ make minidox/rev1:default
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.
@@ -22,8 +22,8 @@ Flashing
-------
Note: Most of this is copied from the Let's Split readme, because it is awesome
-From the `minidox` directory run `make SUBPROJECT-KEYMAP-avrdude` for automatic serial port resolution and flashing.
-Example: `make rev1-default-avrdude`
+From the root directory run `make PROJECT:KEYMAP:avrdude` for automatic serial port resolution and flashing.
+Example: `make minidox/rev1:default:avrdude`
Choosing which board to plug the USB cable into (choosing Master)
--------
diff --git a/keyboards/minidox/rev1/rules.mk b/keyboards/minidox/rev1/rules.mk
index a0825b4ef6..f845616741 100644
--- a/keyboards/minidox/rev1/rules.mk
+++ b/keyboards/minidox/rev1/rules.mk
@@ -1,5 +1 @@
-BACKLIGHT_ENABLE = no
-
-ifndef QUANTUM_DIR
- include ../../../Makefile
-endif \ No newline at end of file
+BACKLIGHT_ENABLE = no \ No newline at end of file
diff --git a/keyboards/minidox/rules.mk b/keyboards/minidox/rules.mk
index 539456ae02..0f9d303105 100644
--- a/keyboards/minidox/rules.mk
+++ b/keyboards/minidox/rules.mk
@@ -72,3 +72,5 @@ USE_I2C ?= no
SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
CUSTOM_MATRIX = yes
+
+DEFAULT_FOLDER = minidox/rev1 \ No newline at end of file
diff --git a/keyboards/minidox/subproject.mk b/keyboards/minidox/subproject.mk
deleted file mode 100644
index 928b1edd02..0000000000
--- a/keyboards/minidox/subproject.mk
+++ /dev/null
@@ -1 +0,0 @@
-SUBPROJECT_DEFAULT = rev1