Merge remote-tracking branch 'origin/master' into develop

6 files changed, 553 insertions, 0 deletions

diff --git a/keyboards/keebsforall/freebird75/info.json b/keyboards/keebsforall/freebird75/info.json
new file mode 100644
index 0000000000..9088f2c0f3
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/info.json
@@ -0,0 +1,463 @@
+{
+    "manufacturer": "KeebsForAll",
+    "keyboard_name": "freebird75",
+    "maintainer": "Elliot Powell",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": ["D0", "D1", "D2", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "B7"],
+        "rows": ["C7", "C6", "B6", "B5", "B4", "D7"]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x7575",
+        "vid": "0x6B66"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "matrix": [0,0],
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,1],
+                    "x": 1.25,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,2],
+                    "x": 2.25,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,3],
+                    "x": 3.25,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,4],
+                    "x": 4.25,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,5],
+                    "x": 5.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,6],
+                    "x": 6.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,7],
+                    "x": 7.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,8],
+                    "x": 8.5,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,9],
+                    "x": 9.75,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,10],
+                    "x": 10.75,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,11],
+                    "x": 11.75,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,12],
+                    "x": 12.75,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,13],
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "matrix": [0,14],
+                    "x": 15.25,
+                    "y": 0
+                },
+                {
+                    "matrix": [1,0],
+                    "x": 0,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,1],
+                    "x": 1,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,2],
+                    "x": 2,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,3],
+                    "x": 3,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,4],
+                    "x": 4,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,5],
+                    "x": 5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,6],
+                    "x": 6,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,7],
+                    "x": 7,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,8],
+                    "x": 8,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,9],
+                    "x": 9,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,10],
+                    "x": 10,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,11],
+                    "x": 11,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,12],
+                    "x": 12,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,13],
+                    "x": 13,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [4,14],
+                    "x": 14,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [1,14],
+                    "x": 15.25,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [2,0],
+                    "x": 0,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "matrix": [2,1],
+                    "x": 1.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,2],
+                    "x": 2.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,3],
+                    "x": 3.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,4],
+                    "x": 4.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,5],
+                    "x": 5.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,6],
+                    "x": 6.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,7],
+                    "x": 7.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,8],
+                    "x": 8.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,9],
+                    "x": 9.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,10],
+                    "x": 10.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,11],
+                    "x": 11.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,12],
+                    "x": 12.5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [2,13],
+                    "x": 13.5,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "matrix": [2,14],
+                    "x": 15.25,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [3,0],
+                    "x": 0,
+                    "y": 3.25,
+                    "w": 1.75
+                },
+                {
+                    "matrix": [3,1],
+                    "x": 1.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,2],
+                    "x": 2.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,3],
+                    "x": 3.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,4],
+                    "x": 4.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,5],
+                    "x": 5.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,6],
+                    "x": 6.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,7],
+                    "x": 7.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,8],
+                    "x": 8.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,9],
+                    "x": 9.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,10],
+                    "x": 10.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,11],
+                    "x": 11.75,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [3,13],
+                    "x": 12.75,
+                    "y": 3.25,
+                    "w": 2.25
+                },
+                {
+                    "matrix": [3,14],
+                    "x": 15.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [4,0],
+                    "x": 0,
+                    "y": 4.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [4,1],
+                    "x": 1.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,2],
+                    "x": 2.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,3],
+                    "x": 3.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,4],
+                    "x": 4.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,5],
+                    "x": 5.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,6],
+                    "x": 6.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,7],
+                    "x": 7.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,8],
+                    "x": 8.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,9],
+                    "x": 9.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,10],
+                    "x": 10.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,11],
+                    "x": 11.25,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [4,12],
+                    "x": 12.25,
+                    "y": 4.25,
+                    "w": 1.75
+                },
+                {
+                    "matrix": [4,13],
+                    "x": 14.25,
+                    "y": 4.5
+                },
+                {
+                    "matrix": [5,0],
+                    "x": 0,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [5,1],
+                    "x": 1.25,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [5,2],
+                    "x": 2.5,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [5,6],
+                    "x": 3.75,
+                    "y": 5.25,
+                    "w": 6.25
+                },
+                {
+                    "matrix": [5,9],
+                    "x": 10,
+                    "y": 5.25
+                },
+                {
+                    "matrix": [5,10],
+                    "x": 11,
+                    "y": 5.25
+                },
+                {
+                    "matrix": [5,11],
+                    "x": 12,
+                    "y": 5.25
+                },
+                {
+                    "matrix": [5,12],
+                    "x": 13.25,
+                    "y": 5.5
+                },
+                {
+                    "matrix": [5,13],
+                    "x": 14.25,
+                    "y": 5.5
+                },
+                {
+                    "matrix": [5,14],
+                    "x": 15.25,
+                    "y": 5.5
+                }
+            ]
+
+        }
+    }
+}
diff --git a/keyboards/keebsforall/freebird75/keymaps/default/keymap.c b/keyboards/keebsforall/freebird75/keymaps/default/keymap.c
new file mode 100644
index 0000000000..45540d525f
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/keymaps/default/keymap.c
@@ -0,0 +1,17 @@
+// Copyright 2022 Elliot Powell (@Elliot Powell)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+     */
+    [0] = LAYOUT(
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_SCRL,
+
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/keyboards/keebsforall/freebird75/keymaps/via/keymap.c b/keyboards/keebsforall/freebird75/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9908b1f762
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+// Copyright 2022 Elliot Powell (@Elliot Powell)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+     /*
+     */
+[0] = LAYOUT( /* Base */
+    KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_SCRL,
+
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,  KC_HOME,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,          KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT(  /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT( /* Empty for dynamic keymaps */
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/keebsforall/freebird75/keymaps/via/rules.mk b/keyboards/keebsforall/freebird75/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keebsforall/freebird75/readme.md b/keyboards/keebsforall/freebird75/readme.md
new file mode 100644
index 0000000000..80be9266b0
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/readme.md
@@ -0,0 +1,27 @@
+# Freebird 75
+
+![fb75](https://i.imgur.com/fGRQZ2gh.jpg)
+
+The Freebird75 is the latest addition to the Freebird line at KeebsForAll, a series aiming to provide a set of good quality keyboards at an affordable price
+
+* Keyboard Maintainer: [Elliot Powell](https://github.com/e11i0t23)
+* Hardware Supported: Freebird75
+* Hardware Availability: [KeebsForAll](https://keebsforall.com/products/freebird75)
+
+Make example for this keyboard (after setting up your build environment):
+
+    qmk compile -kb keebsforall/freebird75 -km via
+
+Flashing example for this keyboard:
+
+    qmk flash -kb keebsforall/freebird75 -km via
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/keebsforall/freebird75/rules.mk b/keyboards/keebsforall/freebird75/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/keebsforall/freebird75/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank