From: Fred Sundvik Date: Thu, 25 Aug 2016 20:26:02 +0000 (+0300) Subject: Merge branch 'master' into makefile_overhaul X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=523dff3005193f72247addff70c8cb238ac6164b;p=qmk_firmware.git Merge branch 'master' into makefile_overhaul --- 523dff3005193f72247addff70c8cb238ac6164b diff --cc keyboards/gh60/rules.mk index 73f4bd76e,000000000..b3c5c7271 mode 100644,000000..100644 --- a/keyboards/gh60/rules.mk +++ b/keyboards/gh60/rules.mk @@@ -1,68 -1,0 +1,69 @@@ - - - # 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=4096 - - - # Build Options - # comment out to disable the options. - # - BOOTMAGIC_ENABLE ?= yes # 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 - KEYBOARD_LOCK_ENABLE ?= yes # Allow locking of keyboard via magic key - # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE - # SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend - NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work - # BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality - # MIDI_ENABLE ?= YES # MIDI controls - # UNICODE_ENABLE ?= YES # Unicode - # BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID ++# project specific files ++SRC = led.c ++ ++# 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=4096 ++ ++ ++# Build Options ++# comment out to disable the options. ++# ++BOOTMAGIC_ENABLE ?= yes # 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 ++KEYBOARD_LOCK_ENABLE ?= yes # Allow locking of keyboard via magic key ++# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE ++# SLEEP_LED_ENABLE ?= yes # Breathing sleep LED during USB suspend ++NKRO_ENABLE ?= yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work ++# BACKLIGHT_ENABLE ?= yes # Enable keyboard backlight functionality ++# MIDI_ENABLE ?= YES # MIDI controls ++# UNICODE_ENABLE ?= YES # Unicode ++# BLUETOOTH_ENABLE ?= yes # Enable Bluetooth with the Adafruit EZ-Key HID diff --cc keyboards/kc60/Makefile index 4e2a6f00f,0d17d32da..57b2ef62e --- a/keyboards/kc60/Makefile +++ b/keyboards/kc60/Makefile @@@ -1,3 -1,77 +1,3 @@@ -# project specific files -SRC = led.c - -# 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=4096 - - -# 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 -KEYBOARD_LOCK_ENABLE ?= yes # Allow locking of keyboard via magic key -# 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 ?= yes # Enable keyboard backlight functionality -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 +ifndef MAKEFILE_INCLUDED include ../../Makefile - endif + endif - diff --cc keyboards/kc60/readme.md index 0639512dd,b29c6be30..da84f6159 --- a/keyboards/kc60/readme.md +++ b/keyboards/kc60/readme.md @@@ -26,4 -24,11 +26,11 @@@ Keymaps follow the format **__\. ## WS2812 Support ![Image of KC60 with RGB Underglow](keymaps/ws2812/ws2812_example.jpg) -Build with WS2812 Support by running `make KEYMAP=ws2812`. +Build with WS2812 Support by running `make ws2812`. + + ## Warning + For those who want to use 2x1U instead of classic backspace you need to use K0D and K49 like this: + * K0D represents the key at the right of =. + * K49 represents the last key of the row (is wired at the right of the space key on the PCB) + -In kc60.h I've put several definitions' examples of possible layouts proposed by online editor (http://123.57.250.164:9128/). ++In kc60.h I've put several definitions' examples of possible layouts proposed by online editor (http://123.57.250.164:9128/). diff --cc keyboards/kitten_paw/rules.mk index dab7cabc5,000000000..b0c909d11 mode 100644,000000..100644 --- a/keyboards/kitten_paw/rules.mk +++ b/keyboards/kitten_paw/rules.mk @@@ -1,72 -1,0 +1,72 @@@ + + +# MCU name +#MCU = at90usb1287 +MCU = atmega32u2 + +# 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=4096 + + +# 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 + +CUSTOM_MATRIX = yes - SRC += matrix.c led.c ++SRC += matrix.c diff --cc lib/googletest index 000000000,000000000..ec44c6c16 new file mode 160000 --- /dev/null +++ b/lib/googletest @@@ -1,0 -1,0 +1,1 @@@ ++Subproject commit ec44c6c1675c25b9827aacd08c02433cccde7780