2 files changed, 69 insertions, 74 deletions
diff --git a/quantum/template/Makefile b/quantum/template/Makefile
index 3f6d133c9..4e2a6f00f 100644
--- a/quantum/template/Makefile
+++ b/quantum/template/Makefile
@@ -1,75 +1,3 @@
+ifndef MAKEFILE_INCLUDED
-# MCU name
-#MCU = at90usb1287
-MCU = atmega32u4
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-# Boot Section Size in *bytes*
-#   Teensy halfKay   512
-#   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096
-#   LUFA bootloader  4096
-#   USBaspLoader     2048
-OPT_DEFS += -DBOOTLOADER_SIZE=512
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE ?= no      # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
-EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)
-CONSOLE_ENABLE ?= yes        # Console for debug(+400)
-COMMAND_ENABLE ?= yes        # Commands for debug and configuration
-# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE ?= no       # Breathing sleep LED during USB suspend
-# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE ?= no            # USB Nkey Rollover
-BACKLIGHT_ENABLE ?= no       # Enable keyboard backlight functionality on B7 by default
-MIDI_ENABLE ?= no            # MIDI controls
-UNICODE_ENABLE ?= no         # Unicode
-BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE ?= no           # Audio output on port C6
-ifndef QUANTUM_DIR
        include ../../Makefile
-endif
+endif
+\ No newline at end of file
diff --git a/quantum/template/rules.mk b/quantum/template/rules.mk
new file mode 100644
index 000000000..55898147d
--- /dev/null
+++ b/quantum/template/rules.mk
@@ -0,0 +1,67 @@
+# MCU name
+#MCU = at90usb1287
+MCU = atmega32u4
+# Processor frequency.
+#     This will define a symbol, F_CPU, in all source code files equal to the
+#     processor frequency in Hz. You can then use this symbol in your source code to
+#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
+#     automatically to create a 32-bit value in your source code.
+#
+#     This will be an integer division of F_USB below, as it is sourced by
+#     F_USB after it has run through any CPU prescalers. Note that this value
+#     does not *change* the processor frequency - it should merely be updated to
+#     reflect the processor speed set externally so that the code can use accurate
+#     software delays.
+F_CPU = 16000000
+#
+# LUFA specific
+#
+# Target architecture (see library "Board Types" documentation).
+ARCH = AVR8
+# Input clock frequency.
+#     This will define a symbol, F_USB, in all source code files equal to the
+#     input clock frequency (before any prescaling is performed) in Hz. This value may
+#     differ from F_CPU if prescaling is used on the latter, and is required as the
+#     raw input clock is fed directly to the PLL sections of the AVR for high speed
+#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
+#     at the end, this will be done automatically to create a 32-bit value in your
+#     source code.
+#
+#     If no clock division is performed on the input clock inside the AVR (via the
+#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
+F_USB = $(F_CPU)
+# Interrupt driven control endpoint task(+60)
+OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
+# Boot Section Size in *bytes*
+#   Teensy halfKay   512
+#   Teensy++ halfKay 1024
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+#   USBaspLoader     2048
+OPT_DEFS += -DBOOTLOADER_SIZE=512
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE ?= no      # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE ?= yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE ?= yes       # Audio control and System control(+450)
+CONSOLE_ENABLE ?= yes        # Console for debug(+400)
+COMMAND_ENABLE ?= yes        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE ?= no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE ?= no            # USB Nkey Rollover
+BACKLIGHT_ENABLE ?= no       # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE ?= no            # MIDI controls
+UNICODE_ENABLE ?= no         # Unicode
+BLUETOOTH_ENABLE ?= no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE ?= no           # Audio output on port C6

diff --git a/quantum/template/Makefile b/quantum/template/Makefile index 3f6d133c9..4e2a6f00f 100644 --- a/quantum/template/Makefile +++ b/quantum/template/Makefile
@@ -1,75 +1,3 @@
1		1	ifndef MAKEFILE_INCLUDED
2
3	# MCU name
4	#MCU = at90usb1287
5	MCU = atmega32u4
6
7	# Processor frequency.
8	# This will define a symbol, F_CPU, in all source code files equal to the
9	# processor frequency in Hz. You can then use this symbol in your source code to
10	# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
11	# automatically to create a 32-bit value in your source code.
12	#
13	# This will be an integer division of F_USB below, as it is sourced by
14	# F_USB after it has run through any CPU prescalers. Note that this value
15	# does not change the processor frequency - it should merely be updated to
16	# reflect the processor speed set externally so that the code can use accurate
17	# software delays.
18	F_CPU = 16000000
19
20
21	#
22	# LUFA specific
23	#
24	# Target architecture (see library "Board Types" documentation).
25	ARCH = AVR8
26
27	# Input clock frequency.
28	# This will define a symbol, F_USB, in all source code files equal to the
29	# input clock frequency (before any prescaling is performed) in Hz. This value may
30	# differ from F_CPU if prescaling is used on the latter, and is required as the
31	# raw input clock is fed directly to the PLL sections of the AVR for high speed
32	# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
33	# at the end, this will be done automatically to create a 32-bit value in your
34	# source code.
35	#
36	# If no clock division is performed on the input clock inside the AVR (via the
37	# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
38	F_USB = $(F_CPU)
39
40	# Interrupt driven control endpoint task(+60)
41	OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
42
43
44	# Boot Section Size in bytes
45	# Teensy halfKay 512
46	# Teensy++ halfKay 1024
47	# Atmel DFU loader 4096
48	# LUFA bootloader 4096
49	# USBaspLoader 2048
50	OPT_DEFS += -DBOOTLOADER_SIZE=512
51
52
53	# Build Options
54	# change yes to no to disable
55	#
56	BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
57	MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
58	EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
59	CONSOLE_ENABLE ?= yes # Console for debug(+400)
60	COMMAND_ENABLE ?= yes # Commands for debug and configuration
61	# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
62	SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
63	# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
64	NKRO_ENABLE ?= no # USB Nkey Rollover
65	BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default
66	MIDI_ENABLE ?= no # MIDI controls
67	UNICODE_ENABLE ?= no # Unicode
68	BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
69	AUDIO_ENABLE ?= no # Audio output on port C6
70
71	ifndef QUANTUM_DIR
72	include ../../Makefile	2	include ../../Makefile
73	endif	3	endif \ No newline at end of file
74
75


diff --git a/quantum/template/rules.mk b/quantum/template/rules.mk new file mode 100644 index 000000000..55898147d --- /dev/null +++ b/quantum/template/rules.mk
@@ -0,0 +1,67 @@
		1	# MCU name
		2	#MCU = at90usb1287
		3	MCU = atmega32u4
		4
		5	# Processor frequency.
		6	# This will define a symbol, F_CPU, in all source code files equal to the
		7	# processor frequency in Hz. You can then use this symbol in your source code to
		8	# calculate timings. Do NOT tack on a 'UL' at the end, this will be done
		9	# automatically to create a 32-bit value in your source code.
		10	#
		11	# This will be an integer division of F_USB below, as it is sourced by
		12	# F_USB after it has run through any CPU prescalers. Note that this value
		13	# does not change the processor frequency - it should merely be updated to
		14	# reflect the processor speed set externally so that the code can use accurate
		15	# software delays.
		16	F_CPU = 16000000
		17
		18
		19	#
		20	# LUFA specific
		21	#
		22	# Target architecture (see library "Board Types" documentation).
		23	ARCH = AVR8
		24
		25	# Input clock frequency.
		26	# This will define a symbol, F_USB, in all source code files equal to the
		27	# input clock frequency (before any prescaling is performed) in Hz. This value may
		28	# differ from F_CPU if prescaling is used on the latter, and is required as the
		29	# raw input clock is fed directly to the PLL sections of the AVR for high speed
		30	# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
		31	# at the end, this will be done automatically to create a 32-bit value in your
		32	# source code.
		33	#
		34	# If no clock division is performed on the input clock inside the AVR (via the
		35	# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
		36	F_USB = $(F_CPU)
		37
		38	# Interrupt driven control endpoint task(+60)
		39	OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
		40
		41
		42	# Boot Section Size in bytes
		43	# Teensy halfKay 512
		44	# Teensy++ halfKay 1024
		45	# Atmel DFU loader 4096
		46	# LUFA bootloader 4096
		47	# USBaspLoader 2048
		48	OPT_DEFS += -DBOOTLOADER_SIZE=512
		49
		50
		51	# Build Options
		52	# change yes to no to disable
		53	#
		54	BOOTMAGIC_ENABLE ?= no # Virtual DIP switch configuration(+1000)
		55	MOUSEKEY_ENABLE ?= yes # Mouse keys(+4700)
		56	EXTRAKEY_ENABLE ?= yes # Audio control and System control(+450)
		57	CONSOLE_ENABLE ?= yes # Console for debug(+400)
		58	COMMAND_ENABLE ?= yes # Commands for debug and configuration
		59	# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
		60	SLEEP_LED_ENABLE ?= no # Breathing sleep LED during USB suspend
		61	# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
		62	NKRO_ENABLE ?= no # USB Nkey Rollover
		63	BACKLIGHT_ENABLE ?= no # Enable keyboard backlight functionality on B7 by default
		64	MIDI_ENABLE ?= no # MIDI controls
		65	UNICODE_ENABLE ?= no # Unicode
		66	BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID
		67	AUDIO_ENABLE ?= no # Audio output on port C6