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

20 files changed, 655 insertions, 0 deletions

diff --git a/keyboards/cozykeys/bloomer/bloomer.c b/keyboards/cozykeys/bloomer/bloomer.c
new file mode 100644
index 0000000000..b8612504b1
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/bloomer.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 Paul Ewing
+
+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 "bloomer.h"
diff --git a/keyboards/cozykeys/bloomer/bloomer.h b/keyboards/cozykeys/bloomer/bloomer.h
new file mode 100644
index 0000000000..f85b80889f
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/bloomer.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2021 Paul Ewing
+
+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
+
+#if defined(KEYBOARD_cozykeys_bloomer_v2)
+    #include "v2.h"
+#elif defined(KEYBOARD_cozykeys_bloomer_v3)
+    #include "v3.h"
+#endif
diff --git a/keyboards/cozykeys/bloomer/config.h b/keyboards/cozykeys/bloomer/config.h
new file mode 100644
index 0000000000..0f285b4d0e
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/config.h
@@ -0,0 +1,53 @@
+/*
+Copyright 2021 Paul Ewing
+
+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   0x1191
+#define MANUFACTURER CozyKeys
+#define PRODUCT      Bloomer
+
+// Key matrix size
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+// Enable RGB backlight
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN D7
+#define RGBLED_NUM 12
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 255
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_BREATHE_TABLE_SIZE    256
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85
+#define RGBLIGHT_EFFECT_BREATHE_MAX    255
+#endif
+
+// Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed
+#define DEBOUNCE 5
+
+// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
+#define LOCKING_SUPPORT_ENABLE
+// Locking resynchronize hack
+#define LOCKING_RESYNC_ENABLE
+
diff --git a/keyboards/cozykeys/bloomer/readme.md b/keyboards/cozykeys/bloomer/readme.md
new file mode 100644
index 0000000000..0232dff1a5
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/readme.md
@@ -0,0 +1,23 @@
+# Bloomer
+
+![Bloomer](http://assets.cozykeys.xyz/images/keyboards/bloomer/bloomer-angle-2_800x800.jpg)
+
+- Keyboard Maintainer: [Paul Ewing](https://github.com/pcewing)
+- Hardware Supported: ItsyBitsy 32u4 5V 16MHz
+- Hardware Availability: [Bloomer Repository](https://github.com/cozykeys/bloomer)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cozykeys/bloomer/v2:default  # for Bloomer v2
+    make cozykeys/bloomer/v3:default  # for Bloomer v3
+
+Flashing example for this keyboard:
+
+    make cozykeys/bloomer/v2:default:flash  # for Bloomer v2
+    make cozykeys/bloomer/v3:default:flash  # for Bloomer v3
+
+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).
+
+## Flashing the Firmware
+
+See the QMK docs for handwiring a keyboard; there is a section with instructions on how to flash the *.hex* file to the Teensy 2.0 controller.
diff --git a/keyboards/cozykeys/bloomer/v2/config.h b/keyboards/cozykeys/bloomer/v2/config.h
new file mode 100644
index 0000000000..49fac4d254
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v2/config.h
@@ -0,0 +1,29 @@
+/*
+Copyright 2021 Paul Ewing
+
+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 DEVICE_VER   0x0002
+
+// Keyboard Matrix Assignments
+#define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 }
+#define UNUSED_PINS
+#define DIODE_DIRECTION COL2ROW
+
diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json
new file mode 100644
index 0000000000..1135158117
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v2/info.json
@@ -0,0 +1,100 @@
+{
+  "keyboard_name": "Bloomer",
+  "url": "https://github.com/cozykeys/bloomer",
+  "maintainer": "pcewing",
+  "width": 15,
+  "height": 6,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "label": "k00", "x":  0.868, "y":   0.0, "r":  10 },
+        { "label": "k01", "x":  1.853, "y": 0.174, "r":  10 },
+        { "label": "k02", "x":  2.856, "y": 0.244, "r":  10 },
+        { "label": "k03", "x":  3.896, "y": 0.107, "r":  10 },
+        { "label": "k04", "x":  4.826, "y": 0.591, "r":  10 },
+        { "label": "k05", "x":  5.765, "y": 1.023, "r":  10 },
+        { "label": "k06", "x":  7.031, "y": 0.724, "r":   0 },
+        { "label": "k07", "x":  8.031, "y":  0.46, "r":   0 },
+        { "label": "k08", "x":  9.031, "y": 0.724, "r":   0 },
+        { "label": "k09", "x": 10.297, "y": 1.023, "r": -10 },
+        { "label": "k10", "x": 11.236, "y": 0.591, "r": -10 },
+        { "label": "k11", "x": 12.166, "y": 0.107, "r": -10 },
+        { "label": "k12", "x": 13.196, "y": 0.192, "r": -10 },
+        { "label": "k13", "x": 14.208, "y": 0.174, "r": -10 },
+        { "label": "k14", "x": 15.193, "y":   0.0, "r": -10 },
+        { "label": "k15", "x":  0.695, "y": 0.985, "r":  10 },
+        { "label": "k16", "x":  1.679, "y": 1.158, "r":  10 },
+        { "label": "k17", "x":  2.682, "y": 1.229, "r":  10 },
+        { "label": "k18", "x":  3.722, "y": 1.092, "r":  10 },
+        { "label": "k19", "x":  4.652, "y": 1.576, "r":  10 },
+        { "label": "k20", "x":  5.591, "y": 2.008, "r":  10 },
+        { "label": "k21", "x":  7.031, "y": 2.249, "r":   0 },
+        { "label": "k22", "x":  8.031, "y": 1.985, "r":   0 },
+        { "label": "k23", "x":  9.031, "y": 2.249, "r":   0 },
+        { "label": "k24", "x":  10.47, "y": 2.008, "r": -10 },
+        { "label": "k25", "x": 11.409, "y": 1.576, "r": -10 },
+        { "label": "k26", "x":  12.34, "y": 1.092, "r": -10 },
+        { "label": "k27", "x":  13.37, "y": 1.177, "r": -10 },
+        { "label": "k28", "x": 14.382, "y": 1.158, "r": -10 },
+        { "label": "k29", "x": 15.367, "y": 0.985, "r": -10 },
+        { "label": "k30", "x":  0.521, "y":  1.97, "r":  10 },
+        { "label": "k31", "x":  1.506, "y": 2.143, "r":  10 },
+        { "label": "k32", "x":  2.509, "y": 2.214, "r":  10 },
+        { "label": "k33", "x":  3.548, "y": 2.077, "r":  10 },
+        { "label": "k34", "x":  4.478, "y": 2.561, "r":  10 },
+        { "label": "k35", "x":  5.418, "y": 2.993, "r":  10 },
+        { "label": "k36", "x":  7.031, "y": 3.249, "r":   0 },
+        { "label": "k37", "x":  8.031, "y": 2.985, "r":   0 },
+        { "label": "k38", "x":  9.031, "y": 3.249, "r":   0 },
+        { "label": "k39", "x": 10.644, "y": 2.993, "r": -10 },
+        { "label": "k40", "x": 11.583, "y": 2.561, "r": -10 },
+        { "label": "k41", "x": 12.513, "y": 2.077, "r": -10 },
+        { "label": "k42", "x": 13.544, "y": 2.162, "r": -10 },
+        { "label": "k43", "x": 14.556, "y": 2.143, "r": -10 },
+        { "label": "k44", "x": 15.541, "y":  1.97, "r": -10 },
+        { "label": "k45", "x":  0.347, "y": 2.954, "r":  10 },
+        { "label": "k46", "x":  1.332, "y": 3.128, "r":  10 },
+        { "label": "k47", "x":  2.335, "y": 3.198, "r":  10 },
+        { "label": "k48", "x":  3.375, "y": 3.062, "r":  10 },
+        { "label": "k49", "x":  4.305, "y": 3.546, "r":  10 },
+        { "label": "k50", "x":  5.244, "y": 3.978, "r":  10 },
+        { "label": "k51", "x": 10.818, "y": 3.978, "r": -10 },
+        { "label": "k52", "x": 11.757, "y": 3.546, "r": -10 },
+        { "label": "k53", "x": 12.687, "y": 3.062, "r": -10 },
+        { "label": "k54", "x": 13.717, "y": 3.147, "r": -10 },
+        { "label": "k55", "x": 14.729, "y": 3.128, "r": -10 },
+        { "label": "k56", "x": 15.714, "y": 2.954, "r": -10 },
+        { "label": "k57", "x":  0.174, "y": 3.939, "r":  10 },
+        { "label": "k58", "x":  1.158, "y": 4.113, "r":  10 },
+        { "label": "k59", "x":  2.161, "y": 4.183, "r":  10 },
+        { "label": "k60", "x":  3.201, "y": 4.047, "r":  10 },
+        { "label": "k61", "x":  4.131, "y":  4.53, "r":  10 },
+        { "label": "k62", "x":   5.07, "y": 4.963, "r":  10 },
+        { "label": "k63", "x":  7.031, "y": 4.984, "r":   0 },
+        { "label": "k64", "x":  8.031, "y":  4.51, "r":   0 },
+        { "label": "k65", "x":  9.031, "y": 4.984, "r":   0 },
+        { "label": "k66", "x": 10.991, "y": 4.963, "r": -10 },
+        { "label": "k67", "x":  11.93, "y":  4.53, "r": -10 },
+        { "label": "k68", "x": 12.861, "y": 4.047, "r": -10 },
+        { "label": "k69", "x": 13.891, "y": 4.131, "r": -10 },
+        { "label": "k70", "x": 14.903, "y": 4.113, "r": -10 },
+        { "label": "k71", "x": 15.888, "y": 3.939, "r": -10 },
+        { "label": "k72", "x":    0.0, "y": 4.924, "r":  10 },
+        { "label": "k73", "x":  0.985, "y": 5.098, "r":  10 },
+        { "label": "k74", "x":  1.988, "y": 5.168, "r":  10 },
+        { "label": "k75", "x":  3.027, "y": 5.031, "r":  10 },
+        { "label": "k76", "x":  3.957, "y": 5.515, "r":  10 },
+        { "label": "k77", "x":  4.897, "y": 5.947, "r":  10 },
+        { "label": "k78", "x":  5.883, "y": 6.115, "r":  10 },
+        { "label": "k79", "x":  8.031, "y":  5.51, "r":   0 },
+        { "label": "k80", "x": 10.179, "y": 6.115, "r": -10 },
+        { "label": "k81", "x": 11.165, "y": 5.947, "r": -10 },
+        { "label": "k82", "x": 12.104, "y": 5.515, "r": -10 },
+        { "label": "k83", "x": 13.034, "y": 5.031, "r": -10 },
+        { "label": "k84", "x": 14.065, "y": 5.116, "r": -10 },
+        { "label": "k85", "x": 15.077, "y": 5.098, "r": -10 },
+        { "label": "k86", "x": 16.062, "y": 4.924, "r": -10 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/cozykeys/bloomer/v2/keymaps/default/keymap.c b/keyboards/cozykeys/bloomer/v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..e5eeaa8530
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v2/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2021 Paul Ewing
+
+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 bloomer_layers {
+  DEFAULT,
+  FN
+};
+
+#define RGB_N RGB_MOD  // Rotate to next RGB mode
+#define RGB_P RGB_RMOD // Rotate to next RGB mode
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[DEFAULT] = LAYOUT(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_PSCR, KC_SLCK, KC_PAUS,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_INS,  KC_HOME, KC_PGUP,   KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_CAPS, KC_END,  KC_PGDN,   KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                                 KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LEFT, KC_UP,   KC_RGHT,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_GRV,  MO(FN),  KC_BSPC, KC_DEL,  KC_DOWN, KC_ENT,    KC_SPC,  KC_LBRC, KC_RBRC, KC_RALT, KC_RGUI, KC_RCTL
+),
+
+[FN] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
+    _______, _______, _______, _______, _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______,
+    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, KC_GRV,  KC_LBRC, KC_RBRC, _______, _______,
+    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,                            KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, RGB_P,   RGB_TOG, RGB_N,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, RGB_M_P, _______, _______, _______, _______, _______, _______, _______
+)
+
+};
+
diff --git a/keyboards/cozykeys/bloomer/v2/keymaps/default/readme.md b/keyboards/cozykeys/bloomer/v2/keymaps/default/readme.md
new file mode 100644
index 0000000000..7595b5aa35
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v2/keymaps/default/readme.md
@@ -0,0 +1,10 @@
+# CozyKeys Bloomer v2 Default Keymap
+
+## Default Layer
+
+![Default Layer](https://raw.githubusercontent.com/cozykeys/bloomer/master/keymaps/v2/default/bloomer_layer_default.svg)
+
+## Function Layer
+
+![Function Layer](https://raw.githubusercontent.com/cozykeys/bloomer/master/keymaps/v2/default/bloomer_layer_fn.svg)
+
diff --git a/keyboards/cozykeys/bloomer/v2/readme.md b/keyboards/cozykeys/bloomer/v2/readme.md
new file mode 100644
index 0000000000..ac4ab9c93e
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v2/readme.md
@@ -0,0 +1,5 @@
+# CozyKeys Bloomer v2
+
+![Bloomer](http://assets.cozykeys.xyz/images/keyboards/bloomer/bloomer-angle-2_800x800.jpg)
+
+For more information on the Bloomer and how to build/flash the firmware, see the [readme.md](../readme.md) in the parent directory.
diff --git a/keyboards/cozykeys/bloomer/v2/rules.mk b/keyboards/cozykeys/bloomer/v2/rules.mk
new file mode 100644
index 0000000000..d23e955126
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v2/rules.mk
@@ -0,0 +1,22 @@
+# 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 = 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
diff --git a/keyboards/cozykeys/bloomer/v2/v2.c b/keyboards/cozykeys/bloomer/v2/v2.c
new file mode 100644
index 0000000000..47dd093734
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v2/v2.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 Paul Ewing
+
+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 "v2.h"
diff --git a/keyboards/cozykeys/bloomer/v2/v2.h b/keyboards/cozykeys/bloomer/v2/v2.h
new file mode 100644
index 0000000000..c6575cd4e6
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v2/v2.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2021 Paul Ewing
+
+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 ___ KC_NO
+
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
+    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, \
+    k45, k46, k47, k48, k49, k50,                k51, k52, k53, k54, k55, k56, \
+    k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, \
+    k72, k73, k74, k75, k76, k77, k78, k79, k80, k81, k82, k83, k84, k85, k86  \
+) \
+{       /* c00  c01  c02  c03  c04  c05  c06  c07  c08  c09  c10  c11  c12  c13  c14 */ \
+/* r0 */ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \
+/* r1 */ { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+/* r2 */ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44 }, \
+/* r3 */ { k45, k46, k47, k48, k49, k50, ___, ___, ___, k51, k52, k53, k54, k55, k56 }, \
+/* r4 */ { k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71 }, \
+/* r5 */ { k72, k73, k74, k75, k76, k77, k78, k79, k80, k81, k82, k83, k84, k85, k86 }, \
+}
diff --git a/keyboards/cozykeys/bloomer/v3/config.h b/keyboards/cozykeys/bloomer/v3/config.h
new file mode 100644
index 0000000000..4bb291be56
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v3/config.h
@@ -0,0 +1,29 @@
+/*
+Copyright 2021 Paul Ewing
+
+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 DEVICE_VER   0x0003
+
+// Keyboard Matrix Assignments
+#define MATRIX_ROW_PINS { D0, D1, D3, D2, D4, B2 }
+#define MATRIX_COL_PINS { F7, F6, F5, F4, F1, F0, B1, B4, C6, E6, B5, B6, B7, D6, C7 }
+#define UNUSED_PINS
+#define DIODE_DIRECTION COL2ROW
+
diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json
new file mode 100644
index 0000000000..6d547acf1f
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v3/info.json
@@ -0,0 +1,103 @@
+{
+  "keyboard_name": "Bloomer",
+  "url": "https://github.com/cozykeys/bloomer",
+  "maintainer": "pcewing",
+  "width": 15,
+  "height": 6,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "label": "k00", "x":  0.868, "y":   0.0, "r":  10 },
+        { "label": "k01", "x":  1.853, "y": 0.174, "r":  10 },
+        { "label": "k02", "x":  2.856, "y": 0.244, "r":  10 },
+        { "label": "k03", "x":  3.896, "y": 0.107, "r":  10 },
+        { "label": "k04", "x":  4.826, "y": 0.591, "r":  10 },
+        { "label": "k05", "x":  5.765, "y": 1.023, "r":  10 },
+        { "label": "k06", "x": 10.507, "y": 1.023, "r": -10 },
+        { "label": "k07", "x": 11.446, "y": 0.591, "r": -10 },
+        { "label": "k08", "x": 12.376, "y": 0.107, "r": -10 },
+        { "label": "k09", "x": 13.406, "y": 0.192, "r": -10 },
+        { "label": "k10", "x": 14.418, "y": 0.174, "r": -10 },
+        { "label": "k11", "x": 15.403, "y":   0.0, "r": -10 },
+        { "label": "k12", "x":  0.695, "y": 0.985, "r":  10 },
+        { "label": "k13", "x":  1.679, "y": 1.158, "r":  10 },
+        { "label": "k14", "x":  2.682, "y": 1.229, "r":  10 },
+        { "label": "k15", "x":  3.722, "y": 1.092, "r":  10 },
+        { "label": "k16", "x":  4.652, "y": 1.576, "r":  10 },
+        { "label": "k17", "x":  5.591, "y": 2.008, "r":  10 },
+        { "label": "k18", "x":  10.68, "y": 2.008, "r": -10 },
+        { "label": "k19", "x": 11.619, "y": 1.576, "r": -10 },
+        { "label": "k20", "x":  12.55, "y": 1.092, "r": -10 },
+        { "label": "k21", "x":  13.58, "y": 1.177, "r": -10 },
+        { "label": "k22", "x": 14.592, "y": 1.158, "r": -10 },
+        { "label": "k23", "x": 15.577, "y": 0.985, "r": -10 },
+        { "label": "k24", "x":  0.521, "y":  1.97, "r":  10 },
+        { "label": "k25", "x":  1.506, "y": 2.143, "r":  10 },
+        { "label": "k26", "x":  2.509, "y": 2.214, "r":  10 },
+        { "label": "k27", "x":  3.548, "y": 2.077, "r":  10 },
+        { "label": "k28", "x":  4.478, "y": 2.561, "r":  10 },
+        { "label": "k29", "x":  5.418, "y": 2.993, "r":  10 },
+        { "label": "k30", "x":  6.402, "y": 3.167, "r":  10 },
+        { "label": "k31", "x":  7.636, "y": 3.217, "r":   0 },
+        { "label": "k32", "x":  8.636, "y": 3.217, "r":   0 },
+        { "label": "k33", "x":  9.869, "y": 3.167, "r": -10 },
+        { "label": "k34", "x": 10.854, "y": 2.993, "r": -10 },
+        { "label": "k35", "x": 11.793, "y": 2.561, "r": -10 },
+        { "label": "k36", "x": 12.723, "y": 2.077, "r": -10 },
+        { "label": "k37", "x": 13.754, "y": 2.162, "r": -10 },
+        { "label": "k38", "x": 14.766, "y": 2.143, "r": -10 },
+        { "label": "k39", "x":  15.75, "y":  1.97, "r": -10 },
+        { "label": "k40", "x":  0.347, "y": 2.954, "r":  10 },
+        { "label": "k41", "x":  1.332, "y": 3.128, "r":  10 },
+        { "label": "k42", "x":  2.335, "y": 3.198, "r":  10 },
+        { "label": "k43", "x":  3.375, "y": 3.062, "r":  10 },
+        { "label": "k44", "x":  4.305, "y": 3.546, "r":  10 },
+        { "label": "k45", "x":  5.244, "y": 3.978, "r":  10 },
+        { "label": "k46", "x":  6.229, "y": 4.151, "r":  10 },
+        { "label": "k47", "x":  7.636, "y": 4.217, "r":   0 },
+        { "label": "k48", "x":  8.636, "y": 4.217, "r":   0 },
+        { "label": "k49", "x": 10.043, "y": 4.151, "r": -10 },
+        { "label": "k50", "x": 11.027, "y": 3.978, "r": -10 },
+        { "label": "k51", "x": 11.967, "y": 3.546, "r": -10 },
+        { "label": "k52", "x": 12.897, "y": 3.062, "r": -10 },
+        { "label": "k53", "x": 13.927, "y": 3.147, "r": -10 },
+        { "label": "k54", "x": 14.939, "y": 3.128, "r": -10 },
+        { "label": "k55", "x": 15.924, "y": 2.954, "r": -10 },
+        { "label": "k56", "x":  0.174, "y": 3.939, "r":  10 },
+        { "label": "k57", "x":  1.158, "y": 4.113, "r":  10 },
+        { "label": "k58", "x":  2.161, "y": 4.183, "r":  10 },
+        { "label": "k59", "x":  3.201, "y": 4.047, "r":  10 },
+        { "label": "k60", "x":  4.131, "y":  4.53, "r":  10 },
+        { "label": "k61", "x":   5.07, "y": 4.963, "r":  10 },
+        { "label": "k62", "x":  6.055, "y": 5.136, "r":  10 },
+        { "label": "k63", "x":  7.136, "y": 5.217, "r":   0 },
+        { "label": "k64", "x":  8.136, "y": 5.217, "r":   0 },
+        { "label": "k65", "x":  9.136, "y": 5.217, "r":   0 },
+        { "label": "k66", "x": 10.216, "y": 5.136, "r": -10 },
+        { "label": "k67", "x": 11.201, "y": 4.963, "r": -10 },
+        { "label": "k68", "x":  12.14, "y":  4.53, "r": -10 },
+        { "label": "k69", "x":  13.07, "y": 4.047, "r": -10 },
+        { "label": "k70", "x": 14.101, "y": 4.131, "r": -10 },
+        { "label": "k71", "x": 15.113, "y": 4.113, "r": -10 },
+        { "label": "k72", "x": 16.098, "y": 3.939, "r": -10 },
+        { "label": "k73", "x":    0.0, "y": 4.924, "r":  10 },
+        { "label": "k74", "x":  0.985, "y": 5.098, "r":  10 },
+        { "label": "k75", "x":  1.988, "y": 5.168, "r":  10 },
+        { "label": "k76", "x":  3.027, "y": 5.031, "r":  10 },
+        { "label": "k77", "x":  3.957, "y": 5.515, "r":  10 },
+        { "label": "k78", "x":  4.897, "y": 5.947, "r":  10 },
+        { "label": "k79", "x":  5.881, "y": 6.121, "r":  10 },
+        { "label": "k80", "x":  7.136, "y": 6.217, "r":   0 },
+        { "label": "k81", "x":  8.136, "y": 6.217, "r":   0 },
+        { "label": "k82", "x":  9.136, "y": 6.217, "r":   0 },
+        { "label": "k83", "x":  10.39, "y": 6.121, "r": -10 },
+        { "label": "k84", "x": 11.375, "y": 5.947, "r": -10 },
+        { "label": "k85", "x": 12.314, "y": 5.515, "r": -10 },
+        { "label": "k86", "x": 13.244, "y": 5.031, "r": -10 },
+        { "label": "k87", "x": 14.274, "y": 5.116, "r": -10 },
+        { "label": "k88", "x": 15.287, "y": 5.098, "r": -10 },
+        { "label": "k89", "x": 16.271, "y": 4.924, "r": -10 }
+      ]
+    }
+  }
+}
diff --git a/keyboards/cozykeys/bloomer/v3/keymaps/default/keymap.c b/keyboards/cozykeys/bloomer/v3/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7aad9cec61
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v3/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2021 Paul Ewing
+
+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 bloomer_layers {
+  DEFAULT,
+  FN,
+};
+
+#define RGB_N RGB_MOD  // Rotate to next RGB mode
+#define RGB_P RGB_RMOD // Rotate to next RGB mode
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[DEFAULT] = LAYOUT(
+    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_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                                  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_LBRC,     KC_PSCR, KC_PAUS,      KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_PGUP,     KC_SLCK, KC_NLCK,      KC_HOME, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,     KC_PGDN, KC_CAPS, KC_UP,   KC_INS,  KC_END,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_GRV,  MO(FN),  KC_BSPC,  KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT,  KC_SPC,  KC_LBRC, KC_RBRC, KC_RALT, KC_RGUI, KC_RCTL
+),
+
+[FN] = LAYOUT(
+    _______, _______, _______, _______, _______, _______,                                              _______, _______, _______, _______, _______, RESET,
+    _______, _______, _______, _______, _______, _______,                                              _______, _______, _______, _______, _______, _______,
+    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,     RGB_TOG, RGB_M_P,      _______, _______, KC_GRV,  KC_LBRC, KC_RBRC, _______, _______,
+    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______, _______,     RGB_P,   RGB_N,        _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______, _______, RGB_HUI, RGB_SAI, RGB_VAI, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, _______
+),
+
+};
+
diff --git a/keyboards/cozykeys/bloomer/v3/keymaps/default/readme.md b/keyboards/cozykeys/bloomer/v3/keymaps/default/readme.md
new file mode 100644
index 0000000000..b8a37f24c5
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v3/keymaps/default/readme.md
@@ -0,0 +1,10 @@
+# CozyKeys Bloomer v3 Default Keymap
+
+## Default Layer
+
+![Default Layer](https://raw.githubusercontent.com/cozykeys/bloomer/master/keymaps/v3/default/bloomer_layer_default.svg)
+
+## Function Layer
+
+![Function Layer](https://raw.githubusercontent.com/cozykeys/bloomer/master/keymaps/v3/default/bloomer_layer_fn.svg)
+
diff --git a/keyboards/cozykeys/bloomer/v3/readme.md b/keyboards/cozykeys/bloomer/v3/readme.md
new file mode 100644
index 0000000000..b056b321d2
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v3/readme.md
@@ -0,0 +1,5 @@
+# CozyKeys Bloomer v3
+
+![Bloomer](http://assets.cozykeys.xyz/images/keyboards/bloomer-v3/bloomer-v3-angle_800x800.jpg)
+
+For more information on the Bloomer and how to build/flash the firmware, see the [readme.md](../readme.md) in the parent directory.
diff --git a/keyboards/cozykeys/bloomer/v3/rules.mk b/keyboards/cozykeys/bloomer/v3/rules.mk
new file mode 100644
index 0000000000..806a19af38
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v3/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
diff --git a/keyboards/cozykeys/bloomer/v3/v3.c b/keyboards/cozykeys/bloomer/v3/v3.c
new file mode 100644
index 0000000000..080cacd791
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v3/v3.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2021 Paul Ewing
+
+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 "v3.h"
diff --git a/keyboards/cozykeys/bloomer/v3/v3.h b/keyboards/cozykeys/bloomer/v3/v3.h
new file mode 100644
index 0000000000..3515ef84ce
--- /dev/null
+++ b/keyboards/cozykeys/bloomer/v3/v3.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2021 Paul Ewing
+
+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( \
+    k00, k01, k02, k03, k04, k05,                          k06, k07, k08, k09, k10, k11, \
+    k12, k13, k14, k15, k16, k17,                          k18, k19, k20, k21, k22, k23, \
+    k24, k25, k26, k27, k28, k29, k30,    k31, k32,   k33, k34, k35, k36, k37, k38, k39, \
+    k40, k41, k42, k43, k44, k45, k46,    k47, k48,   k49, k50, k51, k52, k53, k54, k55, \
+    k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, \
+    k73, k74, k75, k76, k77, k78, k79, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89  \
+) \
+{       /* c00  c01  c02  c03  c04  c05  c06  c07  c08  c09  c10  c11  c12  c13  c14 */ \
+/* r0 */ { k00, k01, k02, k03, k04, k05, k31, k63, k32, k06, k07, k08, k09, k10, k11 }, \
+/* r1 */ { k12, k13, k14, k15, k16, k17, k47, k80, k48, k18, k19, k20, k21, k22, k23 }, \
+/* r2 */ { k24, k25, k26, k27, k28, k29, k30, k64, k33, k34, k35, k36, k37, k38, k39 }, \
+/* r3 */ { k40, k41, k42, k43, k44, k45, k46, k81, k49, k50, k51, k52, k53, k54, k55 }, \
+/* r4 */ { k56, k57, k58, k59, k60, k61, k62, k65, k66, k67, k68, k69, k70, k71, k72 }, \
+/* r5 */ { k73, k74, k75, k76, k77, k78, k79, k82, k83, k84, k85, k86, k87, k88, k89 }  \
+}