diff options
| author | Cole Markham <github@themarkhams.us> | 2018-04-19 06:57:24 +0200 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2018-04-19 06:57:24 +0200 |
| commit | b4bdebab9a48546160465d64000724a07617054e (patch) | |
| tree | 418021491d61b5c6039383d7bcdcd7d449d4dbe7 /keyboards/meira/rules.mk | |
| parent | 3d3c093173f6e9a838671bd7484b3a11dc564c1a (diff) | |
| download | qmk_firmware-b4bdebab9a48546160465d64000724a07617054e.tar.gz qmk_firmware-b4bdebab9a48546160465d64000724a07617054e.tar.xz | |
Meira updates for bluetooth and audio (#2731)
* Add audio output
* Update Miera to fix bluetooth issues, bootloader definition.
* Added keymap with audio example
* Cleanup Meira audio code
Diffstat (limited to 'keyboards/meira/rules.mk')
| -rw-r--r-- | keyboards/meira/rules.mk | 39 |
1 files changed, 16 insertions, 23 deletions
diff --git a/keyboards/meira/rules.mk b/keyboards/meira/rules.mk index e898146ab..d3e45fc8d 100644 --- a/keyboards/meira/rules.mk +++ b/keyboards/meira/rules.mk @@ -4,19 +4,6 @@ SRC += matrix.c TWIlib.c issi.c lighting.c #MCU = at90usb1286 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 @@ -37,6 +24,12 @@ ARCH = AVR8 # 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 @@ -54,10 +47,10 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096 # change yes to no to disable # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = yes # Mouse keys(+4700) +MOUSEKEY_ENABLE = no # 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 +CONSOLE_ENABLE = no # Console for debug(+400) +COMMAND_ENABLE = no # 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 @@ -74,13 +67,13 @@ ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be di CUSTOM_MATRIX = yes -ifeq ($(strip $(ISSI_ENABLE)), yes) - TMK_COMMON_DEFS += -DISSI_ENABLE -endif - -ifeq ($(strip $(WATCHDOG_ENABLE)), yes) - TMK_COMMON_DEFS += -DWATCHDOG_ENABLE -endif +#ifeq ($(strip $(ISSI_ENABLE)), yes) +# TMK_COMMON_DEFS += -DISSI_ENABLE +#endif +# +#ifeq ($(strip $(WATCHDOG_ENABLE)), yes) +# TMK_COMMON_DEFS += -DWATCHDOG_ENABLE +#endif DEFAULT_FOLDER = meira/promicro LAYOUTS = ortho_4x12 |