diff options
56 files changed, 203 insertions, 1537 deletions
| diff --git a/keyboards/rabbit/rabbit68/rules.mk b/keyboards/rabbit/rabbit68/rules.mk index cd08d2319a..1bf19e4e19 100644 --- a/keyboards/rabbit/rabbit68/rules.mk +++ b/keyboards/rabbit/rabbit68/rules.mk @@ -1,14 +1,14 @@  # MCU name  MCU = atmega32u4 -  # 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 = halfkay  # Build Options diff --git a/keyboards/redox/keymaps/default/rules.mk b/keyboards/redox/keymaps/default/rules.mk deleted file mode 100644 index a81250cdf6..0000000000 --- a/keyboards/redox/keymaps/default/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -RGBLIGHT_ENABLE = yes - diff --git a/keyboards/redox/rev1/rules.mk b/keyboards/redox/rev1/rules.mk index f845616741..e69de29bb2 100644 --- a/keyboards/redox/rev1/rules.mk +++ b/keyboards/redox/rev1/rules.mk @@ -1 +0,0 @@ -BACKLIGHT_ENABLE = no
\ No newline at end of file diff --git a/keyboards/redox/rules.mk b/keyboards/redox/rules.mk index 81c0694e09..165008f1f0 100644 --- a/keyboards/redox/rules.mk +++ b/keyboards/redox/rules.mk @@ -1,51 +1,15 @@  # MCU name  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 - +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp +BOOTLOADER = caterina  # Build Options  #   change yes to no to disable diff --git a/keyboards/redox_w/rules.mk b/keyboards/redox_w/rules.mk index eb4bad194c..22e8cb6b31 100644 --- a/keyboards/redox_w/rules.mk +++ b/keyboards/redox_w/rules.mk @@ -1,57 +1,16 @@ - -OPT_DEFS += -DREDOX_W_PROMICRO -INTERPHASE_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ -                         avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB) - -# # project specific files -SRC = matrix.c - -  # MCU name  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) - -# 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 selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = caterina -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT -  # Build Options  #   comment out to disable the options.  # @@ -71,5 +30,12 @@ UNICODE_ENABLE = YES 		# Unicode  USB = /dev/ttyACM0 +OPT_DEFS += -DREDOX_W_PROMICRO +INTERPHASE_UPLOAD_COMMAND = while [ ! -r $(USB) ]; do sleep 1; done; \ +                         avrdude -p $(MCU) -c avr109 -U flash:w:$(TARGET).hex -P $(USB) + +# # project specific files +SRC = matrix.c +  # upload: build  # 	$(REDOX_W_UPLOAD_COMMAND) diff --git a/keyboards/redscarf_iiplus/verb/rules.mk b/keyboards/redscarf_iiplus/verb/rules.mk index 6ee7fe4383..169e69d39f 100755 --- a/keyboards/redscarf_iiplus/verb/rules.mk +++ b/keyboards/redscarf_iiplus/verb/rules.mk @@ -1,63 +1,16 @@  # MCU name  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 - -  # 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 = qmk-dfu - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # diff --git a/keyboards/redscarf_iiplus/verc/rules.mk b/keyboards/redscarf_iiplus/verc/rules.mk index 5a7706b487..e62b78dc65 100755 --- a/keyboards/redscarf_iiplus/verc/rules.mk +++ b/keyboards/redscarf_iiplus/verc/rules.mk @@ -1,63 +1,16 @@  # MCU name  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 - -  # 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 = qmk-dfu - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # @@ -82,4 +35,4 @@ HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)  CUSTOM_MATRIX = yes  SRC += matrix.c -LAYOUTS = 65_ansi
\ No newline at end of file +LAYOUTS = 65_ansi diff --git a/keyboards/reviung34/rules.mk b/keyboards/reviung34/rules.mk index 7c3d5f3917..67f2386e03 100755 --- a/keyboards/reviung34/rules.mk +++ b/keyboards/reviung34/rules.mk @@ -1,27 +1,16 @@  # MCU name  MCU = atmega32u4 -  # 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 - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # @@ -42,4 +31,3 @@ 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  HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400) - diff --git a/keyboards/reviung39/keymaps/default/rules.mk b/keyboards/reviung39/keymaps/default/rules.mk index 7ad666d1a3..1e3cebb145 100644 --- a/keyboards/reviung39/keymaps/default/rules.mk +++ b/keyboards/reviung39/keymaps/default/rules.mk @@ -1 +1 @@ -RGBLIGHT_ENABLE = yes
\ No newline at end of file +RGBLIGHT_ENABLE = yes diff --git a/keyboards/reviung39/keymaps/default_s/rules.mk b/keyboards/reviung39/keymaps/default_s/rules.mk index 7ad666d1a3..1e3cebb145 100644 --- a/keyboards/reviung39/keymaps/default_s/rules.mk +++ b/keyboards/reviung39/keymaps/default_s/rules.mk @@ -1 +1 @@ -RGBLIGHT_ENABLE = yes
\ No newline at end of file +RGBLIGHT_ENABLE = yes diff --git a/keyboards/reviung39/rules.mk b/keyboards/reviung39/rules.mk index 965556736c..67f2386e03 100644 --- a/keyboards/reviung39/rules.mk +++ b/keyboards/reviung39/rules.mk @@ -1,27 +1,16 @@  # MCU name  MCU = atmega32u4 -  # 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 - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # diff --git a/keyboards/rgbkb/sol/keymaps/default/rules.mk b/keyboards/rgbkb/sol/keymaps/default/rules.mk index 203d59c6a7..269cf20273 100644 --- a/keyboards/rgbkb/sol/keymaps/default/rules.mk +++ b/keyboards/rgbkb/sol/keymaps/default/rules.mk @@ -7,10 +7,5 @@  # To keep things clean and tidy, as well as make upgrades easier, only place overrides from the defaults in this file. - - -  # Do not edit past here -  include keyboards/$(KEYBOARD)/post_rules.mk - diff --git a/keyboards/rgbkb/sol/rules.mk b/keyboards/rgbkb/sol/rules.mk index 3be8f0b229..e3d3953df6 100644 --- a/keyboards/rgbkb/sol/rules.mk +++ b/keyboards/rgbkb/sol/rules.mk @@ -1,21 +1,16 @@  # MCU name  MCU = atmega32u4 -# Processor frequency. -F_CPU = 16000000 - -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -F_USB = $(F_CPU) - -# Bootloader +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = qmk-dfu -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT -  # Custom local font file  OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\" diff --git a/keyboards/rgbkb/zen/rules.mk b/keyboards/rgbkb/zen/rules.mk index 7473b61cfc..4193d23e01 100644 --- a/keyboards/rgbkb/zen/rules.mk +++ b/keyboards/rgbkb/zen/rules.mk @@ -1,11 +1,15 @@ -# Pro Micro or Elite-C -# Automagically converted to Proton-C +# MCU name  MCU = atmega32u4 -F_CPU = 16000000 -ARCH = AVR8 -F_USB = $(F_CPU) -BOOTLOADER = dfu -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 +#   ATmega328P   USBasp +BOOTLOADER = caterina  ifeq ($(strip $(CTPC)), yes)    CONVERT_TO_PROTON_C=yes diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk index 9bafc7b1d6..955221fdf2 100644 --- a/keyboards/rgbkb/zygomorph/rules.mk +++ b/keyboards/rgbkb/zygomorph/rules.mk @@ -1,47 +1,16 @@  # MCU name  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) - -# 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 selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = qmk-dfu -# Interrupt driven control endpoint task(+60) -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT -  # Build Options  #   change yes to no to disable  # diff --git a/keyboards/runner3680/3x6/keymaps/default/rules.mk b/keyboards/runner3680/3x6/keymaps/default/rules.mk deleted file mode 100644 index 9104ce244c..0000000000 --- a/keyboards/runner3680/3x6/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. diff --git a/keyboards/runner3680/3x7/keymaps/default/rules.mk b/keyboards/runner3680/3x7/keymaps/default/rules.mk deleted file mode 100644 index 9104ce244c..0000000000 --- a/keyboards/runner3680/3x7/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. diff --git a/keyboards/runner3680/3x8/keymaps/default/rules.mk b/keyboards/runner3680/3x8/keymaps/default/rules.mk deleted file mode 100644 index 9104ce244c..0000000000 --- a/keyboards/runner3680/3x8/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. diff --git a/keyboards/runner3680/4x6/keymaps/default/rules.mk b/keyboards/runner3680/4x6/keymaps/default/rules.mk deleted file mode 100644 index 9104ce244c..0000000000 --- a/keyboards/runner3680/4x6/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. diff --git a/keyboards/runner3680/4x7/keymaps/default/rules.mk b/keyboards/runner3680/4x7/keymaps/default/rules.mk deleted file mode 100644 index 9104ce244c..0000000000 --- a/keyboards/runner3680/4x7/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. diff --git a/keyboards/runner3680/4x8/keymaps/default/rules.mk b/keyboards/runner3680/4x8/keymaps/default/rules.mk deleted file mode 100644 index 9104ce244c..0000000000 --- a/keyboards/runner3680/4x8/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. diff --git a/keyboards/runner3680/5x6/keymaps/default/rules.mk b/keyboards/runner3680/5x6/keymaps/default/rules.mk deleted file mode 100644 index 9104ce244c..0000000000 --- a/keyboards/runner3680/5x6/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. diff --git a/keyboards/runner3680/5x7/keymaps/default/rules.mk b/keyboards/runner3680/5x7/keymaps/default/rules.mk deleted file mode 100644 index 9104ce244c..0000000000 --- a/keyboards/runner3680/5x7/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. diff --git a/keyboards/runner3680/5x8/keymaps/JIS/rules.mk b/keyboards/runner3680/5x8/keymaps/JIS/rules.mk deleted file mode 100644 index 9104ce244c..0000000000 --- a/keyboards/runner3680/5x8/keymaps/JIS/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. diff --git a/keyboards/runner3680/5x8/keymaps/default/rules.mk b/keyboards/runner3680/5x8/keymaps/default/rules.mk deleted file mode 100644 index 9104ce244c..0000000000 --- a/keyboards/runner3680/5x8/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. diff --git a/keyboards/runner3680/rules.mk b/keyboards/runner3680/rules.mk index 624dd2e507..3a0b190aef 100644 --- a/keyboards/runner3680/rules.mk +++ b/keyboards/runner3680/rules.mk @@ -1,39 +1,16 @@  # MCU name  MCU = atmega32u4 -# Processor frequency. -F_CPU = 16000000 - -# Target architecture (see library "Board Types" documentation). -ARCH = AVR8 - -# Input clock frequency. -F_USB = $(F_CPU) - -# 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 - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # diff --git a/keyboards/s7_elephant/rules.mk b/keyboards/s7_elephant/rules.mk index 7f0ad6d3c5..6cbcb56aea 100644 --- a/keyboards/s7_elephant/rules.mk +++ b/keyboards/s7_elephant/rules.mk @@ -1,41 +1,14 @@  # MCU name  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 - +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = atmel-dfu  # Build Options diff --git a/keyboards/scarletbandana/rules.mk b/keyboards/scarletbandana/rules.mk index de3ac95180..a3461f3142 100644 --- a/keyboards/scarletbandana/rules.mk +++ b/keyboards/scarletbandana/rules.mk @@ -1,52 +1,16 @@  # MCU name  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 +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = atmel-dfu -  # Build Options  #   change yes to no to disable  # diff --git a/keyboards/sck/osa/rules.mk b/keyboards/sck/osa/rules.mk index 3538c25bab..2d4a95c9e9 100644 --- a/keyboards/sck/osa/rules.mk +++ b/keyboards/sck/osa/rules.mk @@ -1,8 +1,6 @@  # MCU name  MCU = atmega32u4 - -  # Bootloader selection  #   Teensy       halfkay  #   Pro Micro    caterina @@ -13,8 +11,6 @@ MCU = atmega32u4  #   ATmega328P   USBasp  BOOTLOADER = atmel-dfu - -  # Build Options  #   change yes to no to disable  # diff --git a/keyboards/scythe/rules.mk b/keyboards/scythe/rules.mk index f0beca71ec..54f2f7a529 100644 --- a/keyboards/scythe/rules.mk +++ b/keyboards/scythe/rules.mk @@ -1,63 +1,16 @@  # MCU name  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 - -  # 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 = atmel-dfu - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # diff --git a/keyboards/sentraq/number_pad/rules.mk b/keyboards/sentraq/number_pad/rules.mk index 8678b7f886..8df6c4c7c5 100644 --- a/keyboards/sentraq/number_pad/rules.mk +++ b/keyboards/sentraq/number_pad/rules.mk @@ -1,63 +1,16 @@  # MCU name  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 - -  # 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 = atmel-dfu - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # diff --git a/keyboards/sentraq/s60_x/default/rules.mk b/keyboards/sentraq/s60_x/default/rules.mk index b3fb861799..8b3674cd81 100644 --- a/keyboards/sentraq/s60_x/default/rules.mk +++ b/keyboards/sentraq/s60_x/default/rules.mk @@ -1,52 +1,16 @@  # MCU name  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 +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = atmel-dfu -  # Build Options  #   change yes to no to disable  # @@ -61,5 +25,4 @@ UNICODE_ENABLE = no         # Unicode  BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID  AUDIO_ENABLE = no           # Audio output on port C6 -  LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_iso 60_hhkb diff --git a/keyboards/sentraq/s60_x/rgb/rules.mk b/keyboards/sentraq/s60_x/rgb/rules.mk index 39bbc5d280..efd66a1ba1 100644 --- a/keyboards/sentraq/s60_x/rgb/rules.mk +++ b/keyboards/sentraq/s60_x/rgb/rules.mk @@ -1,52 +1,16 @@  # MCU name  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 +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = atmel-dfu -  # Build Options  #   change yes to no to disable  # @@ -66,5 +30,4 @@ NKRO_ENABLE = yes          # USB Nkey Rollover - if this doesn't work, see here:  BACKLIGHT_ENABLE = yes     # Enable keyboard backlight functionality  RGBLIGHT_ENABLE = yes      # Enable RGB light -  LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_iso 60_hhkb diff --git a/keyboards/sentraq/s65_plus/rules.mk b/keyboards/sentraq/s65_plus/rules.mk index 08dd2d93c8..f4da10aa16 100644 --- a/keyboards/sentraq/s65_plus/rules.mk +++ b/keyboards/sentraq/s65_plus/rules.mk @@ -1,53 +1,15 @@ - -  # MCU name  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 - +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp +BOOTLOADER = atmel-dfu  # Build Options  #   change yes to no to disable diff --git a/keyboards/sentraq/s65_x/rules.mk b/keyboards/sentraq/s65_x/rules.mk index 6ab268deec..a6a2319c23 100644 --- a/keyboards/sentraq/s65_x/rules.mk +++ b/keyboards/sentraq/s65_x/rules.mk @@ -1,51 +1,15 @@  # MCU name  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 - +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp +BOOTLOADER = atmel-dfu  # Build Options  #   change yes to no to disable diff --git a/keyboards/shiro/rules.mk b/keyboards/shiro/rules.mk index 3ea1516fc0..03c1bc8f86 100644 --- a/keyboards/shiro/rules.mk +++ b/keyboards/shiro/rules.mk @@ -1,63 +1,16 @@  # MCU name  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 - -  # 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 - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # diff --git a/keyboards/signum/3_0/elitec/rules.mk b/keyboards/signum/3_0/elitec/rules.mk index 6a68eb443b..6393e0f93f 100644 --- a/keyboards/signum/3_0/elitec/rules.mk +++ b/keyboards/signum/3_0/elitec/rules.mk @@ -1,48 +1,14 @@  # MCU name  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* -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - -# 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 selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = atmel-dfu  # Build Options diff --git a/keyboards/singa/keymaps/default/rules.mk b/keyboards/singa/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/singa/keymaps/default/rules.mk +++ /dev/null diff --git a/keyboards/singa/keymaps/test/rules.mk b/keyboards/singa/keymaps/test/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/singa/keymaps/test/rules.mk +++ /dev/null diff --git a/keyboards/sirius/unigo66/rules.mk b/keyboards/sirius/unigo66/rules.mk index c35487b18c..53cf934c40 100644 --- a/keyboards/sirius/unigo66/rules.mk +++ b/keyboards/sirius/unigo66/rules.mk @@ -1,17 +1,16 @@  # MCU name  MCU = atmega32u4 -F_CPU = 16000000 - -ARCH = AVR8 - -F_USB = $(F_CPU) - +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = atmel-dfu -# Interrupt driven control endpoint task -OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT -  # Build Options  #   comment out to disable the options.  # diff --git a/keyboards/sixkeyboard/rules.mk b/keyboards/sixkeyboard/rules.mk index 2befe17d8f..5b89ff4e62 100644 --- a/keyboards/sixkeyboard/rules.mk +++ b/keyboards/sixkeyboard/rules.mk @@ -1,5 +1,3 @@ -SRC = matrix.c -  # MCU name  MCU = atmega16u2 @@ -29,3 +27,5 @@ AUDIO_ENABLE = no  UNICODE_ENABLE = no		# Unicode  BLUETOOTH_ENABLE = no	# Enable Bluetooth with the Adafruit EZ-Key HID  CUSTOM_MATRIX = yes + +SRC = matrix.c diff --git a/keyboards/smk60/rules.mk b/keyboards/smk60/rules.mk index 751dbec841..cbb1c8b74b 100644 --- a/keyboards/smk60/rules.mk +++ b/keyboards/smk60/rules.mk @@ -1,58 +1,15 @@  # MCU name  MCU = atmega32u4 -# project specific files -#SRC = - -# 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 +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = atmel-dfu -#OPT_DEFS += -DBOOTLOADER_SIZE=4096 - -# Do not put the microcontroller into power saving mode -# when we get USB suspend event. We want it to keep updating -# backlight effects. -#OPT_DEFS += -DNO_SUSPEND_POWER_DOWN  # Build Options  #   change yes to no to disable diff --git a/keyboards/snagpad/rules.mk b/keyboards/snagpad/rules.mk index 624ed262ec..9256eaed12 100644 --- a/keyboards/snagpad/rules.mk +++ b/keyboards/snagpad/rules.mk @@ -1,54 +1,16 @@  # MCU name  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 -  # 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 -# Boot Section Size in *bytes* -# OPT_DEFS += -DBOOTLOADER_SIZE=4096 - -  # Build Options  #   comment out to disable the options.  # diff --git a/keyboards/snampad/rules.mk b/keyboards/snampad/rules.mk index ec3208fd0e..1a1fbe6bc5 100644 --- a/keyboards/snampad/rules.mk +++ b/keyboards/snampad/rules.mk @@ -1,63 +1,16 @@  # MCU name  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 - -  # 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 - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # diff --git a/keyboards/southpole/rules.mk b/keyboards/southpole/rules.mk index 356b75bb6c..d6b65e9609 100644 --- a/keyboards/southpole/rules.mk +++ b/keyboards/southpole/rules.mk @@ -1,45 +1,15 @@  # MCU name  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* -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp +BOOTLOADER = halfkay  # Build Options  #   comment out to disable the options. @@ -53,4 +23,4 @@ SLEEP_LED_ENABLE = no  # 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 = no  # Enable keyboard backlight functionality  #AUDIO_ENABLE = no -RGBLIGHT_ENABLE = no
\ No newline at end of file +RGBLIGHT_ENABLE = no diff --git a/keyboards/spacetime/rules.mk b/keyboards/spacetime/rules.mk index 62e8f9955e..aa1a889259 100644 --- a/keyboards/spacetime/rules.mk +++ b/keyboards/spacetime/rules.mk @@ -1,63 +1,16 @@  # MCU name  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 - -  # 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 - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # diff --git a/keyboards/speedo/rules.mk b/keyboards/speedo/rules.mk index 6cba6b6b86..4295e2ad7e 100644 --- a/keyboards/speedo/rules.mk +++ b/keyboards/speedo/rules.mk @@ -1,51 +1,15 @@  # MCU name  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 - +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp +BOOTLOADER = halfkay  # Build Options  #   change yes to no to disable diff --git a/keyboards/standaside/rules.mk b/keyboards/standaside/rules.mk index a7ebc21fa4..993f0acdc0 100644 --- a/keyboards/standaside/rules.mk +++ b/keyboards/standaside/rules.mk @@ -1,53 +1,14 @@  # MCU name  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 - -# 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 selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp  BOOTLOADER = atmel_dfu  # Build Options @@ -70,4 +31,3 @@ AUDIO_ENABLE = no           # Audio output on port C6  FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches  HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)  RGBLIGHT_ENABLE = yes       # Enable RGB underlighting support - diff --git a/keyboards/stella/rules.mk b/keyboards/stella/rules.mk index 2618abf4f2..b6b8f88417 100644 --- a/keyboards/stella/rules.mk +++ b/keyboards/stella/rules.mk @@ -1,17 +1,16 @@  # MCU name  MCU = atmega32u4 -  # 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 = atmel-dfu -  # Build Options  #   change yes to no to disable  # @@ -34,4 +33,4 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches  HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)  # Supported layouts -LAYOUTS = tkl_ansi tkl_iso
\ No newline at end of file +LAYOUTS = tkl_ansi tkl_iso diff --git a/keyboards/suihankey/alpha/rules.mk b/keyboards/suihankey/alpha/rules.mk index d4580058ec..1e3cebb145 100644 --- a/keyboards/suihankey/alpha/rules.mk +++ b/keyboards/suihankey/alpha/rules.mk @@ -1,82 +1 @@ -# MCU name -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 - - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   atmega32a    bootloadHID -BOOTLOADER = atmel-dfu - - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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 = lite    # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = no       # Mouse keys(+4700) -EXTRAKEY_ENABLE = no       # Audio control and System control(+450) -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 -NKRO_ENABLE = no            # USB Nkey Rollover -BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default -RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow -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 -HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400) -OLED_DRIVER_ENABLE = yes -SPLIT_KEYBOARD = no +RGBLIGHT_ENABLE = yes diff --git a/keyboards/suihankey/rev1/rules.mk b/keyboards/suihankey/rev1/rules.mk index d4580058ec..1e3cebb145 100644 --- a/keyboards/suihankey/rev1/rules.mk +++ b/keyboards/suihankey/rev1/rules.mk @@ -1,82 +1 @@ -# MCU name -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 - - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   atmega32a    bootloadHID -BOOTLOADER = atmel-dfu - - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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 = lite    # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = no       # Mouse keys(+4700) -EXTRAKEY_ENABLE = no       # Audio control and System control(+450) -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 -NKRO_ENABLE = no            # USB Nkey Rollover -BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default -RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow -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 -HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400) -OLED_DRIVER_ENABLE = yes -SPLIT_KEYBOARD = no +RGBLIGHT_ENABLE = yes diff --git a/keyboards/suihankey/rules.mk b/keyboards/suihankey/rules.mk index dbba5b93c7..d4c2e54b13 100644 --- a/keyboards/suihankey/rules.mk +++ b/keyboards/suihankey/rules.mk @@ -1,63 +1,16 @@  # MCU name  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 - -  # 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 = atmel-dfu - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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  # diff --git a/keyboards/suihankey/split/alpha/rules.mk b/keyboards/suihankey/split/alpha/rules.mk index 974450a692..1e3cebb145 100644 --- a/keyboards/suihankey/split/alpha/rules.mk +++ b/keyboards/suihankey/split/alpha/rules.mk @@ -1,82 +1 @@ -# MCU name -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 - - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   atmega32a    bootloadHID -BOOTLOADER = atmel-dfu - - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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 = lite    # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = no       # Mouse keys(+4700) -EXTRAKEY_ENABLE = no       # Audio control and System control(+450) -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 -NKRO_ENABLE = no            # USB Nkey Rollover -BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default -RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow -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 -HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400) -OLED_DRIVER_ENABLE = no -SPLIT_KEYBOARD = yes +RGBLIGHT_ENABLE = yes diff --git a/keyboards/suihankey/split/rev1/rules.mk b/keyboards/suihankey/split/rev1/rules.mk index 974450a692..1e3cebb145 100644 --- a/keyboards/suihankey/split/rev1/rules.mk +++ b/keyboards/suihankey/split/rev1/rules.mk @@ -1,82 +1 @@ -# MCU name -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 - - -# Bootloader selection -#   Teensy       halfkay -#   Pro Micro    caterina -#   Atmel DFU    atmel-dfu -#   LUFA DFU     lufa-dfu -#   QMK DFU      qmk-dfu -#   atmega32a    bootloadHID -BOOTLOADER = atmel-dfu - - -# If you don't know the bootloader type, then you can specify the -# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line -#   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 = lite    # Virtual DIP switch configuration(+1000) -MOUSEKEY_ENABLE = no       # Mouse keys(+4700) -EXTRAKEY_ENABLE = no       # Audio control and System control(+450) -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 -NKRO_ENABLE = no            # USB Nkey Rollover -BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default -RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow -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 -HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400) -OLED_DRIVER_ENABLE = no -SPLIT_KEYBOARD = yes +RGBLIGHT_ENABLE = yes diff --git a/keyboards/sx60/keymaps/default/rules.mk b/keyboards/sx60/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/sx60/keymaps/default/rules.mk +++ /dev/null diff --git a/keyboards/sx60/rules.mk b/keyboards/sx60/rules.mk index 0381293ceb..4c711dc880 100755 --- a/keyboards/sx60/rules.mk +++ b/keyboards/sx60/rules.mk @@ -1,49 +1,15 @@ -# # project specific files -SRC =  twimaster.c \ -  matrix.c -  # MCU name  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* -OPT_DEFS += -DBOOTLOADER_SIZE=4096 - +# Bootloader selection +#   Teensy       halfkay +#   Pro Micro    caterina +#   Atmel DFU    atmel-dfu +#   LUFA DFU     lufa-dfu +#   QMK DFU      qmk-dfu +#   ATmega32A    bootloadHID +#   ATmega328P   USBasp +BOOTLOADER = atmel-dfu  # Build Options  #   comment out to disable the options. @@ -59,3 +25,7 @@ BACKLIGHT_ENABLE ?= yes  # Enable keyboard backlight functionality  AUDIO_ENABLE ?= no  RGBLIGHT_ENABLE ?= no  CUSTOM_MATRIX ?= yes + +# project specific files +SRC =  twimaster.c \ +  matrix.c | 
