From a3bad949804d85cc3d296c281fbe2568d056c118 Mon Sep 17 00:00:00 2001 From: mogranjm Date: Tue, 17 Oct 2017 13:51:51 +1100 Subject: [PATCH] Update makefiles to rules.mk Renamed both Makefiles to rules.mk, removed references to makefiles --- .../keymaps/DivergeJM/{Makefile => rules.mk} | 4 - keyboards/terminus_mini/config.h | 2 +- .../keymaps/default/{Makefile => rules.mk} | 6 +- keyboards/terminus_mini/rules.mk | 91 ++++++------------- 4 files changed, 28 insertions(+), 75 deletions(-) rename keyboards/nyquist/keymaps/DivergeJM/{Makefile => rules.mk} (97%) rename keyboards/terminus_mini/keymaps/default/{Makefile => rules.mk} (96%) diff --git a/keyboards/nyquist/keymaps/DivergeJM/Makefile b/keyboards/nyquist/keymaps/DivergeJM/rules.mk similarity index 97% rename from keyboards/nyquist/keymaps/DivergeJM/Makefile rename to keyboards/nyquist/keymaps/DivergeJM/rules.mk index 64686150c7..0116f8d2ec 100644 --- a/keyboards/nyquist/keymaps/DivergeJM/Makefile +++ b/keyboards/nyquist/keymaps/DivergeJM/rules.mk @@ -32,7 +32,3 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend TAP_DANCE_ENABLE = yes # Enable Tap Dance - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/terminus_mini/config.h b/keyboards/terminus_mini/config.h index e06f7aac2e..5e32cbaf0a 100644 --- a/keyboards/terminus_mini/config.h +++ b/keyboards/terminus_mini/config.h @@ -77,7 +77,7 @@ along with this program. If not, see . * * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) + * rules.mk for this to work.) * * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) * until the next keyboard reset. diff --git a/keyboards/terminus_mini/keymaps/default/Makefile b/keyboards/terminus_mini/keymaps/default/rules.mk similarity index 96% rename from keyboards/terminus_mini/keymaps/default/Makefile rename to keyboards/terminus_mini/keymaps/default/rules.mk index 1f0df3e744..981d55a3e2 100644 --- a/keyboards/terminus_mini/keymaps/default/Makefile +++ b/keyboards/terminus_mini/keymaps/default/rules.mk @@ -15,7 +15,7 @@ # QMK Build Options -# change to "no" to disable the options, or define them in the Makefile in +# change to "no" to disable the options, or define them in the rules.mk in # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) @@ -32,7 +32,3 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend TAP_DANCE_ENABLE = yes # Enable Tap Dance - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboards/terminus_mini/rules.mk b/keyboards/terminus_mini/rules.mk index a1f9377d87..158a6ba50d 100644 --- a/keyboards/terminus_mini/rules.mk +++ b/keyboards/terminus_mini/rules.mk @@ -1,68 +1,29 @@ -# 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 +# Copyright 2017 James Morgan # -# 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. +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. # -# 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 +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -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 support (+2400 to 4200, depending on config) -UNICODE_ENABLE ?= no # Unicode -BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -AUDIO_ENABLE ?= no # Audio output on port C6 -FAUXCLICKY_ENABLE ?= no # Use buzzer to emulate clicky switches +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +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 = no # Console for debug(+400) +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +MIDI_ENABLE = no # MIDI controls +AUDIO_ENABLE = no # Audio output on port C6 +UNICODE_ENABLE = no # Unicode +BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID +RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time. +SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend +TAP_DANCE_ENABLE = yes # Enable tap dance