From e8b65d01709c2ebdf50c0aa95963d200fa4fa4c6 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Sun, 6 Oct 2019 05:09:35 +1100 Subject: Cleanup rules.mk for 32U4 keyboards, A-F (#6804) * Cleanup rules.mk for 32U4 keyboards, A-F * Put back stuff in VIA keymaps --- .../abstract/ellipse/keymaps/default/rules.mk | 0 keyboards/abstract/ellipse/rev1/rules.mk | 51 +- keyboards/acr60/rules.mk | 50 +- keyboards/adkb96/rules.mk | 58 +- keyboards/aeboards/aegis/keymaps/via/rules.mk | 4 +- keyboards/aeboards/aegis/rules.mk | 53 +- keyboards/aeboards/ext65/keymaps/via/rules.mk | 4 +- keyboards/aeboards/ext65/rules.mk | 53 +- keyboards/ai03/lunar/rules.mk | 51 +- keyboards/ai03/orbit/rules.mk | 63 +- keyboards/ai03/quasar/rules.mk | 51 +- keyboards/ai03/soyuz/rules.mk | 51 +- keyboards/akb/eb46/rules.mk | 51 +- keyboards/akb/raine/rules.mk | 51 +- keyboards/al1/rules.mk | 54 +- keyboards/alf/dc60/rules.mk | 54 +- keyboards/alf/x11/rules.mk | 51 +- keyboards/alf/x2/rules.mk | 50 +- keyboards/alpha/keymaps/vderm/alpha_vderm.hex | 1422 -------------------- keyboards/alpha/rules.mk | 46 +- keyboards/alu84/rules.mk | 50 +- keyboards/amj40/rules.mk | 54 +- keyboards/amj60/rules.mk | 54 +- keyboards/amj96/rules.mk | 54 +- keyboards/amjkeyboard/amj66/rules.mk | 41 +- keyboards/amjpad/rules.mk | 54 +- keyboards/angel17/rules.mk | 15 +- keyboards/angel64/rules.mk | 51 +- keyboards/at101_blackheart/rules.mk | 49 +- keyboards/atomic/rules.mk | 52 +- keyboards/atreus/astar/rules.mk | 50 +- keyboards/atreus/teensy2/rules.mk | 50 +- keyboards/atreus62/rules.mk | 47 +- keyboards/baguette/rules.mk | 51 +- keyboards/bantam44/rules.mk | 54 +- keyboards/bigswitch/rules.mk | 49 +- keyboards/blockey/rules.mk | 54 +- keyboards/bm16a/rules.mk | 51 +- keyboards/bm16s/rules.mk | 50 +- keyboards/boardwalk/rules.mk | 50 +- keyboards/bpiphany/sixshooter/rules.mk | 49 +- keyboards/bthlabs/geekpad/rules.mk | 51 +- keyboards/business_card/alpha/rules.mk | 51 +- keyboards/business_card/beta/rules.mk | 51 +- keyboards/business_card/rules.mk | 51 +- keyboards/butterstick/keymaps/default/rules.mk | 0 keyboards/butterstick/rules.mk | 20 +- keyboards/c39/rules.mk | 53 +- keyboards/catch22/rules.mk | 50 +- keyboards/chimera_ergo/rules.mk | 74 +- keyboards/chimera_ls/rules.mk | 73 +- keyboards/chimera_ortho/rules.mk | 64 +- keyboards/choco60/rules.mk | 51 +- keyboards/christmas_tree/keymaps/default/rules.mk | 0 keyboards/christmas_tree/rules.mk | 52 +- keyboards/ckeys/handwire_101/rules.mk | 52 +- keyboards/ckeys/nakey/rules.mk | 54 +- keyboards/ckeys/obelus/rules.mk | 54 +- keyboards/claw44/rules.mk | 60 +- keyboards/clueboard/17/rules.mk | 54 +- keyboards/clueboard/66/rev1/rules.mk | 19 +- keyboards/clueboard/66/rev2/rules.mk | 18 +- keyboards/clueboard/66/rev3/rules.mk | 19 +- keyboards/clueboard/66_hotswap/prototype/rules.mk | 21 +- keyboards/clueboard/card/rules.mk | 16 +- keyboards/cocoa40/keymaps/default/rules.mk | 1 - keyboards/cocoa40/rules.mk | 51 +- keyboards/comet46/rules.mk | 57 +- keyboards/contra/rules.mk | 48 +- keyboards/converter/adb_usb/rules.mk | 59 +- keyboards/converter/hp_46010a/rules.mk | 47 +- keyboards/converter/ibm_5291/rules.mk | 47 +- keyboards/converter/ibm_terminal/rules.mk | 51 +- keyboards/converter/m0110_usb/rules.mk | 58 +- keyboards/converter/numeric_keypad_IIe/rules.mk | 47 +- keyboards/converter/palm_usb/rules.mk | 17 +- keyboards/converter/sun_usb/rules.mk | 17 +- keyboards/converter/usb_usb/rules.mk | 57 +- keyboards/converter/xt_usb/rules.mk | 48 +- keyboards/copenhagen_click/click_pad_v1/rules.mk | 14 +- keyboards/coseyfannitutti/discipad/rules.mk | 7 + keyboards/coseyfannitutti/mullet/rules.mk | 51 +- keyboards/coseyfannitutti/mulletpad/rules.mk | 51 +- keyboards/cospad/rules.mk | 51 +- keyboards/crawlpad/rules.mk | 48 +- keyboards/crkbd/rules.mk | 60 +- keyboards/cu24/rules.mk | 54 +- keyboards/cu75/rules.mk | 51 +- keyboards/daisy/rules.mk | 53 +- keyboards/dc01/arrow/rules.mk | 59 +- keyboards/dc01/left/rules.mk | 59 +- keyboards/dc01/numpad/rules.mk | 59 +- keyboards/dc01/right/rules.mk | 59 +- keyboards/deltasplit75/rules.mk | 56 +- keyboards/dichotomy/rules.mk | 66 +- keyboards/diverge3/rules.mk | 54 +- keyboards/divergetm2/keymaps/default/rules.mk | 0 keyboards/divergetm2/rules.mk | 57 +- keyboards/dk60/rules.mk | 16 +- keyboards/do60/rules.mk | 57 +- keyboards/doro67/multi/rules.mk | 6 +- keyboards/doro67/regular/rules.mk | 5 +- keyboards/doro67/rgb/rules.mk | 56 +- keyboards/dozen0/rules.mk | 51 +- keyboards/dp60/keymaps/via/rules.mk | 3 +- keyboards/dp60/rules.mk | 20 +- keyboards/duck/eagle_viper/v2/rules.mk | 54 +- keyboards/duck/jetfire/rules.mk | 54 +- keyboards/duck/lightsaver/rules.mk | 54 +- keyboards/duck/octagon/v1/rules.mk | 54 +- keyboards/duck/octagon/v2/rules.mk | 54 +- keyboards/dumbpad/rules.mk | 51 +- keyboards/dz60/keymaps/LEdiodes/rules.mk | 45 +- keyboards/dz60/rules.mk | 45 +- keyboards/eco/rules.mk | 47 +- keyboards/emptystring/NQG/rules.mk | 53 +- keyboards/ep/40/rules.mk | 51 +- keyboards/ep/96/rules.mk | 51 +- keyboards/ep/comsn/hs68/rules.mk | 51 +- keyboards/ep/comsn/mollydooker/rules.mk | 51 +- keyboards/ep/comsn/tf_longeboye/rules.mk | 51 +- keyboards/ergo42/rules.mk | 51 +- keyboards/ergodash/rules.mk | 23 +- keyboards/ergodone/rules.mk | 80 +- keyboards/ergodox_ez/rules.mk | 72 +- keyboards/ergoinu/rules.mk | 50 +- keyboards/ergotaco/keymaps/default/rules.mk | 6 - keyboards/ergotaco/rules.mk | 20 +- keyboards/ergotravel/keymaps/default/rules.mk | 0 keyboards/ergotravel/rules.mk | 47 +- keyboards/espectro/rules.mk | 51 +- keyboards/evil80/rules.mk | 52 +- keyboards/exclusive/e65/rules.mk | 7 + keyboards/exclusive/e6_rgb/rules.mk | 54 +- keyboards/exclusive/e6v2/le/rules.mk | 54 +- keyboards/exclusive/e6v2/oe/rules.mk | 54 +- keyboards/exclusive/e7v1/rules.mk | 42 +- keyboards/fc660c/rules.mk | 53 +- keyboards/fc980c/rules.mk | 54 +- keyboards/felix/rules.mk | 40 +- keyboards/fleuron/rules.mk | 54 +- keyboards/fortitude60/rules.mk | 54 +- keyboards/four_banger/rules.mk | 50 +- keyboards/foxlab/leaf60/hotswap/rules.mk | 51 +- keyboards/foxlab/leaf60/universal/rules.mk | 51 +- keyboards/fractal/rules.mk | 46 +- keyboards/freyr/rules.mk | 15 +- 147 files changed, 1019 insertions(+), 6911 deletions(-) delete mode 100644 keyboards/abstract/ellipse/keymaps/default/rules.mk delete mode 100644 keyboards/alpha/keymaps/vderm/alpha_vderm.hex delete mode 100644 keyboards/butterstick/keymaps/default/rules.mk delete mode 100644 keyboards/christmas_tree/keymaps/default/rules.mk delete mode 100644 keyboards/cocoa40/keymaps/default/rules.mk delete mode 100644 keyboards/divergetm2/keymaps/default/rules.mk delete mode 100644 keyboards/ergotravel/keymaps/default/rules.mk (limited to 'keyboards') diff --git a/keyboards/abstract/ellipse/keymaps/default/rules.mk b/keyboards/abstract/ellipse/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/abstract/ellipse/rev1/rules.mk b/keyboards/abstract/ellipse/rev1/rules.mk index 880d40e49b..6c7f5fea32 100644 --- a/keyboards/abstract/ellipse/rev1/rules.mk +++ b/keyboards/abstract/ellipse/rev1/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/acr60/rules.mk b/keyboards/acr60/rules.mk index 9c4082da29..1e6d4bb7cd 100644 --- a/keyboards/acr60/rules.mk +++ b/keyboards/acr60/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 = atmel-dfu # 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 = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes \ No newline at end of file +RGBLIGHT_ENABLE = yes diff --git a/keyboards/adkb96/rules.mk b/keyboards/adkb96/rules.mk index 707fafd7ca..cb4ce2dd7b 100644 --- a/keyboards/adkb96/rules.mk +++ b/keyboards/adkb96/rules.mk @@ -1,58 +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 +# 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 -# 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 to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically diff --git a/keyboards/aeboards/aegis/keymaps/via/rules.mk b/keyboards/aeboards/aegis/keymaps/via/rules.mk index f072c67198..70258b9ead 100644 --- a/keyboards/aeboards/aegis/keymaps/via/rules.mk +++ b/keyboards/aeboards/aegis/keymaps/via/rules.mk @@ -1,6 +1,6 @@ # project specific files SRC = keyboards/wilba_tech/wt_main.c - + # MCU name MCU = atmega32u4 @@ -65,4 +65,4 @@ AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches RAW_ENABLE = yes -DYNAMIC_KEYMAP_ENABLE = yes \ No newline at end of file +DYNAMIC_KEYMAP_ENABLE = yes diff --git a/keyboards/aeboards/aegis/rules.mk b/keyboards/aeboards/aegis/rules.mk index f1c632289c..602da86786 100644 --- a/keyboards/aeboards/aegis/rules.mk +++ b/keyboards/aeboards/aegis/rules.mk @@ -1,50 +1,16 @@ -# project specific files -SRC = keyboards/wilba_tech/wt_main.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 +# 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 # @@ -63,3 +29,6 @@ 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 + +# project specific files +SRC = keyboards/wilba_tech/wt_main.c diff --git a/keyboards/aeboards/ext65/keymaps/via/rules.mk b/keyboards/aeboards/ext65/keymaps/via/rules.mk index f072c67198..70258b9ead 100644 --- a/keyboards/aeboards/ext65/keymaps/via/rules.mk +++ b/keyboards/aeboards/ext65/keymaps/via/rules.mk @@ -1,6 +1,6 @@ # project specific files SRC = keyboards/wilba_tech/wt_main.c - + # MCU name MCU = atmega32u4 @@ -65,4 +65,4 @@ AUDIO_ENABLE = no # Audio output on port C6 FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches RAW_ENABLE = yes -DYNAMIC_KEYMAP_ENABLE = yes \ No newline at end of file +DYNAMIC_KEYMAP_ENABLE = yes diff --git a/keyboards/aeboards/ext65/rules.mk b/keyboards/aeboards/ext65/rules.mk index f1c632289c..bac979ad0c 100644 --- a/keyboards/aeboards/ext65/rules.mk +++ b/keyboards/aeboards/ext65/rules.mk @@ -1,50 +1,16 @@ -# project specific files -SRC = keyboards/wilba_tech/wt_main.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 +# 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 # @@ -63,3 +29,6 @@ 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 + +# project specific files +SRC += keyboards/wilba_tech/wt_main.c diff --git a/keyboards/ai03/lunar/rules.mk b/keyboards/ai03/lunar/rules.mk index 6bb6d9ae9a..dd3d71baa9 100644 --- a/keyboards/ai03/lunar/rules.mk +++ b/keyboards/ai03/lunar/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/ai03/orbit/rules.mk b/keyboards/ai03/orbit/rules.mk index e225ad037c..758a73cd2a 100644 --- a/keyboards/ai03/orbit/rules.mk +++ b/keyboards/ai03/orbit/rules.mk @@ -1,69 +1,16 @@ -SRC += split_util.c \ - split_flags.c \ - serial.c \ - transport.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 - - # 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 # @@ -88,4 +35,8 @@ USE_I2C = no # I2C for split communication CUSTOM_MATRIX = yes # For providing custom matrix.c (in this case, override regular matrix.c with split matrix.c) # SPLIT_KEYBOARD = yes # Split keyboard flag disabled as manual edits had to be done to the split common files - +SRC += split_util.c \ + split_flags.c \ + serial.c \ + transport.c \ + matrix.c diff --git a/keyboards/ai03/quasar/rules.mk b/keyboards/ai03/quasar/rules.mk index afbd1de147..6b67847791 100644 --- a/keyboards/ai03/quasar/rules.mk +++ b/keyboards/ai03/quasar/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/ai03/soyuz/rules.mk b/keyboards/ai03/soyuz/rules.mk index 5df789e581..f092cb35be 100644 --- a/keyboards/ai03/soyuz/rules.mk +++ b/keyboards/ai03/soyuz/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/akb/eb46/rules.mk b/keyboards/akb/eb46/rules.mk index 195c9e5023..5360459cf7 100644 --- a/keyboards/akb/eb46/rules.mk +++ b/keyboards/akb/eb46/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/akb/raine/rules.mk b/keyboards/akb/raine/rules.mk index 195c9e5023..5360459cf7 100644 --- a/keyboards/akb/raine/rules.mk +++ b/keyboards/akb/raine/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/al1/rules.mk b/keyboards/al1/rules.mk index 6ae59c1496..175adfd5d7 100644 --- a/keyboards/al1/rules.mk +++ b/keyboards/al1/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/alf/dc60/rules.mk b/keyboards/alf/dc60/rules.mk index 0e8f52e2b6..8df6c4c7c5 100644 --- a/keyboards/alf/dc60/rules.mk +++ b/keyboards/alf/dc60/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/alf/x11/rules.mk b/keyboards/alf/x11/rules.mk index d19b7c1baa..3439ac47f3 100644 --- a/keyboards/alf/x11/rules.mk +++ b/keyboards/alf/x11/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/alf/x2/rules.mk b/keyboards/alf/x2/rules.mk index 9c4082da29..1e6d4bb7cd 100644 --- a/keyboards/alf/x2/rules.mk +++ b/keyboards/alf/x2/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 = atmel-dfu # 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 = yes # Enable keyboard backlight functionality AUDIO_ENABLE = no -RGBLIGHT_ENABLE = yes \ No newline at end of file +RGBLIGHT_ENABLE = yes diff --git a/keyboards/alpha/keymaps/vderm/alpha_vderm.hex b/keyboards/alpha/keymaps/vderm/alpha_vderm.hex deleted file mode 100644 index 7515ad0305..0000000000 --- a/keyboards/alpha/keymaps/vderm/alpha_vderm.hex +++ /dev/null @@ -1,1422 +0,0 @@ -:100000000C949F020C94E6020C94E6020C94E60217 -:100010000C94E6020C94E6020C94E6020C94E602C0 -:100020000C94E6020C94E6020C94E0250C94B226A3 -:100030000C940D1D0C94E6020C94E6020C94E6025E -:100040000C94E6020C94E6020C94E6020C94E60290 -:100050000C94E6020C94751D0C94E6020C94E602D6 -:100060000C94E6020C94E6020C94E6020C94E60270 -:100070000C94E6020C94E6020C94E6020C94E60260 -:100080000C94E6020C94E6020C94E6020C94E60250 -:100090000C94E6020C94E6020C94E6020C94E60240 -:1000A0000C94E6020C94E6020C94E602AE03B00354 -:1000B000BB03B203B403B603B803BA03BD03BF0363 -:1000C000C103CC03C303C503C703C903CB03CE03DA -:1000D000181318134A134A138813A6130C150C157A -:1000E000E8130C158B148B14FC140C150C1505154A -:1000F00098149814981498149814981498149814A0 -:10010000981498149814981498149814981498148F -:10011000A914B714BE14C514CF149D159D15AF15A1 -:10012000AF15A615AF15AF15AF159D159D15AB15E0 -:10013000AF15AF15AB151F2746273E2846273E288B -:100140009227B5273E280C281B2807634236B79B09 -:10015000D8A71A39685618AEBAAB558C1D3CB7CC27 -:100160005763BD6DEDFD753EF6177231BF0000009F -:10017000803F05A84CCDB2D44EB93836A9020C50F8 -:10018000B9918688083CA6AAAA2ABE000000803F32 -:1001900014001A000800150017001C0018000C00BD -:1001A0001200130004001600070009000A000B00EB -:1001B0000D000E000F0028001D611B64064119424E -:1001C00000002C62000005781174107129007F0076 -:1001D000AA00A900AE004A004E004B004D000000EE -:1001E0002B000000000000000000500051005200F1 -:1001F0004F002A00E000E2000100035100002C62E1 -:100200000000E700E600E4001E001F0020002100BF -:1002100022002300240025002600270035000000CE -:100220002D002E0031002F003000330034002A0052 -:10023000E000E2000351010000002C6200003600E3 -:10024000370038003A003B003C003D003E003F00D4 -:10025000400041004200430044004500000000000F -:10026000000000000000000000004C00E000E20080 -:100270000100010000002C620000E700E600E4003D -:1002800000047F3F1F643214643214783C1E1E1435 -:100290000A056801F000B40078005A000000000070 -:1002A0000001010101010101010102020202020239 -:1002B000020202030303030303030304040404040C -:1002C00004050505050506060606060707070708CF -:1002D0000808080909090A0A0A0A0B0B0B0C0C0C7E -:1002E0000D0D0D0E0E0F0F0F101011111112121314 -:1002F000131414151516161717181819191A1A1B8E -:100300001C1C1D1D1E1F1F202021222223242525E9 -:1003100026272728292A2B2B2C2D2E2F2F30313220 -:1003200033343536363738393A3B3C3D3E3F404131 -:10033000424344464748494A4B4C4D4F5051525313 -:10034000555657585A5B5C5E5F60626364666769C6 -:100350006A6C6D6E707173747678797B7C7E808147 -:10036000838486888A8B8D8F91929496989A9B9D90 -:100370009FA1A3A5A7A9ABADAFB1B3B5B7B9BBBD9D -:10038000BFC1C4C6C8CACCCFD1D3D6D8DADCDFE16E -:10039000E4E6E8EBEDF0F2F5F7FAFCFF04033000D9 -:1003A00000000C0361006C00700068006100000038 -:1003B0000C035000790072006F004C000000040331 -:1003C000090409026D00040100A0FA0904000001FB -:1003D00003010100092111010001224000070581EC -:1003E0000308000A090401000103010200092111A8 -:1003F000010001224D000705820308000A090402DA -:10040000000103000000092111010001223600074C -:1004100005830308000A0904030001030000000922 -:100420002111010001223900070584032000011277 -:1004300001100100000008EDFE60600100010203F0 -:100440000105010906A101050719E029E7150025A5 -:1004500001950875018102050819012905950575A1 -:100460000191029501750391010507190029F715FE -:1004700000250195F875018102C005010980A101DF -:1004800085021601002603001A81002A83007510D8 -:1004900095018100C0050C0901A101850316010029 -:1004A000269C021A01002A9C02751095018100C049 -:1004B00005010902A1010901A10005091901290588 -:1004C00015002501950575018102950175038101CE -:1004D0000501093009311581257F950275088106CE -:1004E00009381581257F950175088106050C0A38A4 -:1004F000021581257F950175088106C0C005010997 -:1005000006A101050719E029E715002501950875E1 -:1005100001810295017508810105081901290595D8 -:1005200005750191029501750391010507190029CF -:10053000FF150026FF00950675088100C0001124F4 -:100540001FBECFEFDAE0DEBFCDBF04B603FE27C08B -:100550008091620290916302A0916402B091650261 -:100560008730904BA740B04BD1F4109262021092AA -:100570006302109264021092650214BE84B7877FF2 -:1005800084BF0FB6F894A89580916000886180932D -:100590006000109260000FBEE0E0F8E3099511E002 -:1005A000A0E0B1E0E0E8F8E502C005900D92A234C9 -:1005B000B107D9F722E0A2E4B1E001C01D92A23652 -:1005C000B207E1F70E940B230C943E2C0C94000020 -:1005D0000895089581E0089581E008950C94EC0257 -:1005E0000C9461080C94630808950C94F4020C9424 -:1005F000F50208950E9489150E94F9022FEF84E305 -:100600009CE0215080409040E1F700C0000087E767 -:1006100097E790930108809300080C949B1DFF922C -:100620000F931F93CF93DF938C01FC01C081D18185 -:1006300080919101811113C08281882349F0CE01FC -:100640000E94E61AF82E682FCE010E948F1A04C06D -:10065000CE010E94BA1AF82EBE018F2D04C0CE0121 -:100660000E94E61ABE010E94B305EC01B8010E9487 -:10067000EE02882309F46CC2B801CE010E94120870 -:10068000882309F465C2C93CFCE5DF0741F4F801A1 -:100690008281882309F45CC20E94290A59C2CA3C9B -:1006A0008CE5D80708F013C1C13C9CE5D90761F47B -:1006B000F8018281882309F44BC20E94B71B827221 -:1006C000F1F00E94490C44C2C23CECE5DE07D0F0D8 -:1006D000F8018281C53CFCE5DF0709F4CDC008F0D4 -:1006E000DDC0C33CECE5DE0709F4CCC008F0D0C0A7 -:1006F000882309F42DC20E94B71B827211F30E9455 -:100700003F0C26C2C531FCE5DF0708F07EC0C230D1 -:100710008CE5D80708F452C0F8018281882309F4D7 -:1007200059C00E94141C811102C00E94F31B0E9438 -:10073000311C90E09093540280935302FE01E350E9 -:10074000FC45E231F10530F4EA5AFF4F8091530243 -:100750000C94E32B80915302816027C0826025C0F6 -:10076000846023C0806121C080621FC080641DC07E -:1007700080681BC08460886018C08E7F16C08D7F23 -:1007800014C08B7F12C08F7E10C08F7D0EC08F7BF8 -:100790000CC08F770AC08B7F877F07C087FB22271B -:1007A00020F991E0922790FB87F980935302809182 -:1007B00053020E94351C0E948915CAC1C1159CE5CF -:1007C000D90781F0C130DC45A9F081E08093470171 -:1007D00080934801C801DF91CF911F910F91FF9045 -:1007E0000C94EA02F8018281882309F4B1C10E94C5 -:1007F000FA02AEC1F8018281882309F4A9C180916F -:100800000B02816080930B02A3C1C531FCE5DF07B9 -:1008100039F50E94B71B982FF801828120910D01B4 -:1008200030910E01882379F09A7A81E009F480E012 -:1008300080934201911102C069E201C065E3C901E0 -:100840000E94971C0AC080914201811102C069E296 -:1008500001C065E3C9010E94A21C0E94841B78C1EB -:10086000C03CDC4509F0B1CFF8018281882309F44E -:100870006FC10E94DA0C6CC1882309F469C10E941F -:10088000880B66C1882309F463C10E94510B60C1C3 -:10089000882309F45DC10E94690B5AC1C73C9CE5DD -:1008A000D90731F4882309F453C10E94BD0B50C10C -:1008B000C83CDC4530F4882309F44AC10E94A30BEC -:1008C00047C1882309F444C10E94D80B41C1C13DEE -:1008D000FCE5DF0749F4F8018281882309F438C177 -:1008E00088E10E943C0C34C1C23D8CE5D80708F079 -:1008F00087C0F8018281CD3CFCE5DF07A1F48823A5 -:1009000009F426C10E941B0A663071058105910514 -:1009100040F00E941B0A683071058105910508F4BA -:10092000EECE86E0DECFCE3C9CE5D90730F5CB3C61 -:10093000ECE5DE0729F4882309F40AC181E0D1CF70 -:10094000CC3CDC4530F4882309F402C10E943E0A05 -:10095000FFC0882309F4FCC00E941B0A62307105A5 -:100960008105910540F00E941B0A653071058105E3 -:10097000910508F4C4CE82E0B4CFCF3C9CE5D90702 -:10098000A1F4882309F4E4C00E941B0A6F307105AA -:100990008105910540F00E941B0A643171058105B3 -:1009A000910508F4ACCE8FE09CCFC03DDC45A0F4AF -:1009B000882309F4CDC00E941B0A693071058105A6 -:1009C000910540F00E941B0A6E307105810591056A -:1009D00008F495CE89E085CF882309F4B9C00E9438 -:1009E0001B0A653171058105910540F00E941B0AC3 -:1009F000673171058105910508F481CE85E171CFDC -:100A0000C53DFCE5DF0739F5F8018281882361F0F7 -:100A1000109248010E943F1D90934601809345012A -:100A200080E20E94D51294C08091480181110FC0CC -:100A300080914501909146010E944B1D883C910593 -:100A400030F487E20E94731187E20E946F1280E205 -:100A50000E94DC127DC0C63D8CE5D80708F043C07B -:100A6000F8018281C33DFCE5DF0729F4882309F4FE -:100A70006FC083E236CFC43DDC45A0F4882309F47F -:100A800067C00E941B0A693171058105910540F01C -:100A90000E941B0A623271058105910508F42FCE70 -:100AA00089E11FCF882351F0109247010E943F1D1A -:100AB000909344018093430182E0B3CF809147013A -:100AC00081110FC080914301909144010E944B1D00 -:100AD000883C910530F486E20E94731186E20E9400 -:100AE0006F1282E0B5CFC93DECE5DE0731F4F801C5 -:100AF0008281882369F180E009C0CA3DFCE5DF07F7 -:100B000041F4F8018281882319F182E00E94A72331 -:100B10001FC0C63DDC4509F058CEF8018281811125 -:100B200077CF80914801811192CF809145019091BA -:100B300046010E944B1D883C910508F088CF80E259 -:100B40000E94DC1288E20E94731188E20E946F12F8 -:100B500080E0DF91CF911F910F91FF90089580E089 -:100B600090E0089508952EE1829FC0011124FC01B8 -:100B70002AE0729FE00DF11D1124E60FF11DEE0F2A -:100B8000FF1FE057FE4F859194910895880F991F9C -:100B9000FC01E058FD4F859194910895CF93DF9328 -:100BA0000E94B3050E947207EC018115904508F080 -:100BB00041C0C11580E4D80708F01CC1C83ED1056A -:100BC00010F5C03ED10508F089C1C83AD10578F4C6 -:100BD000C53AD10508F09EC0C130D10509F47EC1E7 -:100BE00008F435C1C430D10508F078C130C1CD3B1F -:100BF000D10508F49AC0C03CD10508F428C1CE0143 -:100C0000805C9109E9C0C11590E2D90758F4C1157B -:100C100021E0D20708F062C1C03FD10508F417C136 -:100C2000D0655CC1C11580E3D80708F0D9C0CE01FA -:100C30009F70D2C0C11595E5D90708F044C0C11511 -:100C400024E5D20708F0EDC0C11582E5D80710F5FC -:100C5000C11591E5D90708F0D0C0CE0174E0969592 -:100C600087957A95E1F7282F23703C2F337081E028 -:100C700090E002C0880F991F3A95E2F79C68922B8A -:100C8000CF70C695C69520E2C29FE0011124C82B03 -:100C9000D92B24C19E01237033278C2F86958695EE -:100CA000C115D34508F0AEC0C1E0D0E002C0CC0F02 -:100CB000DD1F2A95E2F720E2829FC0011124C82B94 -:100CC000D92BDC680BC1C11529E5D20780F4C11509 -:100CD00088E5D80708F0AAC0C11596E5D90708F03D -:100CE000B6C0CF71DD27DC2FCC27D062F7C0CE0194 -:100CF000C1152AE5D20708F49EC09056811590428E -:100D000008F0A5C08D2F8F710E94EE07DD27D062FD -:100D10008F719BC0C53AD10509F49CC0C63AD10574 -:100D200009F09BC0C2E8D0E4D9C0C83AD10509F4A3 -:100D300097C0C93AD10509F496C0CA3AD10509F459 -:100D400095C0CB3AD10509F494C0CC3AD10509F449 -:100D500093C0CB3BD10509F492C0CC3BD10509F43B -:100D600091C0CD3AD10509F490C0C03BD10509F43A -:100D70008FC0CE3AD10509F48EC0CF3AD10509F41F -:100D80008DC0C13BD10509F48CC0C23BD10509F42B -:100D90008BC0C33BD10509F48AC0C43BD10509F41B -:100DA00089C0C53BD10509F488C0C63BD10509F40B -:100DB00087C0C73BD10509F486C0C83BD10509F4FB -:100DC00085C0C93BD10509F484C0CA3BD10509F4EB -:100DD00083C0C0E0D4E482C00E94C605EC017EC09E -:100DE000CE019927D3FF03C0EC01D86C77C0EC018A -:100DF000D06C74C0DF70D06A71C0DC2FCC27C16F9B -:100E0000D06A6CC0C1E0D0E002C0CC0FDD1F2A95D3 -:100E1000E2F720E2829FC0011124C82BD92BDA68A7 -:100E20005DC0DC2FCC27C46FD06A58C0DC2FCC2724 -:100E3000C06FD06A53C024E0969587952A95E1F754 -:100E40008F70CF70C06ED0E0D06AD82B47C0C0E0A2 -:100E5000D0E044C0C1E8D0E441C0C3E8D0E43EC023 -:100E6000C2EED4E43BC0C9EED4E438C0CAEED4E448 -:100E700035C0C5EBD4E432C0C6EBD4E42FC0C3EB1D -:100E8000D4E42CC0C4EBD4E429C0C7EBD4E426C01E -:100E9000CCECD4E423C0CDECD4E420C0C3E8D5E44A -:100EA0001DC0CAE8D5E41AC0C2E9D5E417C0C4E938 -:100EB000D5E414C0C1E2D6E411C0C3E2D6E40EC04A -:100EC000C4E2D6E40BC0C5E2D6E408C0C6E2D6E46C -:100ED00005C0C7E2D6E402C0CAE2D6E4CE01DF9183 -:100EE000CF9108958238910549F1B0F4813391058D -:100EF00009F459C048F48932910509F44FC08A3287 -:100F0000910509F455C008958533910509F441C050 -:100F10008933910599F00895833E910531F138F4B4 -:100F2000803E910591F0823E9105A9F00895863E9C -:100F3000910501F1873E910539F108952091530201 -:100F400020FD3BC021FD39C008958091530280FFF0 -:100F500034C089E341C08091530282FF30C0809148 -:100F6000530284FD2EC083EE37C08091530282FD70 -:100F700026C0F5CF8091530283FF25C08091530294 -:100F800084FD1FC087EE28C08091530283FD1BC0E3 -:100F9000F5CF8091530285FD18C019C0809153028E -:100FA00085FD15C012C08091530286FD12C013C08A -:100FB0008091530286FD0FC00CC080EE0DC082EE02 -:100FC0000BC080E009C086EE07C089E205C085E35A -:100FD00003C08AE201C081E390E00895909153023A -:100FE00092FF0DC0282F2871283019F4877F846064 -:100FF00006C0282F2471243011F48B7F886093FF62 -:101000000DC0282F2871283119F4877E846106C00D -:10101000282F2471243111F48B7E886194FD877E02 -:10102000089508950F931F93CF93FB0122812111FF -:1010300002C0C1E041C08C01C0915601C11125C060 -:1010400086319C45B1F70E94110881E080935601DA -:101050000E943F1D909355018093540110924901C5 -:1010600010924B0110924A0110924D0110924C01C6 -:1010700010924F0110924E011092510110925001A6 -:10108000109253011092520117C080915401909117 -:1010900055010E944B1D8C32914058F690914901A8 -:1010A000E92FF0E0EE0FFF1FE65BFE4F1183008398 -:1010B0009F5F90934901C0E08C2FCF911F910F91BA -:1010C00008950C94E8020C94E902CF93DF93AAE20E -:1010D000B1E04DE251E061E070E08D91E82FE295E2 -:1010E000EF70F0E021A18F70EB0102C0CC0FDD1F8B -:1010F0008A95E2F7CE019C2F9095922391A392A11D -:10110000892B82A34A175B0741F7A0E2B1E04AE2CC -:1011100051E061E070E08D91E82FE295EF70F0E032 -:1011200021A18F70EB0102C0CC0FDD1F8A95E2F781 -:10113000CE019C2F9095922391A392A1892B82A3FB -:101140004A175B0741F710925E0110925D01109201 -:101150005801109257011092600110925F01109295 -:101160005A0110925901109262011092610110927D -:101170005C0110925B01DF91CF910C94F0022F92F1 -:101180003F924F925F926F927F928F929F92AF9217 -:10119000BF92CF92DF92EF92FF920F931F93CF9364 -:1011A000DF932AE2E22E21E0F22EC7E5D1E03DE511 -:1011B000832E31E0932E01E010E066246394BE019B -:1011C000A880B98019821882D7018D917D01E82FFE -:1011D000E295EF70F0E021A18F70A80102C0440FEA -:1011E000551F8A95E2F7CA01242B21A322A1742E50 -:1011F0007094272122A350EA5A95F1F790E2292E04 -:1012000091E0392E20E030E0D1015D901D01452DA7 -:1012100042954F7050E0DA0190964C90C880D9808A -:10122000552D5F70D80102C0AA0FBB1F5A95E2F777 -:10123000AD01442141F4A801022E02C0440F551F04 -:101240000A94E2F702C040E050E04C295D2959833E -:1012500048832F5F3F4F2A303105B1F691A17922A3 -:1012600071A292A1892B82A32296FB018081918198 -:10127000A816B90641F0609263010E943F1D909349 -:101280006501809364018C169D0609F098CF8091CA -:101290006301882311F180916401909165010E949E -:1012A0004B1D0697D0F08091570190915801909373 -:1012B0005E0180935D018091590190915A01909354 -:1012C000600180935F0180915B0190915C0190933C -:1012D000620180936101109263010E94F20281E039 -:1012E000DF91CF911F910F91FF90EF90DF90CF9002 -:1012F000BF90AF909F908F907F906F905F904F9036 -:101300003F902F900895E82FF0E0EE0FFF1FE35A73 -:10131000FE4F8081918108950895EF92FF920F937F -:101320001F93CF93DF93E901662309F44BC0242F69 -:1013300030E0EFEFF0E0E61BF109B901E69F900124 -:10134000E79F300DF69F300D1124232F8B01031BD7 -:1013500011095CE3E52EF12CB7010E94BB2BFB01C8 -:10136000BC01069FC001079F900D169F900D112490 -:10137000B7010E94BB2BE230F105B1F040F4309789 -:1013800079F0319711F5832F242F461B21C0E430CB -:10139000F105A1F068F03597C1F4842F861B18C0C1 -:1013A000832F262F230F14C0862F830FE42F03C013 -:1013B000E42FE61B842F432F2E2F0AC0842F462FA5 -:1013C000430F06C0842F242F03C080E020E040E0BC -:1013D000E42FF0E0E456FD4F4491E22FF0E0E456B4 -:1013E000FD4F9491E82FF0E0E456FD4FE4914983DE -:1013F0009883EA83DF91CF911F910F91FF90EF9037 -:10140000089588E090E00C94FE2BAB01BC0188E0CD -:1014100090E00C941C2CE9E3F2E083E080831092CE -:101420003A028FEF8283838314826081718182818B -:1014300093810C94050A6091390260FF06C066959D -:101440006F7370E080E090E0089560E070E0CB01A1 -:1014500