summaryrefslogtreecommitdiffstats
path: root/keyboards/meira
diff options
context:
space:
mode:
authorfauxpark <fauxpark@gmail.com>2019-10-25 07:50:13 +1100
committerDrashna Jaelre <drashna@live.com>2019-10-24 13:50:13 -0700
commite96cac0814995e2a0735708727cbab599d6cf5f1 (patch)
tree2f5da56d6701d171541a3813dd7a93d3e1d5073c /keyboards/meira
parent335dd0271e344fec1a0f086b34da6f8ae0d8bd60 (diff)
Cleanup rules.mk for 32U4 keyboards, L-M (#7120)
* Cleanup rules.mk for 32U4 keyboards, L-M * Move some stuff to keyboard level
Diffstat (limited to 'keyboards/meira')
-rw-r--r--keyboards/meira/featherble/rules.mk4
-rw-r--r--keyboards/meira/promicro/rules.mk13
-rw-r--r--keyboards/meira/rules.mk35
3 files changed, 6 insertions, 46 deletions
diff --git a/keyboards/meira/featherble/rules.mk b/keyboards/meira/featherble/rules.mk
index e27608983f..b0295ced77 100644
--- a/keyboards/meira/featherble/rules.mk
+++ b/keyboards/meira/featherble/rules.mk
@@ -1,3 +1,5 @@
-BLUETOOTH_ENABLE = yes
+# Processor frequency
F_CPU = 8000000
+
+BLUETOOTH_ENABLE = yes
BLUETOOTH = AdafruitBLE
diff --git a/keyboards/meira/promicro/rules.mk b/keyboards/meira/promicro/rules.mk
index 22e49971f1..3c81f1b344 100644
--- a/keyboards/meira/promicro/rules.mk
+++ b/keyboards/meira/promicro/rules.mk
@@ -1,14 +1 @@
-# 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
-
BLUETOOTH_ENABLE = no
diff --git a/keyboards/meira/rules.mk b/keyboards/meira/rules.mk
index 7893e6556f..8357e780bf 100644
--- a/keyboards/meira/rules.mk
+++ b/keyboards/meira/rules.mk
@@ -1,44 +1,14 @@
-SRC += matrix.c TWIlib.c issi.c lighting.c
-
# MCU name
MCU = atmega32u4
-
-#
-# 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)
-
-# Bootloader
-# This definition is optional, and if your keyboard supports multiple bootloaders of
-# different sizes, comment this out, and the correct address will be loaded
-# automatically (+60). See bootloader.mk for all options.
-BOOTLOADER = caterina
-
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
# Bootloader selection
# Teensy halfkay
# Pro Micro caterina
# Atmel DFU atmel-dfu
# LUFA DFU lufa-dfu
# QMK DFU qmk-dfu
-# atmega32a bootloadHID
+# ATmega32A bootloadHID
+# ATmega328P USBasp
BOOTLOADER = caterina
# Build Options
@@ -72,6 +42,7 @@ CUSTOM_MATRIX = yes
#ifeq ($(strip $(WATCHDOG_ENABLE)), yes)
# TMK_COMMON_DEFS += -DWATCHDOG_ENABLE
#endif
+SRC += matrix.c TWIlib.c issi.c lighting.c
DEFAULT_FOLDER = meira/promicro
LAYOUTS = ortho_4x12