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

14 files changed, 543 insertions, 2 deletions

diff --git a/keyboards/meow65/config.h b/keyboards/meow65/config.h
new file mode 100644
index 0000000000..54af798314
--- /dev/null
+++ b/keyboards/meow65/config.h
@@ -0,0 +1,147 @@
+/*
+Copyright 2021 mrninhvn
+
+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    0x6E64  // Hai-Ninh Dang
+#define PRODUCT_ID   0x4D36
+#define DEVICE_VER   0x0001
+#define MANUFACTURER mrninhvn
+#define PRODUCT      Meow65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { C6, B6, B5, B7, F7 }
+#define MATRIX_COL_PINS { F5, F6, B0, F4, F1, D0, D1, D2, D3, D5, D4, D6, D7, B4, C7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/meow65/info.json b/keyboards/meow65/info.json
new file mode 100644
index 0000000000..90153257a6
--- /dev/null
+++ b/keyboards/meow65/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "meow65",
+    "url": "https://github.com/mrninhvn/meow65-pcb",
+    "maintainer": "mrninhvn",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K00 (C6,F5)", "x": 0, "y": 0 },
+                { "label": "K01 (C6,F6)", "x": 1, "y": 0 },
+                { "label": "K02 (C6,B0)", "x": 2, "y": 0 },
+                { "label": "K03 (C6,F4)", "x": 3, "y": 0 },
+                { "label": "K04 (C6,F1)", "x": 4, "y": 0 },
+                { "label": "K05 (C6,D0)", "x": 5, "y": 0 },
+                { "label": "K06 (C6,D1)", "x": 6, "y": 0 },
+                { "label": "K07 (C6,D2)", "x": 7, "y": 0 },
+                { "label": "K08 (C6,D3)", "x": 8, "y": 0 },
+                { "label": "K09 (C6,D5)", "x": 9, "y": 0 },
+                { "label": "K0A (C6,D4)", "x": 10, "y": 0 },
+                { "label": "K0B (C6,D6)", "x": 11, "y": 0 },
+                { "label": "K0C (C6,D7)", "x": 12, "y": 0 },
+                { "label": "K0D (C6,B4)", "x": 13, "y": 0, "w": 2 },
+                { "label": "K0E (C6,C7)", "x": 15, "y": 0 },
+                { "label": "K10 (B6,F5)", "x": 0, "y": 1, "w": 1.5 },
+                { "label": "K11 (B6,F6)", "x": 1.5, "y": 1 },
+                { "label": "K12 (B6,B0)", "x": 2.5, "y": 1 },
+                { "label": "K13 (B6,F4)", "x": 3.5, "y": 1 },
+                { "label": "K14 (B6,F1)", "x": 4.5, "y": 1 },
+                { "label": "K15 (B6,D0)", "x": 5.5, "y": 1 },
+                { "label": "K16 (B6,D1)", "x": 6.5, "y": 1 },
+                { "label": "K17 (B6,D2)", "x": 7.5, "y": 1 },
+                { "label": "K18 (B6,D3)", "x": 8.5, "y": 1 },
+                { "label": "K19 (B6,D5)", "x": 9.5, "y": 1 },
+                { "label": "K1A (B6,D4)", "x": 10.5, "y": 1 },
+                { "label": "K1B (B6,D6)", "x": 11.5, "y": 1 },
+                { "label": "K1C (B6,D7)", "x": 12.5, "y": 1 },
+                { "label": "K1D (B6,B4)", "x": 13.5, "y": 1, "w": 1.5 },
+                { "label": "K1E (B6,C7)", "x": 15, "y": 1 },
+                { "label": "K20 (B5,F5)", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "K21 (B5,F6)", "x": 1.75, "y": 2 },
+                { "label": "K22 (B5,B0)", "x": 2.75, "y": 2 },
+                { "label": "K23 (B5,F4)", "x": 3.75, "y": 2 },
+                { "label": "K24 (B5,F1)", "x": 4.75, "y": 2 },
+                { "label": "K25 (B5,D0)", "x": 5.75, "y": 2 },
+                { "label": "K26 (B5,D1)", "x": 6.75, "y": 2 },
+                { "label": "K27 (B5,D2)", "x": 7.75, "y": 2 },
+                { "label": "K28 (B5,D3)", "x": 8.75, "y": 2 },
+                { "label": "K29 (B5,D5)", "x": 9.75, "y": 2 },
+                { "label": "K2A (B5,D4)", "x": 10.75, "y": 2 },
+                { "label": "K2B (B5,D6)", "x": 11.75, "y": 2 },
+                { "label": "K2D (B5,B4)", "x": 12.75, "y": 2, "w": 2.25 },
+                { "label": "K2E (B5,C7)", "x": 15, "y": 2 },
+                { "label": "K30 (B7,F5)", "x": 0, "y": 3, "w": 2.25 },
+                { "label": "K31 (B7,F6)", "x": 2.25, "y": 3 },
+                { "label": "K32 (B7,B0)", "x": 3.25, "y": 3 },
+                { "label": "K33 (B7,F4)", "x": 4.25, "y": 3 },
+                { "label": "K34 (B7,F1)", "x": 5.25, "y": 3 },
+                { "label": "K35 (B7,D0)", "x": 6.25, "y": 3 },
+                { "label": "K36 (B7,D1)", "x": 7.25, "y": 3 },
+                { "label": "K37 (B7,D2)", "x": 8.25, "y": 3 },
+                { "label": "K38 (B7,D3)", "x": 9.25, "y": 3 },
+                { "label": "K39 (B7,D5)", "x": 10.25, "y": 3 },
+                { "label": "K3A (B7,D4)", "x": 11.25, "y": 3 },
+                { "label": "K3C (B7,D7)", "x": 12.25, "y": 3, "w": 1.75 },
+                { "label": "K3D (B7,B4)", "x": 14, "y": 3 },
+                { "label": "K3E (B7,C7)", "x": 15, "y": 3 },
+                { "label": "K40 (F7,F5)", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "K41 (F7,F6)", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "K42 (F7,B0)", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "K45 (F7,D0)", "x": 3.75, "y": 4, "w": 6.25 },
+                { "label": "K49 (F7,D5)", "x": 10, "y": 4, "w": 1.25 },
+                { "label": "K4A (F7,D4)", "x": 11.25, "y": 4, "w": 1.25 },
+                { "label": "K4C (F7,D7)", "x": 13, "y": 4 },
+                { "label": "K4D (F7,B4)", "x": 14, "y": 4 },
+                { "label": "K4E (F7,C7)", "x": 15, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/meow65/keymaps/default/keymap.c b/keyboards/meow65/keymaps/default/keymap.c
new file mode 100644
index 0000000000..b93abee723
--- /dev/null
+++ b/keyboards/meow65/keymaps/default/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 mrninhvn
+ *
+ * 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,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_ESC,  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_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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,  
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(_FN),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT(
+        RESET,   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_DEL,  _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/meow65/keymaps/default/readme.md b/keyboards/meow65/keymaps/default/readme.md
new file mode 100644
index 0000000000..6da1fe875a
--- /dev/null
+++ b/keyboards/meow65/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for meow65
diff --git a/keyboards/meow65/keymaps/via/keymap.c b/keyboards/meow65/keymaps/via/keymap.c
new file mode 100644
index 0000000000..b765673ca1
--- /dev/null
+++ b/keyboards/meow65/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2020 kkatano
+ *
+ * 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_names {
+    _L0,
+    _L1,
+    _L2,
+    _L3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_L0] = LAYOUT(
+        KC_ESC,  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_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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_END,  
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  MO(_L1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_L1] = LAYOUT(
+        RESET,   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_DEL,  _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [_L2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+    [_L3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/meow65/keymaps/via/readme.md b/keyboards/meow65/keymaps/via/readme.md
new file mode 100644
index 0000000000..717f08351e
--- /dev/null
+++ b/keyboards/meow65/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The via keymap for meow65
diff --git a/keyboards/meow65/keymaps/via/rules.mk b/keyboards/meow65/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/meow65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/meow65/meow65.c b/keyboards/meow65/meow65.c
new file mode 100644
index 0000000000..4d03f6a460
--- /dev/null
+++ b/keyboards/meow65/meow65.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 mrninhvn
+ *
+ * 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 "meow65.h"
diff --git a/keyboards/meow65/meow65.h b/keyboards/meow65/meow65.h
new file mode 100644
index 0000000000..2e25bd9758
--- /dev/null
+++ b/keyboards/meow65/meow65.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 mrninhvn
+ *
+ * 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"
+
+/* 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( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k213, k214, \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310,       k312, k313, k314, \
+    k400, k401, k402,             k405,                   k409, k410,       k412, k413, k414  \
+) { \
+    { k000,  k001,  k002,  k003,  k004,  k005,  k006,  k007,  k008,  k009,  k010,  k011,  k012,  k013,  k014 }, \
+    { k100,  k101,  k102,  k103,  k104,  k105,  k106,  k107,  k108,  k109,  k110,  k111,  k112,  k113,  k114 }, \
+    { k200,  k201,  k202,  k203,  k204,  k205,  k206,  k207,  k208,  k209,  k210,  k211,  KC_NO, k213,  k214 }, \
+    { k300,  k301,  k302,  k303,  k304,  k305,  k306,  k307,  k308,  k309,  k310,  KC_NO, k312,  k313,  k314 }, \
+    { k400,  k401,  k402,  KC_NO, KC_NO, k405,  KC_NO, KC_NO, KC_NO, k409,  k410,  KC_NO, k412,  k413,  k414 }  \
+}
diff --git a/keyboards/meow65/readme.md b/keyboards/meow65/readme.md
new file mode 100644
index 0000000000..734a278082
--- /dev/null
+++ b/keyboards/meow65/readme.md
@@ -0,0 +1,27 @@
+# meow65
+
+![meow65](https://i.imgur.com/M6PmjPGh.png)
+
+Meow65 Hotswap PCB, compatible with Meow65 & Bakeneko65 V3 Keyboard
+
+* Keyboard Maintainer: [mrninhvn](https://github.com/mrninhvn)
+* Hardware Supported: Meow65, Bakeneko65 V3
+* Hardware Availability: https://github.com/mrninhvn/meow65-pcb
+
+Make example for this keyboard (after setting up your build environment):
+
+    make meow65:default
+
+Flashing example for this keyboard:
+
+    make meow65: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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down ESC key (the top left key) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/meow65/rules.mk b/keyboards/meow65/rules.mk
new file mode 100644
index 0000000000..f153f0a941
--- /dev/null
+++ b/keyboards/meow65/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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 = yes            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
diff --git a/keyboards/takashicompany/endzone34/keymaps/via/config.h b/keyboards/takashicompany/endzone34/keymaps/via/config.h
new file mode 100644
index 0000000000..ed834d1aef
--- /dev/null
+++ b/keyboards/takashicompany/endzone34/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2021 takashicompany
+
+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
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
\ No newline at end of file
diff --git a/keyboards/takashicompany/endzone34/keymaps/via/keymap.c b/keyboards/takashicompany/endzone34/keymaps/via/keymap.c
index 5dbc4e13cf..f9b22fb20d 100644
--- a/keyboards/takashicompany/endzone34/keymaps/via/keymap.c
+++ b/keyboards/takashicompany/endzone34/keymaps/via/keymap.c
@@ -39,5 +39,98 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, 
         RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, 
         RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, RGB_M_T, KC_F11, KC_F12, KC_CAPS, KC_NO, KC_NO, 
-        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    LAYOUT(
+        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_NO, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO),
+
+    LAYOUT(
+        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_NO, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO),
+
+    LAYOUT(
+        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_NO, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO),
+
+    LAYOUT(
+        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_NO, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+        KC_NO, KC_NO, KC_NO, KC_NO)
 };
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_270;
+}
+
+//Variable that stores the number of times the key was pressed
+static uint16_t press_count = 0;
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+     // Increment the counter when a key is pressed
+    if (record->event.pressed) {
+        press_count++;
+    }
+
+    return true;
+}
+
+#ifdef OLED_ENABLE
+
+static void render_logo(void) {
+    
+    static const char PROGMEM my_logo[] = {
+        0x00, 0x00, 0x00, 0xff, 0x01, 0x01, 0x39, 0x29, 0x29, 0x29, 0x29, 0x29, 0xe9, 0x0f, 0x00, 0x00, 
+        0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf8, 0x08, 0xf8, 0x00, 0x00, 0x00, 0x00, 
+        0x80, 0x80, 0x80, 0xbf, 0xa0, 0xa0, 0xa7, 0xa5, 0xa5, 0xa5, 0xa5, 0x25, 0x25, 0x3c, 0x00, 0x1f, 
+        0x20, 0x3e, 0x02, 0x3e, 0x20, 0x1f, 0x20, 0x2e, 0x2a, 0x2e, 0x20, 0x1f, 0x00, 0x00, 0x00, 0x00, 
+        0x87, 0x44, 0x24, 0x14, 0x0c, 0x00, 0xc0, 0xa0, 0x90, 0x88, 0x87, 0x00, 0xe0, 0x10, 0xd0, 0x50, 
+        0xd0, 0x10, 0xe0, 0x10, 0xd0, 0x50, 0xd0, 0x10, 0xe0, 0x10, 0xd0, 0x50, 0x50, 0x10, 0xf0, 0x00, 
+        0x07, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x07, 0x00, 0x03, 0x04, 0x05, 0x05, 
+        0x05, 0x04, 0x03, 0x04, 0x07, 0x00, 0x07, 0x04, 0x03, 0x04, 0x05, 0x05, 0x05, 0x05, 0x07, 0x00
+    };
+
+    oled_write_raw_P(my_logo, sizeof(my_logo));
+}
+
+void oled_task_user(void) {
+
+    render_logo();
+
+    oled_set_cursor(0, 5);
+
+    oled_write_ln_P(PSTR("Layer"), false);
+    uint8_t n = get_highest_layer(layer_state);
+    char layer_str[4];
+    layer_str[3] = '\0';
+    layer_str[2] = '0' + n % 10;
+    layer_str[1] = (n /= 10) % 10 ? '0' + (n) % 10 : (n / 10) % 10 ? '0' : ' ';
+    layer_str[0] = n / 10 ? '0' + n / 10 : ' ';
+
+    oled_write_ln(layer_str, false);
+
+    oled_write_ln_P(PSTR(" "), false);
+    oled_write_ln_P(PSTR(" "), false);
+
+    oled_write_ln_P(PSTR("Count"), false);
+    uint16_t m = press_count;
+    char count_str[6];
+    count_str[5] = '\0';
+    count_str[4] = '0' + m % 10;
+    count_str[3] = (m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
+    count_str[2] = (m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
+    count_str[1] = (m /= 10) % 10 ? '0' + (m) % 10 : (m / 10) % 10 ? '0' : ' ';
+    count_str[0] =  m / 10 ? '0' + m / 10 : ' ';
+
+    oled_write_ln(count_str, false);
+    
+}
+#endif
\ No newline at end of file
diff --git a/keyboards/takashicompany/endzone34/rules.mk b/keyboards/takashicompany/endzone34/rules.mk
index 19fb27ff1b..eb6f2253fb 100644
--- a/keyboards/takashicompany/endzone34/rules.mk
+++ b/keyboards/takashicompany/endzone34/rules.mk
@@ -2,7 +2,7 @@
 MCU = atmega32u4
 
 # Bootloader selection
-BOOTLOADER = atmel-dfu
+BOOTLOADER = caterina
 
 # Build Options
 #   change yes to no to disable