[Bug] Fix IS31fl3741 driver to accept 1 or 2 addresses (#14451 )

Co-authored-by: Joel Challis <git@zvecr.com>
[Keyboard] Fix Boop65 rgb compile issues (#14444 )
2025-08-13 03:52:27 +00:00 · 2021-09-15 10:07:08 -07:00 · 2021-09-15 01:31:25 -07:00 · 2021-09-14 23:56:12 -07:00 · 2021-09-14 23:00:48 -07:00 · 2021-09-14 22:20:34 -07:00
3377 changed files with 9578 additions and 5845 deletions
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -118,7 +118,6 @@
                    "c_macro": {
                        "type": "boolean"
                    },
-                    "key_count": {"$ref": "qmk.definitions.v1#/key_unit"},
                    "layout": {
                        "type": "array",
                        "items": {
@@ -136,7 +135,6 @@
                                        "multipleOf": 1
                                    }
                                },
-                                "key_count": {"$ref": "qmk.definitions.v1#/key_unit"},
                                "r": {"$ref": "qmk.definitions.v1#/unsigned_decimal"},
                                "rx": {"$ref": "qmk.definitions.v1#/unsigned_decimal"},
                                "ry": {"$ref": "qmk.definitions.v1#/unsigned_decimal"},
--- a/data/templates/avr/rules.mk
+++ b/data/templates/avr/rules.mk
@@ -18,5 +18,4 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
--- a/data/templates/base/info.json
+++ b/data/templates/base/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "%KEYBOARD%",
    "url": "",
    "maintainer": "%YOUR_NAME%",
-    "width": 3,
-    "height": 2,
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/docs/feature_oled_driver.md
+++ b/docs/feature_oled_driver.md
@@ -18,7 +18,7 @@ Hardware configurations using Arm-based microcontrollers or different sizes of O

 ## Usage

-To enable the OLED feature, there are three steps. First, when compiling your keyboard, you'll need to add the following to your `rules.mk`:
+To enable the OLED feature, there are two steps. First, when compiling your keyboard, you'll need to add the following to your `rules.mk`:

 ```make
 OLED_ENABLE = yes
--- a/docs/ja/compatible_microcontrollers.md
+++ b/docs/ja/compatible_microcontrollers.md
@@ -1,8 +1,8 @@
 # 互換性のあるマイクロコントローラ

 <!---
-  original document: 0.9.19:docs/compatible_microcontrollers.md
-  git diff 0.9.19 HEAD -- docs/compatible_microcontrollers.md | cat
+  original document: 0.14.14:docs/compatible_microcontrollers.md
+  git diff 0.14.14 HEAD -- docs/compatible_microcontrollers.md | cat
 -->

 QMK は十分な容量のフラッシュメモリを備えた USB 対応 AVR または ARM マイクロコントローラで実行されます - 一般的に 32kB 以上ですが、ほとんどの機能を無効にすると*ほんの* 16kB に詰め込むことができます。
--- a/docs/ja/reference_info_json.md
+++ b/docs/ja/reference_info_json.md
@@ -25,14 +25,8 @@

 ### レイアウトの形式

-`info.json` ファイル内の辞書の `layouts` 部分は、幾つかの入れ子になった辞書を含みます。外側のレイヤーは QMK レイアウトマクロで構成されます。例えば、`LAYOUT_ansi` あるいは `LAYOUT_iso`。各レイアウトマクロ内には、`width`、 `height`、`key_count` のキーがあります。これらは自明でなければなりません。
+`info.json` ファイル内の辞書の `layouts` 部分は、幾つかの入れ子になった辞書を含みます。外側のレイヤーは QMK レイアウトマクロで構成されます。例えば、`LAYOUT_ansi` あるいは `LAYOUT_iso`。

-* `width`
-   * オプション: キー単位でのレイアウトの幅
-* `height`
-   * オプション: キー単位でのレイアウトの高さ
-* `key_count`
-   * オプション: このレイアウトのキーの数
 * `layout`
   * 物理レイアウトを説明するキー辞書のリスト。詳細は次のセクションを見てください。

--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -32,14 +32,8 @@ The `info.json` file is a JSON formatted dictionary with the following keys avai

 ### Layout Format

-Within our `info.json` file the `layouts` portion of the dictionary contains several nested dictionaries. The outer layer consists of QMK layout macros, for example `LAYOUT_ansi` or `LAYOUT_iso`. Within each layout macro are keys for `width`, `height`, and `key_count`, each of which should be self-explanatory.
+Within our `info.json` file the `layouts` portion of the dictionary contains several nested dictionaries. The outer layer consists of QMK layout macros, for example `LAYOUT_ansi` or `LAYOUT_iso`.

-* `width`
-  * Optional: The width of the layout in Key Units
-* `height`
-  * Optional: The height of the layout in Key Units
-* `key_count`
-  * Optional: The number of keys in this layout
 * `layout`
  * A list of Key Dictionaries describing the physical layout. See the next section for more details.

--- a/drivers/led/issi/is31fl3741.c
+++ b/drivers/led/issi/is31fl3741.c
@@ -73,7 +73,7 @@ uint8_t g_twi_transfer_buffer[20] = {0xFF};
 // buffers and the transfers in IS31FL3741_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[DRIVER_COUNT][ISSI_MAX_LEDS];
-bool    g_pwm_buffer_update_required                      = false;
+bool    g_pwm_buffer_update_required[DRIVER_COUNT]        = {false};
 bool    g_scaling_registers_update_required[DRIVER_COUNT] = {false};

 uint8_t g_scaling_registers[DRIVER_COUNT][ISSI_MAX_LEDS];
@@ -169,10 +169,10 @@ void IS31FL3741_set_color(int index, uint8_t red, uint8_t green, uint8_t blue) {
    if (index >= 0 && index < DRIVER_LED_TOTAL) {
        is31_led led = g_is31_leds[index];

-        g_pwm_buffer[led.driver][led.r] = red;
-        g_pwm_buffer[led.driver][led.g] = green;
-        g_pwm_buffer[led.driver][led.b] = blue;
-        g_pwm_buffer_update_required    = true;
+        g_pwm_buffer[led.driver][led.r]          = red;
+        g_pwm_buffer[led.driver][led.g]          = green;
+        g_pwm_buffer[led.driver][led.b]          = blue;
+        g_pwm_buffer_update_required[led.driver] = true;
    }
 }

@@ -206,12 +206,12 @@ void IS31FL3741_set_led_control_register(uint8_t index, bool red, bool green, bo
    g_scaling_registers_update_required[led.driver] = true;
 }

-void IS31FL3741_update_pwm_buffers(uint8_t addr1, uint8_t addr2) {
-    if (g_pwm_buffer_update_required) {
-        IS31FL3741_write_pwm_buffer(addr1, g_pwm_buffer[0]);
+void IS31FL3741_update_pwm_buffers(uint8_t addr, uint8_t index) {
+    if (g_pwm_buffer_update_required[index]) {
+        IS31FL3741_write_pwm_buffer(addr, g_pwm_buffer[index]);
    }

-    g_pwm_buffer_update_required = false;
+    g_pwm_buffer_update_required[index] = false;
 }

 void IS31FL3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue) {
@@ -219,7 +219,7 @@ void IS31FL3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green,
    g_pwm_buffer[pled->driver][pled->g] = green;
    g_pwm_buffer[pled->driver][pled->b] = blue;

-    g_pwm_buffer_update_required = true;
+    g_pwm_buffer_update_required[pled->driver] = true;
 }

 void IS31FL3741_update_led_control_registers(uint8_t addr, uint8_t index) {
--- a/drivers/led/issi/is31fl3741.h
+++ b/drivers/led/issi/is31fl3741.h
@@ -45,8 +45,8 @@ void IS31FL3741_set_led_control_register(uint8_t index, bool red, bool green, bo
 // (eg. from a timer interrupt).
 // Call this while idle (in between matrix scans).
 // If the buffer is dirty, it will update the driver with the buffer.
-void IS31FL3741_update_pwm_buffers(uint8_t addr1, uint8_t addr2);
-void IS31FL3741_update_led_control_registers(uint8_t addr1, uint8_t addr2);
+void IS31FL3741_update_pwm_buffers(uint8_t addr, uint8_t index);
+void IS31FL3741_update_led_control_registers(uint8_t addr, uint8_t index);
 void IS31FL3741_set_scaling_registers(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue);

 void IS31FL3741_set_pwm_buffer(const is31_led *pled, uint8_t red, uint8_t green, uint8_t blue);
--- a/keyboards/0_sixty/info.json
+++ b/keyboards/0_sixty/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "0-Sixty",
    "url": "",
    "maintainer": "vinamarora8",
-    "width": 12,
-    "height": 5,
    "layouts": {
 	"LAYOUT_1x2uC": {
            "layout": [
--- a/keyboards/0_sixty/rules.mk
+++ b/keyboards/0_sixty/rules.mk
@@ -17,5 +17,4 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
--- a/keyboards/0xc7/61key/rules.mk
+++ b/keyboards/0xc7/61key/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output

 LTO_ENABLE = yes
--- a/keyboards/0xcb/1337/info.json
+++ b/keyboards/0xcb/1337/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "0xCB 1337",
  "url": "https://0xCB.dev",
  "maintainer": "Conor-Burns",
-  "width": 3,
-  "height": 3,
  "layouts": {
    "LAYOUT": {
      "layout": [
--- a/keyboards/0xcb/1337/rules.mk
+++ b/keyboards/0xcb/1337/rules.mk
@@ -19,7 +19,6 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output

 ENCODER_ENABLE = yes
--- a/keyboards/0xcb/static/info.json
+++ b/keyboards/0xcb/static/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "0xCB Static",
  "url": "https://0xCB.dev",
  "maintainer": "Conor-Burns",
-  "width": 12,
-  "height": 5,
  "layout_aliases": {
    "LAYOUT": "LAYOUT_all"
  },
--- a/keyboards/0xcb/static/rules.mk
+++ b/keyboards/0xcb/static/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output

 ENCODER_ENABLE = yes
--- a/keyboards/10bleoledhub/info.json
+++ b/keyboards/10bleoledhub/info.json
@@ -2,9 +2,6 @@
    "keyboard_name": "10bleoledhub",
    "url": "https://github.com/haierwangwei2005/10BLE-OLED-HUB",
    "maintainer": "haierwangwei2005",
-
-    "width": 4,
-    "height": 3,
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/1upkeyboards/1up60hse/info.json
+++ b/keyboards/1upkeyboards/1up60hse/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "1up60hse",
    "url": "",
    "maintainer": "qmk",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_60_ansi": {
            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
--- a/keyboards/1upkeyboards/1up60hse/rules.mk
+++ b/keyboards/1upkeyboards/1up60hse/rules.mk
@@ -19,7 +19,6 @@ NKRO_ENABLE = yes            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 EXTRAFLAGS += -flto

--- a/keyboards/1upkeyboards/1up60hte/info.json
+++ b/keyboards/1upkeyboards/1up60hte/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "1up60hte",
    "url": "https://www.1upkeyboards.com/shop/controllers/1up-rgb-60-pcb-hte/",
    "maintainer": "1upkeyboards",
-    "width": 15,
-    "height": 5,
    "layout_aliases": {
        "LAYOUT_tsangan": "LAYOUT_60_tsangan_hhkb"
    },
--- a/keyboards/1upkeyboards/1up60hte/rules.mk
+++ b/keyboards/1upkeyboards/1up60hte/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output

 LTO_ENABLE = yes
--- a/keyboards/1upkeyboards/1up60rgb/info.json
+++ b/keyboards/1upkeyboards/1up60rgb/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "1up60rgb",
  "url": "",
  "maintainer": "qmk",
-  "width": 15,
-  "height": 5,
  "layouts": {
    "LAYOUT_all": {
      "layout": [
--- a/keyboards/1upkeyboards/super16/info.json
+++ b/keyboards/1upkeyboards/super16/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "super16",
  "url": "",
  "maintainer": "qmk",
-  "width": 4,
-  "height": 4,
  "layouts": {
    "LAYOUT_ortho_4x4": {
      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
--- a/keyboards/1upkeyboards/super16/rules.mk
+++ b/keyboards/1upkeyboards/super16/rules.mk
@@ -21,7 +21,6 @@ RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 LAYOUTS = ortho_4x4 numpad_4x4
--- a/keyboards/1upkeyboards/sweet16/info.json
+++ b/keyboards/1upkeyboards/sweet16/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "Sweet 16",
  "url": "",
  "maintainer": "skullydazed",
-  "width": 4,
-  "height": 4,
  "layouts": {
      "LAYOUT_ortho_4x4": {
          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}]
--- a/keyboards/2key2crawl/info.json
+++ b/keyboards/2key2crawl/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "2Key2CrawlPad",
    "url": "",
    "maintainer": "qmk",
-    "width": 6.5,
-    "height": 2,
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/30wer/info.json
+++ b/keyboards/30wer/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "30wer", 
    "url": "", 
    "maintainer": "qmk", 
-    "width": 13.25, 
-    "height": 3, 
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/30wer/rules.mk
+++ b/keyboards/30wer/rules.mk
@@ -17,5 +17,4 @@ NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: ht
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no 		# Enable WS2812 RGB underlight.
--- a/keyboards/3keyecosystem/2key2/2key2.c
+++ b/keyboards/3keyecosystem/2key2/2key2.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2021 John Mueller
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "2key2.h"
+
+// RGB Matrix configuration
+// based on https://docs.qmk.fm/#/feature_rgb_matrix?id=common-configuration
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+  // Key Matrix to LED Index
+  {   0, 1 }
+}, {
+  // LED Index to Physical Position
+  // Using range { 0..224, 0..64 }
+  { 0,  32 }, { 224,  32 }
+}, {
+  // LED Index to Flag
+  // https://docs.qmk.fm/#/feature_rgb_matrix?id=flags
+  LED_FLAG_ALL, LED_FLAG_ALL
+} };
+#endif
--- a/keyboards/3keyecosystem/2key2/2key2.h
+++ b/keyboards/3keyecosystem/2key2/2key2.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 Shiftux <shiftux@gmail.com>
+Copyright 2021 John Mueller

 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -14,5 +14,20 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+#pragma once

-#include "redox.h"
+#include "quantum.h"
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    k00, k01 \
+) { \
+    { k00, k01 }  \
+}
--- a/keyboards/3keyecosystem/2key2/config.h
+++ b/keyboards/3keyecosystem/2key2/config.h
@@ -0,0 +1,59 @@
+/*
+Copyright 2021 John Mueller
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x1209
+#define PRODUCT_ID   0x3304
+#define DEVICE_VER   0x0001
+#define MANUFACTURER 3-Key-Ecosystem
+#define PRODUCT      2key2
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 2
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { F6 }
+#define MATRIX_COL_PINS { F4, D7 }
+#define UNUSED_PINS
+
+// LED on kbmount base board is on B7
+#define LED_CAPS_LOCK_PIN B7 // onboard LED for testing
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* RGB matrix key backlighting */
+#define RGB_DI_PIN B2
+#define DRIVER_LED_TOTAL 2
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE
+#define RGB_MATRIX_STARTUP_HUE 90
+#define RGB_MATRIX_STARTUP_SPD 20
+#define RGB_MATRIX_STARTUP_VAL 128
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_DISABLE_WHEN_USB_SUSPENDED true
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
--- a/keyboards/3keyecosystem/2key2/info.json
+++ b/keyboards/3keyecosystem/2key2/info.json
@@ -0,0 +1,13 @@
+{
+    "keyboard_name": "3-Key-Ecosystem 2key2: 2x1 macro-keyboard",
+    "url": "https://github.com/softplus/3keyecosystem/tree/main/2key2",
+    "maintainer": "softplus",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k00", "x": 0, "y": 0},
+                {"label": "k01", "x": 1, "y": 0}
+            ]
+        }
+    }
+}
--- a/keyboards/3keyecosystem/2key2/keymaps/default/keymap.c
+++ b/keyboards/3keyecosystem/2key2/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 John Mueller
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_A,    KC_B
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS
+    ),
+
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS
+    )
+};
--- a/keyboards/3keyecosystem/2key2/keymaps/via/keymap.c
+++ b/keyboards/3keyecosystem/2key2/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 John Mueller
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_A,    KC_B
+    ),
+
+    [1] = LAYOUT(
+        KC_TRNS, KC_TRNS
+    ),
+
+    [2] = LAYOUT(
+        KC_TRNS, KC_TRNS
+    ),
+
+    [3] = LAYOUT(
+        KC_TRNS, KC_TRNS
+    )
+  };
--- a/keyboards/3keyecosystem/2key2/keymaps/via/rules.mk
+++ b/keyboards/3keyecosystem/2key2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
--- a/keyboards/3keyecosystem/2key2/readme.md
+++ b/keyboards/3keyecosystem/2key2/readme.md
@@ -0,0 +1,24 @@
+# 3-Key-Ecosystem - 2key2
+
+![keyboard](https://i.imgur.com/IJ1Zyc7.jpeg)
+
+This is a 2x1 macro keyboard with WS2812B key lighting.
+It's designed for a modular keyboard mount using an ATmega32U4.
+
+* Keyboard Maintainer: [softplus](https://github.com/softplus)
+* Hardware Supported: [3keyecosystem-2key2](https://github.com/softplus/3keyecosystem/tree/main/2key2)
+* Hardware Availability: Open-Source files at above link
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 3keyecosystem/2key2:default
+
+Flashing example for this keyboard:
+
+    make 3keyecosystem/2key2:default:flash
+
+## Bootloader
+
+To Enter the bootloader, click reset button on the main board.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
--- a/keyboards/3keyecosystem/2key2/rules.mk
+++ b/keyboards/3keyecosystem/2key2/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+RGB_MATRIX_ENABLE = yes		# Enable RGB matrix
+RGB_MATRIX_DRIVER = WS2812	# Select WS2812 driver for RGB matrix
+AUDIO_ENABLE = no           # Audio output
--- a/keyboards/3w6/info.json
+++ b/keyboards/3w6/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "3w6",
    "url": "https://github.com/weteor/3W6/",
    "maintainer": "weteor",
-    "width": 13,
-    "height": 5,
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/3w6/rev1/rules.mk
+++ b/keyboards/3w6/rev1/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
--- a/keyboards/3w6/rev2/rules.mk
+++ b/keyboards/3w6/rev2/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 UNICODE_ENABLE = yes
 CUSTOM_MATRIX = lite
--- a/keyboards/40percentclub/25/info.json
+++ b/keyboards/40percentclub/25/info.json
@@ -2,11 +2,8 @@
    "keyboard_name": "foobar",
    "url": "",
    "maintainer": "qmk",
-    "width": 6,
-    "height": 2,
    "layouts": {
        "LAYOUT_ortho_5x5": {
-            "key_count": 15,
            "layout": [
              {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
              {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
@@ -16,7 +13,6 @@
          ]
        },
        "LAYOUT_ortho_5x10": {
-            "key_count": 30,
            "layout": [
              {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0},
              {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1},
--- a/keyboards/40percentclub/25/rules.mk
+++ b/keyboards/40percentclub/25/rules.mk
@@ -19,7 +19,6 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 # Enable generic behavior for split boards
--- a/keyboards/40percentclub/4pack/info.json
+++ b/keyboards/40percentclub/4pack/info.json
@@ -2,11 +2,9 @@
    "keyboard_name": "4pack", 
    "url": "", 
    "maintainer": "qmk", 
-    "width": 4, 
-    "height": 1, 
    "layouts": {
        "LAYOUT": {
            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}]
        }
    }
-}
+}
--- a/keyboards/40percentclub/4pack/rules.mk
+++ b/keyboards/40percentclub/4pack/rules.mk
@@ -19,5 +19,4 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
--- a/keyboards/40percentclub/4x4/info.json
+++ b/keyboards/40percentclub/4x4/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "40percent.club 4x4",
    "url": "",
    "maintainer": "qmk",
-    "height": 4,
-    "width": 4,
    "layouts": {
        "LAYOUT_ortho_4x4": {
            "layout": [
--- a/keyboards/40percentclub/4x4/rules.mk
+++ b/keyboards/40percentclub/4x4/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 LAYOUTS = ortho_4x4 ortho_4x12
--- a/keyboards/40percentclub/5x5/info.json
+++ b/keyboards/40percentclub/5x5/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "40percent.club 5x5",
    "url": "",
    "maintainer": "qmk",
-    "height": 4,
-    "width": 4,
    "layouts": {
        "LAYOUT_ortho_5x5": {
            "layout": [
--- a/keyboards/40percentclub/5x5/rules.mk
+++ b/keyboards/40percentclub/5x5/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 LAYOUTS = ortho_5x15
--- a/keyboards/40percentclub/6lit/info.json
+++ b/keyboards/40percentclub/6lit/info.json
@@ -2,18 +2,14 @@
    "keyboard_name": "6lit",
    "url": "",
    "maintainer": "qmk",
-    "width": 6,
-    "height": 2,
    "layouts": {
        "LAYOUT_ortho_2x3": {
-            "key_count": 6,
            "layout": [
              {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0},
              {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}
            ]
        },
        "LAYOUT_ortho_2x6": {
-            "key_count": 12,
            "layout": [
              {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0},
              {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}
--- a/keyboards/40percentclub/6lit/rules.mk
+++ b/keyboards/40percentclub/6lit/rules.mk
@@ -19,7 +19,6 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 # Enable generic behavior for split boards
--- a/keyboards/40percentclub/foobar/info.json
+++ b/keyboards/40percentclub/foobar/info.json
@@ -2,11 +2,8 @@
    "keyboard_name": "foobar",
    "url": "",
    "maintainer": "qmk",
-    "width": 10,
-    "height": 3,
    "layouts": {
        "LAYOUT_ortho_3x5": {
-            "key_count": 15,
            "layout": [
              {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0},
              {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1},
@@ -14,7 +11,6 @@
            ]
        },
        "LAYOUT_ortho_3x10": {
-            "key_count": 30,
            "layout": [
              {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0},
              {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1},
--- a/keyboards/40percentclub/foobar/rules.mk
+++ b/keyboards/40percentclub/foobar/rules.mk
@@ -19,7 +19,6 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 # Enable generic behavior for split boards
--- a/keyboards/40percentclub/gherkin/info.json
+++ b/keyboards/40percentclub/gherkin/info.json
@@ -2,11 +2,8 @@
  "keyboard_name": "Gherkin",
  "url": "",
  "maintainer": "qmk",
-  "width": 10,
-  "height": 3,
  "layouts": {
    "LAYOUT_ortho_3x10": {
-      "key_count": 30,
      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
    }
  }
--- a/keyboards/40percentclub/half_n_half/info.json
+++ b/keyboards/40percentclub/half_n_half/info.json
@@ -2,11 +2,8 @@
  "keyboard_name": "half_n_half",
  "url": "",
  "maintainer": "qmk",
-  "width": 14,
-  "height": 4,
  "layouts": {
    "LAYOUT": {
-      "key_count": 44,
      "layout": [
          {"label":"L00", "x":0, "y":0},
          {"label":"L01", "x":1, "y":0},
@@ -59,4 +56,3 @@
    }
  }
 }
-  
--- a/keyboards/40percentclub/half_n_half/rules.mk
+++ b/keyboards/40percentclub/half_n_half/rules.mk
@@ -19,7 +19,6 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 # Enable generic behavior for split boards
--- a/keyboards/40percentclub/i75/info.json
+++ b/keyboards/40percentclub/i75/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "i75",
  "url": "",
  "maintainer": "qmk",
-  "width": 15,
-  "height": 5,
  "layouts": {
      "LAYOUT_ortho_5x15": {
          "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
--- a/keyboards/40percentclub/i75/rules.mk
+++ b/keyboards/40percentclub/i75/rules.mk
@@ -13,7 +13,6 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 LAYOUTS = ortho_5x15
--- a/keyboards/40percentclub/luddite/info.json
+++ b/keyboards/40percentclub/luddite/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "Luddite",
  "url": "",
  "maintainer": "qmk",
-  "width": 15,
-  "height": 5,
  "layouts": {
    "LAYOUT_60_ansi": {
      "layout": [
--- a/keyboards/40percentclub/mf68/info.json
+++ b/keyboards/40percentclub/mf68/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "MF68",
  "url": "",
  "maintainer": "qmk",
-  "width": 17.25,
-  "height": 5,
  "layouts": {
      "LAYOUT_68_ansi": {
          "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}]
--- a/keyboards/40percentclub/mf68/rules.mk
+++ b/keyboards/40percentclub/mf68/rules.mk
@@ -19,7 +19,6 @@ NKRO_ENABLE = yes            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 LAYOUTS = 68_ansi
--- a/keyboards/40percentclub/nano/info.json
+++ b/keyboards/40percentclub/nano/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "Nano",
  "url": "",
  "maintainer": "qmk",
-  "width": 4,
-  "height": 2,
  "layouts": {
    "LAYOUT_ortho_2x4": {
      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}]
--- a/keyboards/40percentclub/nano/rules.mk
+++ b/keyboards/40percentclub/nano/rules.mk
@@ -17,7 +17,6 @@ NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: ht
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.

 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
--- a/keyboards/40percentclub/nein/info.json
+++ b/keyboards/40percentclub/nein/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "nein",
  "url": "http://www.40percent.club/2019/04/nein.html",
  "maintainer": "qmk",
-  "width": 3,
-  "height": 3,
  "layouts": {
    "LAYOUT_ortho_3x3": {
      "layout": [
--- a/keyboards/40percentclub/nein/rules.mk
+++ b/keyboards/40percentclub/nein/rules.mk
@@ -19,5 +19,4 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
--- a/keyboards/40percentclub/nori/info.json
+++ b/keyboards/40percentclub/nori/info.json
@@ -2,11 +2,8 @@
    "keyboard_name": "nori",
    "url": "",
    "maintainer": "qmk",
-    "width": 12,
-    "height": 4,
    "layouts": {
      "LAYOUT_ortho_4x4": {
-          "key_count": 16,
          "layout": [
            { "w": 1, "x": 0, "y": 0 },
            { "w": 1, "x": 1, "y": 0 },
@@ -26,7 +23,6 @@
            { "w": 1, "x": 3, "y": 3 } ]
      },
      "LAYOUT_ortho_4x8": {
-          "key_count": 32,
          "layout": [
            { "w": 1, "x": 0, "y": 0 },
            { "w": 1, "x": 1, "y": 0 },
@@ -62,7 +58,6 @@
            { "w": 1, "x": 7, "y": 3 } ]
      },
        "LAYOUT_ortho_4x12": {
-            "key_count": 48,
            "layout": [
              { "w": 1, "x": 0, "y": 0 },
              { "w": 1, "x": 1, "y": 0 },
--- a/keyboards/40percentclub/nori/rules.mk
+++ b/keyboards/40percentclub/nori/rules.mk
@@ -19,7 +19,6 @@ NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 LAYOUTS = ortho_4x4 ortho_4x12
--- a/keyboards/40percentclub/sixpack/info.json
+++ b/keyboards/40percentclub/sixpack/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "Six Pack",
    "url": "https://www.40percent.club/2017/05/six-pack-11.html",
    "maintainer": "qmk",
-    "width": 3,
-    "height": 2,
    "layouts": {
        "LAYOUT_ortho_2x3": {
          "layout": [
--- a/keyboards/40percentclub/sixpack/rules.mk
+++ b/keyboards/40percentclub/sixpack/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output

 LAYOUTS = ortho_2x3
--- a/keyboards/40percentclub/tomato/info.json
+++ b/keyboards/40percentclub/tomato/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "Tomato",
  "url": "",
  "maintainer": "qmk",
-  "width": 10,
-  "height": 3,
  "layouts": {
    "LAYOUT_ortho_3x10": {
      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}]
--- a/keyboards/40percentclub/ut47/info.json
+++ b/keyboards/40percentclub/ut47/info.json
@@ -2,11 +2,8 @@
  "keyboard_name": "UT47",
  "url": "",
  "maintainer": "qmk",
-  "width": 12.5,
-  "height": 4,
  "layouts": {
    "LAYOUT": {
-      "key_count": 47,
      "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Backspace", "x":11, "y":0, "w":1.5}, {"label":"LT(3) / Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2, "w":1.5}, {"label":"Z", "x":1.5, "y":2}, {"label":"X", "x":2.5, "y":2}, {"label":"C", "x":3.5, "y":2}, {"label":"V", "x":4.5, "y":2}, {"label":"B", "x":5.5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":"<", "x":8.5, "y":2}, {"label":">", "x":9.5, "y":2}, {"label":"?", "x":10.5, "y":2}, {"label":"Shift / Enter", "x":11.5, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Alt", "x":1, "y":3}, {"label":"GUI", "x":2, "y":3}, {"label":"Menu", "x":3, "y":3}, {"label":"MO(2)", "x":4, "y":3, "w":1.25}, {"x":5.25, "y":3, "w":2}, {"label":"MO(1)", "x":7.25, "y":3, "w":1.25}, {"label":"\u2190", "x":8.5, "y":3}, {"label":"\u2193", "x":9.5, "y":3}, {"label":"\u2191", "x":10.5, "y":3}, {"label":"\u2192", "x":11.5, "y":3}]
    }
  }
--- a/keyboards/40percentclub/ut47/rules.mk
+++ b/keyboards/40percentclub/ut47/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6

 # custom matrix setup
--- a/keyboards/45_ats/info.json
+++ b/keyboards/45_ats/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "45-ATS",
    "url": "",
    "maintainer": "The-Royal",
-    "width": 14.25,
-    "height": 4.25,
    "layouts": {
      "LAYOUT_split_space": {
        "layout": [
@@ -166,4 +164,3 @@
      }
    }
  }
-  
--- a/keyboards/45_ats/rules.mk
+++ b/keyboards/45_ats/rules.mk
@@ -18,5 +18,4 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
--- a/keyboards/4by3/info.json
+++ b/keyboards/4by3/info.json
@@ -2,11 +2,8 @@
    "keyboard_name": "4by3",
    "url": "https://github.com/eliassjogreen/4by3",
    "maintainer": "eliassjogreen",
-    "width": 4,
-    "height": 3,
    "layouts": {
        "LAYOUT_horizontal": {
-            "key_count": 12,
            "layout": [
                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 }, { "x": 3, "y": 0 },
                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 }, { "x": 3, "y": 1 },
@@ -14,7 +11,6 @@
            ]
        },
        "LAYOUT_vertical_right": {
-            "key_count": 12,
            "layout": [
                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 },
                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 },
@@ -23,7 +19,6 @@
            ]
        },
        "LAYOUT_vertical_left": {
-            "key_count": 12,
            "layout": [
                { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 },
                { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 },
--- a/keyboards/4pplet/aekiso60/rev_a/info.json
+++ b/keyboards/4pplet/aekiso60/rev_a/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "AEKISO60 Rev A",
    "url": "",
    "maintainer": "4pplet",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/4pplet/bootleg/info.json
+++ b/keyboards/4pplet/bootleg/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "bootleg Rev A",
    "url": "https://github.com/4pplet/bootlegs",
    "maintainer": "4pplet",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/4pplet/bootleg/rev_a/rules.mk
+++ b/keyboards/4pplet/bootleg/rev_a/rules.mk
@@ -18,5 +18,4 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover 
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
--- a/keyboards/4pplet/eagle_viper_rep/info.json
+++ b/keyboards/4pplet/eagle_viper_rep/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "Eagle/Viper Rep",
    "url": "https://github.com/4pplet/eagle_viper_rep",
    "maintainer": "4pplet",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/4pplet/steezy60/rev_a/info.json
+++ b/keyboards/4pplet/steezy60/rev_a/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "Steezy60 Rev A",
    "url": "",
    "maintainer": "4pplet",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/4pplet/waffling60/info.json
+++ b/keyboards/4pplet/waffling60/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "Waffling60 Rev A",
    "url": "https://github.com/4pplet/waffling60",
    "maintainer": "4pplet",
-    "width": 15,
-    "height": 5,
    "layouts": {
        "LAYOUT_all": {
            "layout": [
--- a/keyboards/4pplet/waffling60/rev_b/rules.mk
+++ b/keyboards/4pplet/waffling60/rev_b/rules.mk
@@ -18,5 +18,4 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
--- a/keyboards/6ball/info.json
+++ b/keyboards/6ball/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "6-Ball",
    "url": "",
    "maintainer": "qmk",
-    "width": 3,
-    "height": 3,
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/6ball/rules.mk
+++ b/keyboards/6ball/rules.mk
@@ -17,7 +17,6 @@ NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: ht
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = yes        # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.

 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
--- a/keyboards/7c8/framework/info.json
+++ b/keyboards/7c8/framework/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "Framework",
    "url": "",
    "maintainer": "stevennguyen",
-    "width": 12,
-    "height": 5,
    "layouts": {
        "LAYOUT_ortho_5x12": {
            "layout": [
--- a/keyboards/7c8/framework/rules.mk
+++ b/keyboards/7c8/framework/rules.mk
@@ -14,7 +14,6 @@ NKRO_ENABLE = no
 BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = no
 UNICODE_ENABLE = no
-BLUETOOTH_ENABLE = no
 AUDIO_ENABLE = no
 FAUXCLICKY_ENABLE = no
 LAYOUTS_HAS_RGB = no
--- a/keyboards/7skb/info.json
+++ b/keyboards/7skb/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "7skb", 
    "url": "https://salicylic-acid3.hatenablog.com/", 
    "maintainer": "Salicylic_acid3", 
-    "width": 16, 
-    "height": 5, 
    "layouts": {
        "LAYOUT": {
            "layout": [
@@ -73,4 +71,4 @@
            ]
        }
    }
-}
+}
--- a/keyboards/7skb/rules.mk
+++ b/keyboards/7skb/rules.mk
@@ -17,7 +17,6 @@ NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: ht
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes       # 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
--- a/keyboards/7splus/info.json
+++ b/keyboards/7splus/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "7splus", 
    "url": "https://salicylic-acid3.hatenablog.com/", 
    "maintainer": "Salicylic_acid3", 
-    "width": 17, 
-    "height": 6.25, 
    "layouts": {
        "LAYOUT": {
            "layout": [
--- a/keyboards/7splus/rules.mk
+++ b/keyboards/7splus/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output

 SPLIT_KEYBOARD = yes
--- a/keyboards/8pack/info.json
+++ b/keyboards/8pack/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "8-Pack",
  "url": "https://github.com/cgarcia2097/8-Pack",
  "maintainer": "Charles Garcia",
-  "width": 4,
-  "height": 2,
  "layouts": {
    "LAYOUT": {
      "layout": [
@@ -18,4 +16,4 @@
      ]
    }
  }
-}
+}
--- a/keyboards/9key/info.json
+++ b/keyboards/9key/info.json
@@ -2,8 +2,6 @@
  "keyboard_name": "9key",
  "url": "",
  "maintainer": "qmk",
-  "width": 3,
-  "height": 3,
  "layouts": {
    "LAYOUT": {
      "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}]
--- a/keyboards/9key/rules.mk
+++ b/keyboards/9key/rules.mk
@@ -17,7 +17,6 @@ NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: h
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = yes         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 TAP_DANCE_ENABLE = no

--- a/keyboards/abacus/info.json
+++ b/keyboards/abacus/info.json
@@ -2,11 +2,8 @@
    "keyboard_name": "Abacus",
    "url": "https://www.github.com/nickolaij",
    "maintainer": "nickolaij",
-    "width": 12.75,
-    "height": 4,
    "layouts": {
        "LAYOUT": {
-            "key_count": 45,
            "layout": [
                {"label":"k00", "x":0, "y":0, "w":1},
                {"label":"k01", "x":1, "y":0, "w":1},
--- a/keyboards/abacus/rules.mk
+++ b/keyboards/abacus/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
--- a/keyboards/absinthe/info.json
+++ b/keyboards/absinthe/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "absinthe",
    "url": "https://github.com/cfbender/keyboards/tree/master/absinthe",
    "maintainer": "cfbender",
-    "width": 18.25,
-    "height": 5,
    "layouts": {
        "LAYOUT_default": {
            "layout": [
--- a/keyboards/absinthe/rules.mk
+++ b/keyboards/absinthe/rules.mk
@@ -18,7 +18,6 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 ENCODER_ENABLE = yes
 RGBLIGHT_ENABLE = yes
--- a/keyboards/abstract/ellipse/info.json
+++ b/keyboards/abstract/ellipse/info.json
@@ -2,11 +2,9 @@
    "keyboard_name": "Ellipse", 
    "url": "https://abstractkb.tk/product/ellipse-rev1", 
    "maintainer": "AbstractKB", 
-    "width": 3, 
-    "height": 2.25, 
    "layouts": {
        "LAYOUT": {
            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}]
        }
    }
-}
+}
--- a/keyboards/abstract/ellipse/rev1/rules.mk
+++ b/keyboards/abstract/ellipse/rev1/rules.mk
@@ -19,6 +19,5 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 ENCODER_ENABLE = yes		# Enable support for rotary encoders
--- a/keyboards/acekeyboard/titan60/info.json
+++ b/keyboards/acekeyboard/titan60/info.json
@@ -2,8 +2,6 @@
    "keyboard_name": "Titan60",
    "url": "https://acekeyboard.co/",
    "maintainer": "keebnewb",
-    "width": 14,
-    "height": 5,
    "layouts": {
      "LAYOUT_60_ansi": {
        "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
--- a/keyboards/acekeyboard/titan60/rules.mk
+++ b/keyboards/acekeyboard/titan60/rules.mk
@@ -18,5 +18,4 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Drashna Jaelre	169d5bd21d	[Bug] Fix IS31fl3741 driver to accept 1 or 2 addresses (#14451 ) Co-authored-by: Joel Challis <git@zvecr.com>	2021-09-15 10:07:08 -07:00
Drashna Jaelre	7e36a81383	[Keyboard] Fix Boop65 rgb compile issues (#14444 )	2021-09-15 01:31:25 -07:00
Dan Nixon	a2d43ca024	[Keyboard] Add Aya keyboard (#14378 ) Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-14 23:56:12 -07:00
moyi4681	c2f2f9bfd3	[Keyboard] add kbd75 hotswap keyboard (#14283 ) Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-14 23:00:48 -07:00
moyi4681	07a4e3b176	[Keyboard] add boop65 rgb keyboard (#14166 ) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-14 22:20:34 -07:00
Wolf Van Herreweghe	344a73fddd	[Keyboard] Add KeyBee65 (#14163 ) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>	2021-09-14 22:20:07 -07:00
bomb	3435289052	[Keyboard] Add Mach80 for Melgeek (#14076 ) Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>	2021-09-14 22:09:49 -07:00
jmcwilliams403	fcebd17267	[Keyboard] added 64_ansi_split_bs layout (#13776 )	2021-09-14 21:44:41 -07:00
ぺらねこ	830fb5fd05	[Keyboard] Update peranekofactory/tone/rev2/rev2.h (#13610 ) I changed the description that was mistakenly described as the same wiring as Rev1 to the correct description.	2021-09-14 21:21:31 -07:00
vsrivastava	657323a206	[Docs] fixed incorrect amount of steps for oled usage (#13519 ) changed line 21 from saying "three steps" to "two steps" as there are only two steps Co-authored-by: feynmantf <46390109+feynmantf@users.noreply.github.com>	2021-09-14 21:12:37 -07:00
drhigsby	00c60c9410	[Keyboard] Dubba175 Default Keymap Update (#13486 ) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: ridingqwerty <george.g.koenig@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-14 20:55:09 -07:00
Carlos Martins	0dfc1db74a	[Keyboard] VIA support with top facing LEDs and underglow (#12814 ) Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-14 20:38:13 -07:00
Álvaro A. Volpato	eee553337a	Add initial support for M65S (#14027 ) * Add initial support for M65S * Remove LTO_ENABLE from rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Removed defs in rules.mk, remove EEPROM debug code in m65s.c Co-authored-by: Drashna Jaelre <drashna@live.com>	2021-09-14 07:01:23 +10:00
stanrc85	ca626f59a7	[Keymap] Userspace updates (#14418 )	2021-09-13 13:15:10 -07:00
Drashna Jaelre	2b956e6eb9	[Keyboard] fix mokey63 keymaps (#14424 )	2021-09-13 19:30:37 +01:00
Drashna Jaelre	ab34ecb669	Apply `TAP_CODE_DELAY` to Tap Dance key sequences (#14412 ) * Add support to tap dances * Move default tap code defines to header file	2021-09-13 00:48:11 +01:00
umi	10362777a5	update compatible_microcontrollers.md translation (#14401 )	2021-09-12 16:08:22 +09:00
Xelus22	5ae2ae8a36	[Bug] Keymap Fixes - lyra and reviung39 (#14400 )	2021-09-11 23:21:56 -07:00
Drashna Jaelre	f6a67c10bd	[Keyboard] Fix Redox Media compilation errors (#14345 ) Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-11 23:21:28 -07:00
Ryan	5af1799735	Remove BLUETOOTH_ENABLE from keyboard-level rules.mk (#14379 )	2021-09-12 15:27:29 +10:00
Ryan	4791cfae1a	Remove width, height and key_count from info.json (#14274 )	2021-09-12 14:04:56 +10:00
X-Bows Tech	f1084712d7	[Keyboard] Update lighting effects for xbows ranger keyboard (#14318 )	2021-09-11 14:37:43 -07:00
Ananya Kirti	85b052bdd4	[Keyboard] add support for Bobpad (#13989 ) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-11 14:36:58 -07:00
John Mueller	22dd68520b	[Keyboard] Add 3keyecosystem and 2key2 keyboard (#14023 ) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-11 07:33:48 -07:00
alittlepeace	99d465bee0	[keyboard] Add hotswap YMDK Wings (#14176 ) * Add files via upload * Update keyboards/ymdk/wingshs/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Delete wingshs.json * Update keyboards/ymdk/wingshs/config.h Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/ymdk/wingshs/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/ymdk/wingshs/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-11 07:33:13 -07:00
john-ezra	5eb500a877	[Keymap] Add john-ezra Kyria Keymap (#14338 ) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-11 07:31:24 -07:00
Seth	35bff470f7	[Keyboard] Update rocketboard_16 with most of its final features (#12537 )	2021-09-11 00:32:29 -07:00
rhmokey	5f94191075	[Keyboard] Add mokey63 (#14357 ) Co-authored-by: Drashna Jaelre <drashna@live.com>	2021-09-10 23:24:37 -07:00
Sebastian Laube	9630a7bde2	[Keyboard] added KPs BM43 RGB board (#13888 ) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-10 23:01:14 -07:00
AnthonyNguyen168	047291728d	[Keyboard] New PCB Canary60RGB from CanaryTeam (#14321 ) Co-authored-by: Ryan <fauxpark@gmail.com>	2021-09-10 22:49:45 -07:00
yfuku	46f15cd1a5	[Keyboard] owl8 bugfix (#14020 )	2021-09-10 21:59:28 -07:00
AKiwi92	d0b1d9f548	[Keyboard] KiwiKeebs Macro V2 (QMK/VIA) and update to V1 (#13499 ) Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ash <ash@splitpixel.co.uk>	2021-09-10 21:20:43 -07:00
rarick	6213989c32	[Keymap] Add keymap for crkbd/rarick (#13240 ) * Added new keymap for crkbd/rarick * Delete flash.sh Deleted rarick crkbd flashing script, as it will not be used by most users. * Applied feedback, and fixed build error caused by builder updates * Update keyboards/crkbd/keymaps/rarick/config.h Removed USE_MATRIX_I2C, no longer used. Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>	2021-09-10 20:52:17 -07:00
Zac Moulton	d7747a2d70	[Keymap] moults31 userspace and keymaps (#12025 )	2021-09-10 18:56:50 -07:00
Xelus22	759d1927f0	[Keyboard] Add RS60 (#14073 ) * initial rs60 * update * remove * Include rs60.h Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * List form readme. Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * add layout Co-authored-by: Joel Challis <git@zvecr.com> * add license Co-authored-by: Joel Challis <git@zvecr.com> * 2021 update Co-authored-by: Joel Challis <git@zvecr.com> * add license Co-authored-by: Joel Challis <git@zvecr.com> * sigprof suggested changes * Remove redundant define Co-authored-by: Ryan <fauxpark@gmail.com> * Fixup readme Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update keyboards/xelus/rs60/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>	2021-09-10 20:14:39 +01:00
Ryan	7277f1febe	Remove BLUETOOTH_ENABLE from defaultish keymaps (#14375 )	2021-09-10 14:11:17 +01:00