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

10 files changed, 542 insertions, 0 deletions

diff --git a/keyboards/rect44/config.h b/keyboards/rect44/config.h
new file mode 100644
index 0000000000..d76f5f068f
--- /dev/null
+++ b/keyboards/rect44/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2020-2021 koshinoya
+ *
+ * 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       0xFEED
+#define PRODUCT_ID      0x4DD7
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    koshinoya
+#define PRODUCT         Rect44
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+/* Key matrix pins */
+#define MATRIX_ROW_PINS { D3, D2, F5, F4 }
+#define MATRIX_COL_PINS { F6, F7, B1, B3, B2, D1, D0, D4, C6, D7, E6, B4, B5 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN B6
+#define RGBLED_NUM 12
+#define RGBLIGHT_ANIMATIONS
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/keyboards/rect44/info.json b/keyboards/rect44/info.json
new file mode 100644
index 0000000000..9bf4b6eb52
--- /dev/null
+++ b/keyboards/rect44/info.json
@@ -0,0 +1,171 @@
+{
+    "keyboard_name": "rect44",
+    "url": "",
+    "maintainer": "koshinoya",
+    "width": 14,
+    "height": 4,
+    "layouts": {
+        "LAYOUT_ansi_47key": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"Q", "x":1.5, "y":0},
+                {"label":"W", "x":2.5, "y":0},
+                {"label":"E", "x":3.5, "y":0},
+                {"label":"R", "x":4.5, "y":0},
+                {"label":"T", "x":5.5, "y":0},
+                {"label":"Y", "x":6.5, "y":0},
+                {"label":"U", "x":7.5, "y":0},
+                {"label":"I", "x":8.5, "y":0},
+                {"label":"O", "x":9.5, "y":0},
+                {"label":"P", "x":10.5, "y":0},
+                {"label":"-", "x":11.5, "y":0},
+                {"label":"Bs", "x":12.5, "y":0, "w":1.5},
+
+                {"label":"Ctrl", "x":0, "y":1, "w":1.75},
+                {"label":"A", "x":1.75, "y":1},
+                {"label":"S", "x":2.75, "y":1},
+                {"label":"D", "x":3.75, "y":1},
+                {"label":"F", "x":4.75, "y":1},
+                {"label":"G", "x":5.75, "y":1},
+                {"label":"H", "x":6.75, "y":1},
+                {"label":"J", "x":7.75, "y":1},
+                {"label":"K", "x":8.75, "y":1},
+                {"label":"L", "x":9.75, "y":1},
+                {"label":";", "x":10.75, "y":1},
+                {"label":"Enter", "x":11.75, "y":1, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":2, "w":2.25},
+                {"label":"Z", "x":2.25, "y":2},
+                {"label":"X", "x":3.25, "y":2},
+                {"label":"C", "x":4.25, "y":2},
+                {"label":"V", "x":5.25, "y":2},
+                {"label":"B", "x":6.25, "y":2},
+                {"label":"N", "x":7.25, "y":2},
+                {"label":"M", "x":8.25, "y":2},
+                {"label":",", "x":9.25, "y":2},
+                {"label":".", "x":10.25, "y":2},
+                {"label":"/", "x":11.25, "y":2},
+                {"label":"Shift", "x":12.25, "y":2, "w":1.75},
+
+                {"label":"Ctrl", "x":0, "y":3, "w":1.25},
+                {"label":"Gui", "x":1.25, "y":3, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":3, "w":1.25},
+                {"label":"Fn1", "x":3.75, "y":3, "w":2.25},
+                {"label":"Space", "x":6, "y":3, "w":2.75},
+                {"label":"Alt", "x":8.75, "y":3, "w":1.25},
+                {"label":"Fn2", "x":10, "y":3},
+                {"label":"\u2190", "x":11, "y":3},
+                {"label":"\u2193", "x":12, "y":3},
+                {"label":"\u2192", "x":13, "y":3}
+            ]
+        },
+
+        "LAYOUT_ansi_44key": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"Q", "x":1.5, "y":0},
+                {"label":"W", "x":2.5, "y":0},
+                {"label":"E", "x":3.5, "y":0},
+                {"label":"R", "x":4.5, "y":0},
+                {"label":"T", "x":5.5, "y":0},
+                {"label":"Y", "x":6.5, "y":0},
+                {"label":"U", "x":7.5, "y":0},
+                {"label":"I", "x":8.5, "y":0},
+                {"label":"O", "x":9.5, "y":0},
+                {"label":"P", "x":10.5, "y":0},
+                {"label":"-", "x":11.5, "y":0},
+                {"label":"Bs", "x":12.5, "y":0, "w":1.5},
+
+                {"label":"Ctrl", "x":0, "y":1, "w":1.75},
+                {"label":"A", "x":1.75, "y":1},
+                {"label":"S", "x":2.75, "y":1},
+                {"label":"D", "x":3.75, "y":1},
+                {"label":"F", "x":4.75, "y":1},
+                {"label":"G", "x":5.75, "y":1},
+                {"label":"H", "x":6.75, "y":1},
+                {"label":"J", "x":7.75, "y":1},
+                {"label":"K", "x":8.75, "y":1},
+                {"label":"L", "x":9.75, "y":1},
+                {"label":";", "x":10.75, "y":1},
+                {"label":"Enter", "x":11.75, "y":1, "w":2.25},
+
+                {"label":"Shift", "x":0, "y":2, "w":2.25},
+                {"label":"Z", "x":2.25, "y":2},
+                {"label":"X", "x":3.25, "y":2},
+                {"label":"C", "x":4.25, "y":2},
+                {"label":"V", "x":5.25, "y":2},
+                {"label":"B", "x":6.25, "y":2},
+                {"label":"N", "x":7.25, "y":2},
+                {"label":"M", "x":8.25, "y":2},
+                {"label":",", "x":9.25, "y":2},
+                {"label":".", "x":10.25, "y":2},
+                {"label":"Shift", "x":11.25, "y":2, "w":2.75},
+
+                {"label":"Ctrl", "x":0, "y":3, "w":1.25},
+                {"label":"Gui", "x":1.25, "y":3, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":3, "w":1.25},
+                {"label":"Space", "x":3.75, "y":3, "w":6.25},
+                {"label":"\u2190", "x":10, "y":3},
+                {"label":"\u2193", "x":11, "y":3},
+                {"label":"\u2191", "x":12, "y":3},
+                {"label":"\u2192", "x":13, "y":3}
+            ]
+        },
+
+        "LAYOUT_iso_48key": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"Q", "x":1.5, "y":0},
+                {"label":"W", "x":2.5, "y":0},
+                {"label":"E", "x":3.5, "y":0},
+                {"label":"R", "x":4.5, "y":0},
+                {"label":"T", "x":5.5, "y":0},
+                {"label":"Y", "x":6.5, "y":0},
+                {"label":"U", "x":7.5, "y":0},
+                {"label":"I", "x":8.5, "y":0},
+                {"label":"O", "x":9.5, "y":0},
+                {"label":"P", "x":10.5, "y":0},
+                {"label":"Bs", "x":11.5, "y":0},
+                {"label":"Enter", "x":12.75, "y":0, "w":1.25, "h":2},
+
+                {"label":"Ctrl", "x":0, "y":1, "w":1.75},
+                {"label":"A", "x":1.75, "y":1},
+                {"label":"S", "x":2.75, "y":1},
+                {"label":"D", "x":3.75, "y":1},
+                {"label":"F", "x":4.75, "y":1},
+                {"label":"G", "x":5.75, "y":1},
+                {"label":"H", "x":6.75, "y":1},
+                {"label":"J", "x":7.75, "y":1},
+                {"label":"K", "x":8.75, "y":1},
+                {"label":"L", "x":9.75, "y":1},
+                {"label":";", "x":10.75, "y":1},
+                {"label":"'", "x":11.75, "y":1},
+
+                {"label":"Shift", "x":0, "y":2, "w":1.25},
+                {"label":"", "x":1.25, "y":2},
+                {"label":"Z", "x":2.25, "y":2},
+                {"label":"X", "x":3.25, "y":2},
+                {"label":"C", "x":4.25, "y":2},
+                {"label":"V", "x":5.25, "y":2},
+                {"label":"B", "x":6.25, "y":2},
+                {"label":"N", "x":7.25, "y":2},
+                {"label":"M", "x":8.25, "y":2},
+                {"label":",", "x":9.25, "y":2},
+                {"label":".", "x":10.25, "y":2},
+                {"label":"/", "x":11.25, "y":2},
+                {"label":"Shift", "x":12.25, "y":2, "w":1.75},
+
+                {"label":"Ctrl", "x":0, "y":3, "w":1.25},
+                {"label":"Gui", "x":1.25, "y":3, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":3, "w":1.25},
+                {"label":"Fn1", "x":3.75, "y":3, "w":2.25},
+                {"label":"Space", "x":6, "y":3, "w":2.75},
+                {"label":"Alt", "x":8.75, "y":3, "w":1.25},
+                {"label":"Fn2", "x":10, "y":3},
+                {"label":"\u2190", "x":11, "y":3},
+                {"label":"\u2193", "x":12, "y":3},
+                {"label":"\u2192", "x":13, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/rect44/keymaps/ansi_44key/keymap.c b/keyboards/rect44/keymaps/ansi_44key/keymap.c
new file mode 100644
index 0000000000..a9dd9aab7e
--- /dev/null
+++ b/keyboards/rect44/keymaps/ansi_44key/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2020-2021 koshinoya
+ *
+ * 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
+
+enum layer_number {
+    _BASE = 0,
+    _FN1,
+    _FN2
+};
+
+// Aliases
+#define KC_SPFN1  LT(_FN1,KC_SPC)
+#define KC_LCTAB  LCTL_T(KC_TAB)
+#define KC_LCDEL  LCTL_T(KC_DEL)
+#define KC_RSFSL  RSFT_T(KC_SLSH)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_ansi_44key(
+        KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_MINS,  KC_BSPC,
+        KC_LCTAB, KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,            KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,             KC_RSFSL,
+        KC_LCDEL, KC_LGUI,  KC_LALT,                      KC_SPFN1,                               KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT
+    ),
+    [_FN1] = LAYOUT_ansi_44key(
+        KC_GRV,   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_TRNS,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,               KC_EQL,
+        KC_TRNS,            KC_APP,   MO(_FN2), KC_NO,    KC_NO,    KC_LBRC,  KC_RBRC,  KC_QUOT,  KC_TRNS,  KC_TRNS,            KC_BSLS,
+        KC_INS,   KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
+    ),
+    [_FN2] = LAYOUT_ansi_44key(
+        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_NO,
+        KC_CAPS,  RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,              KC_NO,
+        KC_TRNS,            KC_NO,    KC_TRNS,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,              KC_NO,
+        KC_LCTL,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_NO,    KC_NO,    KC_NO,    KC_NO
+    )
+};
diff --git a/keyboards/rect44/keymaps/ansi_47key/keymap.c b/keyboards/rect44/keymaps/ansi_47key/keymap.c
new file mode 100644
index 0000000000..9d11c2b7fe
--- /dev/null
+++ b/keyboards/rect44/keymaps/ansi_47key/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2020-2021 koshinoya
+ *
+ * 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
+
+enum layer_number {
+    _BASE = 0,
+    _FN1,
+    _FN2
+};
+
+// Aliases
+#define KC_SPFN1  LT(_FN1,KC_SPC)
+#define KC_LCTAB  LCTL_T(KC_TAB)
+#define KC_LCDEL  LCTL_T(KC_DEL)
+#define KC_RSFUP  RSFT_T(KC_UP)
+#define KC_RSFSP  RSFT_T(KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_ansi_47key(
+        KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,    KC_T,      KC_Y,     KC_U,     KC_I,    KC_O,      KC_P,     KC_MINS,  KC_BSPC,
+        KC_LCTAB, KC_A,     KC_S,     KC_D,     KC_F,    KC_G,      KC_H,     KC_J,     KC_K,    KC_L,      KC_SCLN,            KC_ENT,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,    KC_V,      KC_B,     KC_N,     KC_M,    KC_COMM,   KC_DOT,   KC_SLSH,  KC_RSFUP,
+        KC_LCDEL, KC_LGUI,  KC_LALT,  KC_SPFN1,                     KC_RSFSP,           KC_RALT, MO(_FN2),  KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+    [_FN1] = LAYOUT_ansi_47key(
+        KC_GRV,   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_TRNS,  KC_1,     KC_2,     KC_3,     KC_4,    KC_5,      KC_6,     KC_7,     KC_8,    KC_9,      KC_0,               KC_EQL,
+        KC_TRNS,            KC_APP,   KC_NO,    KC_NO,   KC_NO,     KC_LBRC,  KC_RBRC,  KC_QUOT, KC_TRNS,   KC_TRNS,  KC_BSLS,  KC_PGUP,
+        KC_INS,   KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,            KC_TRNS, KC_NO,     KC_HOME,  KC_PGDN,  KC_END
+    ),
+    [_FN2] = LAYOUT_ansi_47key(
+        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI, KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_PSCR,   KC_SLCK,  KC_PAUS,  KC_NO,
+        KC_CAPS,  RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD, KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,              KC_NO,
+        KC_TRNS,            KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,    KC_NO,    KC_NO,
+        KC_LCTL,  KC_TRNS,  KC_TRNS,  KC_NO,                        KC_TRNS,            KC_TRNS, KC_TRNS,   KC_NO,    KC_NO,    KC_NO
+    )
+};
diff --git a/keyboards/rect44/keymaps/default/keymap.c b/keyboards/rect44/keymaps/default/keymap.c
new file mode 100644
index 0000000000..cc7afe7772
--- /dev/null
+++ b/keyboards/rect44/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2020-2021 koshinoya
+ *
+ * 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
+
+enum layer_number {
+    _BASE = 0,
+    _FN1,
+    _FN2
+};
+
+// Aliases
+#define KC_SPFN1  LT(_FN1,KC_SPC)
+#define KC_LCTAB  LCTL_T(KC_TAB)
+#define KC_RSFSL  RSFT_T(KC_SLSH)
+#define KC_RSFSP  RSFT_T(KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_all(
+        KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_MINS,  KC_BSPC,
+        KC_LCTAB, 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_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFSL,
+        KC_LCTL,  KC_LGUI,  KC_LALT,  KC_SPFN1,           KC_SPFN1, KC_RSFSP,           KC_RALT,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT
+    ),
+    [_FN1] = LAYOUT_all(
+        KC_GRV,   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_TRNS,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_BSPC,  KC_EQL,
+        KC_TRNS,  KC_F12,   KC_APP,   MO(_FN2), KC_NO,    KC_NO,    KC_LBRC,  KC_RBRC,  KC_QUOT,  KC_TRNS,  KC_TRNS,  KC_BSLS,  KC_BSLS,
+        KC_INS,   KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END
+    ),
+    [_FN2] = LAYOUT_all(
+        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_PSCR,  KC_SLCK,  KC_PAUS, KC_NO,
+        KC_CAPS,  RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,
+        KC_TRNS,  KC_NO,    KC_NO,    KC_TRNS,  KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,
+        KC_LCTL,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,            KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO
+    )
+};
diff --git a/keyboards/rect44/keymaps/iso_48key/keymap.c b/keyboards/rect44/keymaps/iso_48key/keymap.c
new file mode 100644
index 0000000000..7d034af9fe
--- /dev/null
+++ b/keyboards/rect44/keymaps/iso_48key/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2020-2021 koshinoya
+ *
+ * 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
+
+enum layer_number {
+    _BASE = 0,
+    _FN1,
+    _FN2
+};
+
+// Aliases
+#define KC_SPFN1  LT(_FN1,KC_SPC)
+#define KC_LCTAB  LCTL_T(KC_TAB)
+#define KC_RSFUP  RSFT_T(KC_UP)
+#define KC_RSFSP  RSFT_T(KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_iso_48key(
+        KC_ESC,   KC_Q,     KC_W,     KC_E,     KC_R,    KC_T,      KC_Y,     KC_U,     KC_I,    KC_O,      KC_P,     KC_BSPC,
+        KC_LCTAB, 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_LSFT,  KC_NUBS,  KC_Z,     KC_X,     KC_C,    KC_V,      KC_B,     KC_N,     KC_M,    KC_COMM,   KC_DOT,   KC_SLSH,  KC_RSFUP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,  KC_SPFN1,                     KC_RSFSP,           KC_RALT, MO(_FN2),  KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+    [_FN1] = LAYOUT_iso_48key(
+        KC_GRV,   KC_F1,    KC_F2,    KC_F3,    KC_F4,   KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,     KC_F10,   KC_DEL,
+        KC_TRNS,  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_TRNS,  KC_NO,    KC_APP,   KC_F11,   KC_F12,  KC_NO,     KC_LBRC,  KC_RBRC,  KC_NUHS, KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_PGUP,
+        KC_INS,   KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,            KC_TRNS, KC_TRNS,   KC_HOME,  KC_PGDN,  KC_END
+    ),
+    [_FN2] = LAYOUT_iso_48key(
+        KC_NO,    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI, KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_PSCR,   KC_SLCK,  KC_PAUS,
+        KC_CAPS,  RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD, KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,    KC_NO,    KC_NO,
+        KC_TRNS,  KC_NO,    KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,    KC_NO,    KC_NO,   KC_NO,     KC_NO,    KC_NO,    KC_NO,
+        KC_LCTL,  KC_TRNS,  KC_TRNS,  KC_NO,                        KC_TRNS,            KC_TRNS, KC_TRNS,   KC_NO,    KC_NO,    KC_NO
+    )
+};
diff --git a/keyboards/rect44/readme.md b/keyboards/rect44/readme.md
new file mode 100644
index 0000000000..d1e00988f3
--- /dev/null
+++ b/keyboards/rect44/readme.md
@@ -0,0 +1,20 @@
+# Rect44
+
+![Rect44](https://i.imgur.com/TWXGnfml.jpg)
+
+A 40% keyboard with various layouts.
+Includes hot-swap switch sockets and bended 1.5mm stainless sheet metal case.
+
+* Keyboard Maintainer: [koshinoya](https://github.com/koshinoya)
+* Hardware Supported: Rect44 PCB and case.
+* Hardware Availability: [BOOTH](https://koshinoya.booth.pm/items/1856336)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rect44:default
+
+Flashing example for this keyboard:
+
+    make rect44:default:flash
+
+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).
diff --git a/keyboards/rect44/rect44.c b/keyboards/rect44/rect44.c
new file mode 100644
index 0000000000..b36aa7d40d
--- /dev/null
+++ b/keyboards/rect44/rect44.c
@@ -0,0 +1,17 @@
+/* Copyright 2020-2021 koshinoya
+ *
+ * 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 "rect44.h"
diff --git a/keyboards/rect44/rect44.h b/keyboards/rect44/rect44.h
new file mode 100644
index 0000000000..3de310754f
--- /dev/null
+++ b/keyboards/rect44/rect44.h
@@ -0,0 +1,71 @@
+/* Copyright 2020-2021 koshinoya
+ *
+ * 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 "quantum.h"
+
+#define LAYOUT_all( \
+      A00, A01, A02, A03, A04,   A05, A06, A07,   A08, A09, A10, A11, A12, \
+      B00, B01, B02, B03, B04,   B05, B06, B07,   B08, B09, B10, B11, B12, \
+      C00, C01, C02, C03, C04,   C05, C06, C07,   C08, C09, C10, C11, C12, \
+      D00, D01, D02, D03,        D05, D06,        D08, D09, D10, D11, D12 \
+) \
+{ \
+    { A00, A01, A02, A03, A04,   A05, A06, A07,   A08, A09, A10, A11, A12 }, \
+    { B00, B01, B02, B03, B04,   B05, B06, B07,   B08, B09, B10, B11, B12 }, \
+    { C00, C01, C02, C03, C04,   C05, C06, C07,   C08, C09, C10, C11, C12 }, \
+    { D00, D01, D02, D03, KC_NO, D05, D06, KC_NO, D08, D09, D10, D11, D12 } \
+}
+
+#define LAYOUT_ansi_44key( \
+      A00, A01,   A02, A03,   A04,   A05, A06,   A07,   A08,   A09, A10, A11,   A12, \
+      B00, B01,   B02, B03,   B04,   B05, B06,   B07,   B08,   B09, B10,        B12, \
+      C00,        C02, C03,   C04,   C05, C06,   C07,   C08,   C09, C10,        C12, \
+      D00, D01,   D02,               D05,                      D09, D10, D11,   D12 \
+) \
+{ \
+    { A00, A01,   A02, A03,   A04,   A05, A06,   A07,   A08,   A09, A10, A11,   A12 }, \
+    { B00, B01,   B02, B03,   B04,   B05, B06,   B07,   B08,   B09, B10, KC_NO, B12 }, \
+    { C00, KC_NO, C02, C03,   C04,   C05, C06,   C07,   C08,   C09, C10, KC_NO, C12 }, \
+    { D00, D01,   D02, KC_NO, KC_NO, D05, KC_NO, KC_NO, KC_NO, D09, D10, D11,   D12 } \
+}
+
+#define LAYOUT_ansi_47key( \
+      A00, A01,   A02, A03, A04,   A05,   A06, A07,   A08, A09, A10, A11,   A12, \
+      B00, B01,   B02, B03, B04,   B05,   B06, B07,   B08, B09, B10,        B12, \
+      C00,        C02, C03, C04,   C05,   C06, C07,   C08, C09, C10, C11,   C12, \
+      D00, D01,   D02, D03,               D06,        D08, D09, D10, D11,   D12 \
+) \
+{ \
+    { A00, A01,   A02, A03, A04,   A05,   A06, A07,   A08, A09, A10, A11,   A12 }, \
+    { B00, B01,   B02, B03, B04,   B05,   B06, B07,   B08, B09, B10, KC_NO, B12 }, \
+    { C00, KC_NO, C02, C03, C04,   C05,   C06, C07,   C08, C09, C10, C11,   C12 }, \
+    { D00, D01,   D02, D03, KC_NO, KC_NO, D06, KC_NO, D08, D09, D10, D11,   D12 } \
+}
+
+#define LAYOUT_iso_48key( \
+      A00, A01, A02, A03, A04,   A05,   A06, A07,   A08, A09, A10, A11,      \
+      B00, B01, B02, B03, B04,   B05,   B06, B07,   B08, B09, B10, B11, B12, \
+      C00, C01, C02, C03, C04,   C05,   C06, C07,   C08, C09, C10, C11, C12, \
+      D00, D01, D02, D03,               D06,        D08, D09, D10, D11, D12 \
+) \
+{ \
+    { A00, A01, A02, A03, A04,   A05,   A06, A07,   A08, A09, A10, A11, KC_NO }, \
+    { B00, B01, B02, B03, B04,   B05,   B06, B07,   B08, B09, B10, B11, B12   }, \
+    { C00, C01, C02, C03, C04,   C05,   C06, C07,   C08, C09, C10, C11, C12   }, \
+    { D00, D01, D02, D03, KC_NO, KC_NO, D06, KC_NO, D08, D09, D10, D11, D12   } \
+}
diff --git a/keyboards/rect44/rules.mk b/keyboards/rect44/rules.mk
new file mode 100644
index 0000000000..806a19af38
--- /dev/null
+++ b/keyboards/rect44/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # 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 = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output