non-working commit

Makefile

@@ -12,13 +12,19 @@ ifneq (,$(findstring /keyboard/,$(starting_makefile)))
 		KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard)))
 		KEYMAP_DIR:=$(lastword $(subst /keymaps/, ,$(possible_keyboard)))
 	else
-		KEYBOARD_DIR:=$(possible_keyboard)
+		ifneq (,$(findstring /,$(possible_keyboard)))
+			KEYBOARD_DIR:=$(firstword $(subst /, ,$(possible_keyboard)))
+			SUBPROJECT_DIR:=$(lastword $(subst /, ,$(possible_keyboard)))
+		else
+			KEYBOARD_DIR:=$(possible_keyboard)
+		endif
 		KEYMAP_DIR:=default
 	endif
 endif
 
 # $(info $(KEYBOARD_DIR))
 # $(info $(KEYMAP_DIR))
+# $(info $(SUBPROJECT_DIR))
 
 # Directory common source filess exist
 TOP_DIR = $(tmk_root)

keyboard/planck/Makefile

@@ -38,6 +38,8 @@
 # To rebuild project do "make clean" then "make all".
 #----------------------------------------------------------------------------
 
+SUBPROJECT_DEFAULT = planck/rev4
+
 # MCU name
 #MCU = at90usb1287
 MCU = atmega32u4

keyboard/planck/config.h

@@ -23,7 +23,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0001
 #define MANUFACTURER    Ortholinear Keyboards
 #define PRODUCT         The Planck Keyboard
 #define DESCRIPTION     A compact ortholinear keyboard

keyboard/planck/rev3/Makefile

@@ -0,0 +1,5 @@
+AUDIO_ENABLE = no           # Audio output on port C6
+
+ifndef QUANTUM_DIR
+	include ../../../Makefile
+endif

keyboard/planck/rev3/config.h

@@ -0,0 +1,3 @@
+#include "../config.h"
+
+#define DEVICE_VER 0x0003

keyboard/planck/rev3/rev3.c

@@ -0,0 +1 @@
+#include "rev3.h"

keyboard/planck/rev3/rev3.h

@@ -0,0 +1,6 @@
+#ifndef REV3_H
+#define REV3_H
+
+#include "../planck.h"
+
+#endif

keyboard/planck/rev4/Makefile

@@ -0,0 +1,5 @@
+AUDIO_ENABLE = yes           # Audio output on port C6
+
+ifndef QUANTUM_DIR
+	include ../../../Makefile
+endif

keyboard/planck/rev4/config.h

@@ -0,0 +1,3 @@
+#include "../config.h"
+
+#define DEVICE_VER 0x0004

keyboard/planck/rev4/rev4.c

@@ -0,0 +1 @@
+#include "rev4.h"

keyboard/planck/rev4/rev4.h

@@ -0,0 +1,6 @@
+#ifndef REV4_H
+#define REV4_H
+
+#include "../planck.h"
+
+#endif

tmk_core/rules.mk

@@ -161,9 +161,9 @@ CFLAGS += -fshort-enums
 CFLAGS += -fno-strict-aliasing
 # add color
 ifeq ($(COLOR),true)
-ifeq ("$(shell echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")
+ifeq ("$(echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")
 	CFLAGS+= -fdiagnostics-color
-else ifeq ("$(shell echo "int main(){}" | $(CC) -fcolor-diagnostics -x c - -o /dev/null 2>&1)", "")
+else ifeq ("$(echo "int main(){}" | $(CC) -fcolor-diagnostics -x c - -o /dev/null 2>&1)", "")
 	CFLAGS+= -fcolor-diagnostics
 endif
 endif