Fix mixed tabs/spaces and typos in keyboards/converter makefiles (#5041)
* Fix mixed tabs and spaces in adb_usb and m0110_usb makefiles * Fix typos in converter build options * Tweak ordering and spacing in converter makefiles
This commit is contained in:
parent
80d427a203
commit
e4ff07aff0
9 changed files with 98 additions and 119 deletions
|
@ -67,8 +67,6 @@ EXTRAKEY_ENABLE = yes
|
||||||
USB_HID_ENABLE = yes
|
USB_HID_ENABLE = yes
|
||||||
BACKLIGHT_ENABLE = no
|
BACKLIGHT_ENABLE = no
|
||||||
#BLUETOOTH = AdafruitBLE # For Adafruit Feather 32U4 BLE support, uncomment this line
|
#BLUETOOTH = AdafruitBLE # For Adafruit Feather 32U4 BLE support, uncomment this line
|
||||||
|
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
SRC = matrix.c \
|
|
||||||
adb.c \
|
SRC = matrix.c adb.c led.c
|
||||||
led.c
|
|
||||||
|
|
|
@ -62,11 +62,9 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||||
API_SYSEX_ENABLE = no
|
API_SYSEX_ENABLE = no
|
||||||
SPLIT_KEYBOARD = no
|
SPLIT_KEYBOARD = no
|
||||||
WAIT_FOR_USB = yes
|
WAIT_FOR_USB = yes
|
||||||
|
LAYOUTS_HAS_RGB = no
|
||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
LAYOUTS_HAS_RGB = NO
|
|
||||||
|
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
||||||
SRC = matrix.c
|
SRC = matrix.c
|
|
@ -62,11 +62,9 @@ RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||||
API_SYSEX_ENABLE = no
|
API_SYSEX_ENABLE = no
|
||||||
SPLIT_KEYBOARD = no
|
SPLIT_KEYBOARD = no
|
||||||
WAIT_FOR_USB = yes
|
WAIT_FOR_USB = yes
|
||||||
|
LAYOUTS_HAS_RGB = no
|
||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
LAYOUTS_HAS_RGB = NO
|
|
||||||
|
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
||||||
SRC = matrix.c
|
SRC = matrix.c
|
|
@ -36,7 +36,6 @@ F_USB = $(F_CPU)
|
||||||
# Interrupt driven control endpoint task(+60)
|
# Interrupt driven control endpoint task(+60)
|
||||||
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
||||||
|
|
||||||
|
|
||||||
# Boot Section Size in *bytes*
|
# Boot Section Size in *bytes*
|
||||||
# Teensy halfKay 512
|
# Teensy halfKay 512
|
||||||
# Teensy++ halfKay 1024
|
# Teensy++ halfKay 1024
|
||||||
|
@ -63,10 +62,9 @@ UNICODEMAP_ENABLE = yes
|
||||||
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||||
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||||
PS2_USE_USART = yes
|
PS2_USE_USART = yes
|
||||||
API_SYSEX_ENABLE = n
|
API_SYSEX_ENABLE = no
|
||||||
CUSTOM_MATRIX = yes
|
|
||||||
|
|
||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
CUSTOM_MATRIX = yes
|
||||||
|
|
||||||
SRC = matrix.c led.c
|
SRC = matrix.c led.c
|
|
@ -67,7 +67,6 @@ EXTRAKEY_ENABLE = yes
|
||||||
USB_HID_ENABLE = yes
|
USB_HID_ENABLE = yes
|
||||||
BACKLIGHT_ENABLE = no
|
BACKLIGHT_ENABLE = no
|
||||||
#BLUETOOTH = AdafruitBLE # For Adafruit Feather 32U4 BLE support, uncomment this line
|
#BLUETOOTH = AdafruitBLE # For Adafruit Feather 32U4 BLE support, uncomment this line
|
||||||
|
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
SRC = matrix.c \
|
|
||||||
m0110.c
|
SRC = matrix.c m0110.c
|
||||||
|
|
|
@ -25,17 +25,14 @@ UNICODE_ENABLE = no # Unicode
|
||||||
UNICODEMAP_ENABLE = no
|
UNICODEMAP_ENABLE = no
|
||||||
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||||
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||||
CUSTOM_MATRIX = yes
|
|
||||||
|
|
||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
#HARDWARE_SERIAL = yes
|
#HARDWARE_SERIAL = yes
|
||||||
|
CUSTOM_MATRIX = yes
|
||||||
|
|
||||||
SRC += matrix.c
|
SRC += matrix.c
|
||||||
|
|
||||||
ifdef HARDWARE_SERIAL
|
ifdef HARDWARE_SERIAL
|
||||||
# untested with palm_usb
|
# Untested with palm_usb
|
||||||
SRC += protocol/serial_uart.c
|
SRC += protocol/serial_uart.c
|
||||||
OPT_DEFS += -DHARDWARE_SERIAL
|
OPT_DEFS += -DHARDWARE_SERIAL
|
||||||
else
|
else
|
||||||
|
@ -43,4 +40,3 @@ else
|
||||||
endif
|
endif
|
||||||
|
|
||||||
DEFAULT_FOLDER = converter/palm_usb/stowaway
|
DEFAULT_FOLDER = converter/palm_usb/stowaway
|
||||||
|
|
||||||
|
|
|
@ -25,15 +25,12 @@ UNICODE_ENABLE = no # Unicode
|
||||||
UNICODEMAP_ENABLE = yes
|
UNICODEMAP_ENABLE = yes
|
||||||
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||||
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
|
||||||
CUSTOM_MATRIX = yes
|
|
||||||
|
|
||||||
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
|
||||||
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
|
||||||
|
|
||||||
#HARDWARE_SERIAL = yes
|
#HARDWARE_SERIAL = yes
|
||||||
|
CUSTOM_MATRIX = yes
|
||||||
|
|
||||||
SRC += matrix.c led.c
|
SRC += matrix.c led.c
|
||||||
|
|
||||||
ifdef HARDWARE_SERIAL
|
ifdef HARDWARE_SERIAL
|
||||||
SRC += protocol/serial_uart.c
|
SRC += protocol/serial_uart.c
|
||||||
OPT_DEFS += -DHARDWARE_SERIAL
|
OPT_DEFS += -DHARDWARE_SERIAL
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# MCU name
|
# MCU name
|
||||||
MCU = atmega32u4
|
MCU = atmega32u4
|
||||||
|
|
||||||
|
|
||||||
# Processor frequency.
|
# Processor frequency.
|
||||||
# This will define a symbol, F_CPU, in all source code files equal to the
|
# 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
|
# processor frequency in Hz. You can then use this symbol in your source code to
|
||||||
|
@ -23,7 +22,6 @@ F_CPU ?= 16000000
|
||||||
|
|
||||||
DEFAULT_FOLDER = converter/usb_usb/hasu
|
DEFAULT_FOLDER = converter/usb_usb/hasu
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# LUFA specific
|
# LUFA specific
|
||||||
#
|
#
|
||||||
|
@ -64,6 +62,6 @@ EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
|
||||||
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
|
#NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA
|
||||||
#BACKLIGHT_ENABLE = yes
|
#BACKLIGHT_ENABLE = yes
|
||||||
USB_HID_ENABLE = yes
|
USB_HID_ENABLE = yes
|
||||||
|
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
||||||
SRC = custom_matrix.cpp
|
SRC = custom_matrix.cpp
|
|
@ -14,7 +14,6 @@ MCU = atmega32u4
|
||||||
# software delays.
|
# software delays.
|
||||||
F_CPU = 16000000
|
F_CPU = 16000000
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# LUFA specific
|
# LUFA specific
|
||||||
#
|
#
|
||||||
|
@ -42,7 +41,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
|
||||||
# BOOTLOADER = caterina # Pro Micro
|
# BOOTLOADER = caterina # Pro Micro
|
||||||
BOOTLOADER = halfkay # Teensy
|
BOOTLOADER = halfkay # Teensy
|
||||||
|
|
||||||
|
|
||||||
# Build Options
|
# Build Options
|
||||||
# comment out to disable the options.
|
# comment out to disable the options.
|
||||||
#
|
#
|
||||||
|
@ -55,8 +53,7 @@ NKRO_ENABLE = yes # USB Nkey Rollover
|
||||||
XT_ENABLE = yes
|
XT_ENABLE = yes
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = yes
|
||||||
|
|
||||||
|
SRC = matrix.c led.c
|
||||||
|
|
||||||
# Optimize size but this may cause error "relocation truncated to fit"
|
# Optimize size but this may cause error "relocation truncated to fit"
|
||||||
#EXTRALDFLAGS = -Wl,--relax
|
#EXTRALDFLAGS = -Wl,--relax
|
||||||
|
|
||||||
SRC = matrix.c led.c
|
|
||||||
|
|
Loading…
Reference in a new issue