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
2017-10-14 11:32:19 -10:00
parent e5dc2253e2
commit 800ec55dfc
217 changed files with 722 additions and 933 deletions
@@ -1,5 +0,0 @@
-SUBPROJECT_DEFAULT = rev2
-
-ifndef MAKEFILE_INCLUDED
-	include ../../Makefile
-endif
@@ -1,16 +1,16 @@
 #ifndef CLUEBOARD_H
 #define CLUEBOARD_H

-#ifdef SUBPROJECT_rev1
+#include "quantum.h"
+
+#ifdef KEYBOARD_clueboard_66_rev1
    #include "rev1.h"
 #endif
-#ifdef SUBPROJECT_rev2
+#ifdef KEYBOARD_clueboard_66_rev2
    #include "rev2.h"
 #endif
-#ifdef SUBPROJECT_rev3
+#ifdef KEYBOARD_clueboard_66_rev3
    #include "rev3.h"
 #endif

-#include "quantum.h"
-
 #endif
@@ -60,15 +60,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION

-
-#ifdef SUBPROJECT_rev1
-    #include "rev1/config.h"
-#endif
-#ifdef SUBPROJECT_rev2
-    #include "rev2/config.h"
-#endif
-#ifdef SUBPROJECT_rev3
-    #include "rev3/config.h"
-#endif
-
 #endif
@@ -13,6 +13,6 @@ A fully customizable 66% keyboard.

 Make example for this keyboard (after setting up your build environment):

-    make clueboard-rev3-default
+    make clueboard/rev3: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.
@@ -1,3 +0,0 @@
-ifndef MAKEFILE_INCLUDED
-	include ../../../Makefile
-endif
@@ -1,7 +1,7 @@
 #ifndef REV2_CONFIG_H
 #define REV2_CONFIG_H

-#include "../config.h"
+#include "config_common.h"

 #define PRODUCT_ID      0x2301
 #define DEVICE_VER      0x0003
@@ -1,3 +0,0 @@
-ifndef MAKEFILE_INCLUDED
-	include ../../../Makefile
-endif
@@ -1,7 +1,7 @@
 #ifndef REV2_CONFIG_H
 #define REV2_CONFIG_H

-#include "../config.h"
+#include "config_common.h"

 #define PRODUCT_ID      0x2320
 #define DEVICE_VER      0x0001
@@ -1,7 +1,7 @@
 #ifndef REV2_H
 #define REV2_H

-#include "../clueboard_66.h"
+#include "clueboard_66.h"

 /* Clueboard matrix layout
 * ,-----------------------------------------------------------.  ,---.
@@ -1,7 +1,7 @@
 #ifndef REV3_CONFIG_H
 #define REV3_CONFIG_H

-#include "../config.h"
+#include "config_common.h"

 #define PRODUCT_ID      0x2370
 #define DEVICE_VER      0x0001
@@ -1,7 +1,7 @@
 #ifndef REV3_H
 #define REV3_H

-#include "../clueboard_66.h"
+#include "clueboard_66.h"

 /* Clueboard matrix layout
 * ,-----------------------------------------------------------.  ,---.
@@ -19,3 +19,5 @@ RGBLIGHT_ENABLE = yes  # Enable keyboard underlight functionality
 MIDI_ENABLE = no 		# MIDI controls
 UNICODE_ENABLE = no 		# Unicode
 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+
+DEFAULT_FOLDER = clueboard_66/rev2
@@ -1 +0,0 @@
-SUBPROJECT_DEFAULT = rev2