Merge branch 'qmk-pre-merge-2021-09-12' into qmk-merge-2021-09-12

keyboards/idb/idb_60/info.json

@@ -2,11 +2,8 @@
     "keyboard_name": "idb 60",
     "url": "https://idb-keyboards.xyz/60",
     "maintainer": "pngu",
-    "width": 15,
-    "height": 5,
     "layouts": {
         "LAYOUT_default": {
-            "key_count": 59,
             "layout": [
                 {"label":"Esc", "x":0, "y":0},
                 {"label":"!\n1", "x":1, "y":0},
@@ -70,7 +67,6 @@
             ]
         },
         "LAYOUT": {
-            "key_count": 63,
             "layout": [
                 {"label":"Esc", "x":0, "y":0},
                 {"label":"!\n1", "x":1, "y":0},

keyboards/idb/idb_60/rules.mk

@@ -2,18 +2,11 @@
 MCU = atmega32u2
 
 # 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.
-BOOTMAGIC_ENABLE = lite
+BOOTMAGIC_ENABLE = lite     # Enable Bootmagic Lite
 MOUSEKEY_ENABLE = yes			# Mouse keys
 EXTRAKEY_ENABLE = yes			# Audio control and System control
 CONSOLE_ENABLE = no			# Console for debug
@@ -22,4 +15,3 @@ KEYBOARD_LOCK_ENABLE = no		# Allow locking of keyboard via magic key
 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
-BLUETOOTH_ENABLE = no			# Enable Bluetooth