Update makefiles to rules.mk

Renamed both Makefiles to rules.mk, removed references to makefiles
This commit is contained in:
mogranjm 2017-10-17 13:51:51 +11:00
parent 0e110fc6da
commit a3bad94980
4 changed files with 27 additions and 74 deletions

View File

@ -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. 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 SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
TAP_DANCE_ENABLE = yes # Enable Tap Dance TAP_DANCE_ENABLE = yes # Enable Tap Dance
ifndef QUANTUM_DIR
include ../../../../Makefile
endif

View File

@ -77,7 +77,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved * 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 * 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) * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
* until the next keyboard reset. * until the next keyboard reset.

View File

@ -15,7 +15,7 @@
# QMK Build Options # 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 # the appropriate keymap folder that will get included automatically
# #
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) 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. 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 SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
TAP_DANCE_ENABLE = yes # Enable Tap Dance TAP_DANCE_ENABLE = yes # Enable Tap Dance
ifndef QUANTUM_DIR
include ../../../../Makefile
endif

View File

@ -1,68 +1,29 @@
# MCU name # Copyright 2017 James Morgan <ja.morgan1@outlook.com>
#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 # This program is free software: you can redistribute it and/or modify
# F_USB after it has run through any CPU prescalers. Note that this value # it under the terms of the GNU General Public License as published by
# does not *change* the processor frequency - it should merely be updated to # the Free Software Foundation, either version 2 of the License, or
# reflect the processor speed set externally so that the code can use accurate # (at your option) any later version.
# software delays.
F_CPU = 16000000
# #
# LUFA specific # 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.
# #
# Target architecture (see library "Board Types" documentation). # You should have received a copy of the GNU General Public License
ARCH = AVR8 # along with this program. If not, see <http://www.gnu.org/licenses/>.
# Input clock frequency. BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
# This will define a symbol, F_USB, in all source code files equal to the MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
# input clock frequency (before any prescaling is performed) in Hz. This value may EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
# differ from F_CPU if prescaling is used on the latter, and is required as the CONSOLE_ENABLE = no # Console for debug(+400)
# raw input clock is fed directly to the PLL sections of the AVR for high speed COMMAND_ENABLE = yes # Commands for debug and configuration
# clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL' NKRO_ENABLE = yes # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
# at the end, this will be done automatically to create a 32-bit value in your BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
# source code. MIDI_ENABLE = no # MIDI controls
# AUDIO_ENABLE = no # Audio output on port C6
# If no clock division is performed on the input clock inside the AVR (via the UNICODE_ENABLE = no # Unicode
# CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU. BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
F_USB = $(F_CPU) 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
# Interrupt driven control endpoint task(+60) TAP_DANCE_ENABLE = yes # Enable tap dance
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 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