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

diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk
index 4743b6b08f12982ad2cc169fb7fa0f0817188f9c..7901898c7c38d20ffd170a3bbe94f357710850c6 100644 (file)
--- a/keyboards/converter/adb_usb/rules.mk
+++ b/keyboards/converter/adb_usb/rules.mk
@@ -1,7 +1,7 @@
 # MCU name
-# atmega32u4   Teensy2.0
-# atemga32u4   TMK Converter rev.1
-# atemga32u2   TMK Converter rev.2
+# atmega32u4  Teensy2.0
+# atemga32u4  TMK Converter rev.1
+# atemga32u2  TMK Converter rev.2
 MCU = atmega32u4
 
 # Processor frequency.
@@ -50,25 +50,23 @@ BOOTLOADER = caterina
 # Boot Section Size in *bytes*
 #   Teensy halfKay   512
 #   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096      for TMK Converter rev.1/rev.2
+#   Atmel DFU loader 4096  for TMK Converter rev.1/rev.2
 #   LUFA bootloader  4096
 #   USBaspLoader     2048
 
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE       = no                    # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE                = no                    # Mouse keys(+4700)
-CONSOLE_ENABLE         = no                    # Console for debug(+400)
-COMMAND_ENABLE         = no            # Commands for debug and configuration
-SLEEP_LED_ENABLE       = no            # Breathing sleep LED during USB suspend
-NKRO_ENABLE              = no                  # USB Nkey Rollover - not yet supported in LUFA
-EXTRAKEY_ENABLE                = yes
-USB_HID_ENABLE                 = yes
-BACKLIGHT_ENABLE       = no
-#BLUETOOTH                     = AdafruitBLE   # For Adafruit Feather 32U4 BLE support, uncomment this line
+BOOTMAGIC_ENABLE = no   # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE  = no   # Mouse keys(+4700)
+CONSOLE_ENABLE   = no   # Console for debug(+400)
+COMMAND_ENABLE   = no   # Commands for debug and configuration
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
+NKRO_ENABLE      = no   # USB Nkey Rollover - not yet supported in LUFA
+EXTRAKEY_ENABLE  = yes
+USB_HID_ENABLE   = yes
+BACKLIGHT_ENABLE = no
+#BLUETOOTH        = AdafruitBLE  # For Adafruit Feather 32U4 BLE support, uncomment this line
+CUSTOM_MATRIX    = yes
 
-CUSTOM_MATRIX = yes
-SRC = matrix.c \
-      adb.c \
-                       led.c
+SRC = matrix.c adb.c led.c

diff --git a/keyboards/converter/hp_46010a/rules.mk b/keyboards/converter/hp_46010a/rules.mk
index ddd2d593bd21cc4abf9594e25b8a5d1fe5a49203..25be649995cac403285cfcfdc805fb5a604c33f9 100644 (file)
--- a/keyboards/converter/hp_46010a/rules.mk
+++ b/keyboards/converter/hp_46010a/rules.mk
@@ -39,7 +39,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 # 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 
+#     different sizes, comment this out, and the correct address will be loaded
 #     automatically (+60). See bootloader.mk for all options.
 BOOTLOADER = halfkay
 
@@ -48,8 +48,8 @@ BOOTLOADER = halfkay
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes        # Audio control and System control(+450)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
@@ -62,11 +62,9 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 API_SYSEX_ENABLE = no
 SPLIT_KEYBOARD = no
 WAIT_FOR_USB = yes
-
+LAYOUTS_HAS_RGB = no
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-LAYOUTS_HAS_RGB = NO
-
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 CUSTOM_MATRIX = yes
-SRC = matrix.c
\ No newline at end of file
+
+SRC = matrix.c

diff --git a/keyboards/converter/ibm_5291/rules.mk b/keyboards/converter/ibm_5291/rules.mk
index ca0c850c0bab23def2ceb05938deffbf6a282206..57e385f0a9a145b17dea4dac4d21270d0cb973d8 100644 (file)
--- a/keyboards/converter/ibm_5291/rules.mk
+++ b/keyboards/converter/ibm_5291/rules.mk
@@ -39,7 +39,7 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 # 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 
+#     different sizes, comment this out, and the correct address will be loaded
 #     automatically (+60). See bootloader.mk for all options.
 BOOTLOADER = halfkay
 
@@ -62,11 +62,9 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 API_SYSEX_ENABLE = no
 SPLIT_KEYBOARD = no
 WAIT_FOR_USB = yes
-
+LAYOUTS_HAS_RGB = no
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
-LAYOUTS_HAS_RGB = NO
-
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 CUSTOM_MATRIX = yes
-SRC = matrix.c
\ No newline at end of file
+
+SRC = matrix.c

diff --git a/keyboards/converter/ibm_terminal/rules.mk b/keyboards/converter/ibm_terminal/rules.mk
index 77b3a6f3f75f125dcaa20e89263342cb26a3b410..3fa8792464c8c5b9b3f3bd788109ba21a0b178b7 100644 (file)
--- a/keyboards/converter/ibm_terminal/rules.mk
+++ b/keyboards/converter/ibm_terminal/rules.mk
@@ -36,7 +36,6 @@ 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
@@ -46,11 +45,11 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 OPT_DEFS += -DBOOTLOADER_SIZE=4096
 
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes        # Mouse keys(+4700)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
 COMMAND_ENABLE = no         # Commands for debug and configuration
@@ -61,12 +60,11 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes
 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
-API_SYSEX_ENABLE = n
-CUSTOM_MATRIX = yes
-
+API_SYSEX_ENABLE = no
 # 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
\ No newline at end of file
+SRC = matrix.c led.c

diff --git a/keyboards/converter/m0110_usb/rules.mk b/keyboards/converter/m0110_usb/rules.mk
index 3b4ca83b750b65518bc05ed357ced21351f6e5f3..bffee05fde210e50aff94abe1de7ff1585cff938 100644 (file)
--- a/keyboards/converter/m0110_usb/rules.mk
+++ b/keyboards/converter/m0110_usb/rules.mk
@@ -1,7 +1,7 @@
 # MCU name
-# atmega32u4   Teensy2.0
-# atemga32u4   TMK Converter rev.1
-# atemga32u2   TMK Converter rev.2
+# atmega32u4  Teensy2.0
+# atemga32u4  TMK Converter rev.1
+# atemga32u2  TMK Converter rev.2
 MCU = atmega32u4
 
 # Processor frequency.
@@ -43,31 +43,30 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 
 # 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 
+#     different sizes, comment this out, and the correct address will be loaded
 #     automatically (+60). See bootloader.mk for all options.
 BOOTLOADER = caterina
 
 # Boot Section Size in *bytes*
 #   Teensy halfKay   512
 #   Teensy++ halfKay 1024
-#   Atmel DFU loader 4096      for TMK Converter rev.1/rev.2
+#   Atmel DFU loader 4096  for TMK Converter rev.1/rev.2
 #   LUFA bootloader  4096
 #   USBaspLoader     2048
 
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE       = no                    # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE                = no                    # Mouse keys(+4700)
-CONSOLE_ENABLE         = yes                   # Console for debug(+400)
-COMMAND_ENABLE         = no                    # Commands for debug and configuration
-SLEEP_LED_ENABLE       = no                    # Breathing sleep LED during USB suspend
-NKRO_ENABLE            = no                    # USB Nkey Rollover - not yet supported in LUFA
-EXTRAKEY_ENABLE                = yes   
-USB_HID_ENABLE                 = yes
-BACKLIGHT_ENABLE       = no
-#BLUETOOTH                     = AdafruitBLE   # For Adafruit Feather 32U4 BLE support, uncomment this line
+BOOTMAGIC_ENABLE = no   # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE  = no   # Mouse keys(+4700)
+CONSOLE_ENABLE   = yes  # Console for debug(+400)
+COMMAND_ENABLE   = no   # Commands for debug and configuration
+SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
+NKRO_ENABLE      = no   # USB Nkey Rollover - not yet supported in LUFA
+EXTRAKEY_ENABLE  = yes
+USB_HID_ENABLE   = yes
+BACKLIGHT_ENABLE = no
+#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

diff --git a/keyboards/converter/palm_usb/rules.mk b/keyboards/converter/palm_usb/rules.mk
index 35ea3995e65ff2c9bcef322b6486500243a72235..8dfc2ca4d719462a160cc51800b24ee5ce2f11f0 100644 (file)
--- a/keyboards/converter/palm_usb/rules.mk
+++ b/keyboards/converter/palm_usb/rules.mk
@@ -9,38 +9,34 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 BOOTLOADER = caterina
 
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
-EXTRAKEY_ENABLE = no       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes         # Console for debug(+400)
-COMMAND_ENABLE = yes         # Commands for debug and configuration
-NKRO_ENABLE = no           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+EXTRAKEY_ENABLE = no        # Audio control and System control(+450)
+CONSOLE_ENABLE = yes        # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = no            # 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
 MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
-UNICODEMAP_ENABLE = no 
+UNICODEMAP_ENABLE = no
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-CUSTOM_MATRIX = yes
-
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # 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
+CUSTOM_MATRIX = yes
 
 SRC += matrix.c
-
 ifdef HARDWARE_SERIAL
-       # untested with palm_usb
-        SRC += protocol/serial_uart.c
-        OPT_DEFS += -DHARDWARE_SERIAL
+  # Untested with palm_usb
+  SRC += protocol/serial_uart.c
+  OPT_DEFS += -DHARDWARE_SERIAL
 else
-        SRC += protocol/serial_soft.c
+  SRC += protocol/serial_soft.c
 endif
 
 DEFAULT_FOLDER = converter/palm_usb/stowaway
-

diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk
index 3cf503b1d25f28c3a86fee24a96e934b9c6b90c4..22311c3d4c73cf2e506206a4da1e983972ec10e2 100644 (file)
--- a/keyboards/converter/sun_usb/rules.mk
+++ b/keyboards/converter/sun_usb/rules.mk
@@ -9,14 +9,14 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 BOOTLOADER = lufa-dfu
 
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes        # Mouse keys(+4700)
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes         # Console for debug(+400)
-COMMAND_ENABLE = yes         # Commands for debug and configuration
+CONSOLE_ENABLE = yes        # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes           # 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
 MIDI_ENABLE = no            # MIDI controls
@@ -24,21 +24,18 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 UNICODEMAP_ENABLE = yes
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
-CUSTOM_MATRIX = yes
-
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 # 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
+CUSTOM_MATRIX = yes
 
 SRC += matrix.c led.c
-
 ifdef HARDWARE_SERIAL
-        SRC += protocol/serial_uart.c
-        OPT_DEFS += -DHARDWARE_SERIAL
+  SRC += protocol/serial_uart.c
+  OPT_DEFS += -DHARDWARE_SERIAL
 else
-        SRC += protocol/serial_soft.c
+  SRC += protocol/serial_soft.c
 endif
 
 DEFAULT_FOLDER = converter/sun_usb/type5

diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
index 7a8f24bb49abe68b44a317de17a7686f443e5c79..dfe89ee7d9454193025f72154c19a81071bb6024 100644 (file)
--- a/keyboards/converter/usb_usb/rules.mk
+++ b/keyboards/converter/usb_usb/rules.mk
@@ -1,7 +1,6 @@
 # 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
@@ -23,7 +22,6 @@ F_CPU ?= 16000000
 
 DEFAULT_FOLDER = converter/usb_usb/hasu
 
-
 #
 # LUFA specific
 #
@@ -45,7 +43,7 @@ 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 
+#     different sizes, comment this out, and the correct address will be loaded
 #     automatically (+60). See bootloader.mk for all options.
 BOOTLOADER = caterina
 
@@ -55,15 +53,15 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 # Build Options
 #   comment out to disable the options.
 #
-# BOOTMAGIC_ENABLE     = yes   # Virtual DIP switch configuration(+1000)
-# MOUSEKEY_ENABLE              = yes   # Mouse keys(+4700)
-EXTRAKEY_ENABLE                = yes   # Audio control and System control(+450)
-# CONSOLE_ENABLE               = yes   # Console for debug(+400)
-# COMMAND_ENABLE               = yes  # Commands for debug and configuration
-# SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
-# NKRO_ENABLE = yes    # USB Nkey Rollover - not yet supported in LUFA
-# BACKLIGHT_ENABLE = yes
-USB_HID_ENABLE = yes
+#BOOTMAGIC_ENABLE = yes  # Virtual DIP switch configuration(+1000)
+#MOUSEKEY_ENABLE  = yes  # Mouse keys(+4700)
+EXTRAKEY_ENABLE  = yes  # Audio control and System control(+450)
+#CONSOLE_ENABLE   = yes  # Console for debug(+400)
+#COMMAND_ENABLE   = yes  # Commands for debug and configuration
+#SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
+#NKRO_ENABLE      = yes  # USB Nkey Rollover - not yet supported in LUFA
+#BACKLIGHT_ENABLE = yes
+USB_HID_ENABLE   = yes
+CUSTOM_MATRIX    = yes
 
-CUSTOM_MATRIX = yes
-SRC = custom_matrix.cpp
\ No newline at end of file
+SRC = custom_matrix.cpp

diff --git a/keyboards/converter/xt_usb/rules.mk b/keyboards/converter/xt_usb/rules.mk
index 0b8731f326357fc3f31bcaf7eec24c0b221e08be..1f96251830fe20b3c7befa818391f00d9d9a3d9a 100644 (file)
--- a/keyboards/converter/xt_usb/rules.mk
+++ b/keyboards/converter/xt_usb/rules.mk
@@ -14,7 +14,6 @@ MCU = atmega32u4
 #     software delays.
 F_CPU = 16000000
 
-
 #
 # LUFA specific
 #
@@ -42,21 +41,19 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 # BOOTLOADER = caterina # Pro Micro
 BOOTLOADER = halfkay # Teensy
 
-
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE = no  # Virtual DIP switch configuration(+1000)
-MOUSEKEY_ENABLE = yes  # Mouse keys(+4700)
-EXTRAKEY_ENABLE = yes  # Audio control and System control(+450)
-CONSOLE_ENABLE = yes   # Console for debug(+400)
-COMMAND_ENABLE = yes   # Commands for debug and configuration
-NKRO_ENABLE = yes      # USB Nkey Rollover
-XT_ENABLE = yes
-CUSTOM_MATRIX = yes
+BOOTMAGIC_ENABLE = no   # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE  = yes  # Mouse keys(+4700)
+EXTRAKEY_ENABLE  = yes  # Audio control and System control(+450)
+CONSOLE_ENABLE   = yes  # Console for debug(+400)
+COMMAND_ENABLE   = yes  # Commands for debug and configuration
+NKRO_ENABLE      = yes  # USB Nkey Rollover
+XT_ENABLE        = yes
+CUSTOM_MATRIX    = yes
 
+SRC = matrix.c led.c
 
 # Optimize size but this may cause error "relocation truncated to fit"
 #EXTRALDFLAGS = -Wl,--relax
-
-SRC = matrix.c led.c