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

37 files changed, 791 insertions, 8 deletions

diff --git a/keyboards/handwired/consolekeyboard/consolekeyboard.c b/keyboards/handwired/consolekeyboard/18key/18key.c
index a5ee1d9e74..911aaa642d 100644
--- a/keyboards/handwired/consolekeyboard/consolekeyboard.c
+++ b/keyboards/handwired/consolekeyboard/18key/18key.c
@@ -13,4 +13,4 @@
  * 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 "consolekeyboard.h"
+#include "18key.h"
diff --git a/keyboards/handwired/consolekeyboard/18key/18key.h b/keyboards/handwired/consolekeyboard/18key/18key.h
new file mode 100644
index 0000000000..9625d9806c
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/18key/18key.h
@@ -0,0 +1,26 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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( \
+    K000, K001, K002,      K004, K005, K006,       K008, K009, K010,   \
+    K100, K101, K102,      K104, K105, K106,       K108, K109, K110    \
+) { \
+    { K000,   K001,   K002,   KC_NO, K004,   K005,   K006,      KC_NO, K008,   K009,   K010   }, \
+    { K100,   K101,   K102,   KC_NO, K104,   K105,   K106,      KC_NO, K108,   K109,   K110   }, \
+}
diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h
new file mode 100644
index 0000000000..00e99da9fd
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/18key/config.h
@@ -0,0 +1,67 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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       0x6761
+#define PRODUCT_ID      0x3332
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Stream Cheap
+#define PRODUCT         Console Keyboard 18
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 11
+
+/*
+ * 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 { D1, D0 }
+#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN F4
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 6
+    #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
+#endif
+
diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json
new file mode 100644
index 0000000000..0995fe1c4f
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/18key/info.json
@@ -0,0 +1,33 @@
+{
+    "keyboard_name": "Console Keyboard",
+    "url": "https://www.thingiverse.com/thing:3167050",
+    "maintainer": "Gareth Edwards",
+    "width": 11,
+    "height": 2,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (D1,D4)", "x":0, "y":0},
+                {"label":"K01 (D1,C6)", "x":1, "y":0},
+                {"label":"K02 (D1,D7)", "x":2, "y":0},
+                {"label":"K04 (D1,B3)", "x":4, "y":0},
+                {"label":"K05 (D1,B2)", "x":5, "y":0},
+                {"label":"K06 (D1,B6)", "x":6, "y":0},
+                {"label":"K08 (D1,E6)", "x":8, "y":0},
+                {"label":"K09 (D1,C4)", "x":9, "y":0},
+                {"label":"K0A (D1,C5)", "x":10, "y":0},
+                {"label":"K10 (D0,D4)", "x":0, "y":1},
+                {"label":"K11 (D0,C6)", "x":1, "y":1},
+                {"label":"K12 (D0,D7)", "x":2, "y":1},
+                {"label":"K14 (D0,B3)", "x":4, "y":1},
+                {"label":"K15 (D0,B2)", "x":5, "y":1},
+                {"label":"K16 (D0,B6)", "x":6, "y":1},
+                {"label":"K18 (D0,E6)", "x":8, "y":1},
+                {"label":"K19 (D0,C4)", "x":9, "y":1},
+                {"label":"K1A (D0,C5)", "x":10, "y":1}
+
+            ]
+        }
+    }
+
+}
diff --git a/keyboards/handwired/consolekeyboard/18key/keymaps/default/keymap.c b/keyboards/handwired/consolekeyboard/18key/keymaps/default/keymap.c
new file mode 100644
index 0000000000..d168e02ead
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/18key/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_1,    KC_2,    KC_3,             KC_4,    KC_5,    KC_6,         KC_8,    KC_9,    KC_0,
+        KC_Q,    KC_W,    KC_E,             KC_R,    KC_T,    KC_Y,         KC_I,    KC_O,    KC_P
+    ),
+
+};
diff --git a/keyboards/handwired/consolekeyboard/18key/keymaps/via/keymap.c b/keyboards/handwired/consolekeyboard/18key/keymaps/via/keymap.c
new file mode 100644
index 0000000000..ebeabcc37c
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/18key/keymaps/via/keymap.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_1,    KC_2,    KC_3,             KC_4,    KC_5,    KC_6,            KC_8,    KC_9,    KC_0,
+        KC_Q,    KC_W,    KC_E,             KC_R,    KC_T,    KC_Y,            KC_I,    KC_O,    KC_P
+    ),
+[1] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+[2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+[3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,              KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+	};
diff --git a/keyboards/handwired/consolekeyboard/keymaps/via/rules.mk b/keyboards/handwired/consolekeyboard/18key/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/handwired/consolekeyboard/keymaps/via/rules.mk
+++ b/keyboards/handwired/consolekeyboard/18key/keymaps/via/rules.mk
diff --git a/keyboards/handwired/consolekeyboard/18key/readme.md b/keyboards/handwired/consolekeyboard/18key/readme.md
new file mode 100644
index 0000000000..cfd644190e
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/18key/readme.md
@@ -0,0 +1,17 @@
+# Console Keyboard
+
+[Console Keyboard](https://i.imgur.com/5aLT7CLl.jpeg)
+
+A 3d printed macro pad based on the Stream Cheap with  18 keys
+
+* Keyboard Maintainer: [Gareth Edwards](https://github.com/gazeddy)
+* Hardware Supported: Arduino Pro Micro
+* Hardware Availability:https://www.thingiverse.com/thing:3167050
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/consolekeyboard/18key:default
+    
+    
+
+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/handwired/consolekeyboard/rules.mk b/keyboards/handwired/consolekeyboard/18key/rules.mk
index 1b8f014d86..1b8f014d86 100644
--- a/keyboards/handwired/consolekeyboard/rules.mk
+++ b/keyboards/handwired/consolekeyboard/18key/rules.mk
diff --git a/keyboards/handwired/consolekeyboard/20key/20key.c b/keyboards/handwired/consolekeyboard/20key/20key.c
new file mode 100644
index 0000000000..409d1c16b5
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/20key/20key.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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 "20key.h"
diff --git a/keyboards/handwired/consolekeyboard/consolekeyboard.h b/keyboards/handwired/consolekeyboard/20key/20key.h
index bd109caf36..bd109caf36 100644
--- a/keyboards/handwired/consolekeyboard/consolekeyboard.h
+++ b/keyboards/handwired/consolekeyboard/20key/20key.h
diff --git a/keyboards/handwired/consolekeyboard/config.h b/keyboards/handwired/consolekeyboard/20key/config.h
index 3e6e24d630..077e73321f 100644
--- a/keyboards/handwired/consolekeyboard/config.h
+++ b/keyboards/handwired/consolekeyboard/20key/config.h
@@ -23,7 +23,7 @@
 #define PRODUCT_ID      0x3432
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Stream Cheap
-#define PRODUCT         Console Keyboard
+#define PRODUCT         Console Keyboard 20
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 12
diff --git a/keyboards/handwired/consolekeyboard/info.json b/keyboards/handwired/consolekeyboard/20key/info.json
index 0126ec8c6e..0126ec8c6e 100644
--- a/keyboards/handwired/consolekeyboard/info.json
+++ b/keyboards/handwired/consolekeyboard/20key/info.json
diff --git a/keyboards/handwired/consolekeyboard/keymaps/default/keymap.c b/keyboards/handwired/consolekeyboard/20key/keymaps/default/keymap.c
index facc8ece2b..facc8ece2b 100644
--- a/keyboards/handwired/consolekeyboard/keymaps/default/keymap.c
+++ b/keyboards/handwired/consolekeyboard/20key/keymaps/default/keymap.c
diff --git a/keyboards/handwired/consolekeyboard/keymaps/via/keymap.c b/keyboards/handwired/consolekeyboard/20key/keymaps/via/keymap.c
index a5ab8c8b7f..641dc5988c 100644
--- a/keyboards/handwired/consolekeyboard/keymaps/via/keymap.c
+++ b/keyboards/handwired/consolekeyboard/20key/keymaps/via/keymap.c
@@ -15,22 +15,21 @@
  */
 
 #include QMK_KEYBOARD_H
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
         KC_1,    KC_2,    KC_3,             KC_4,    KC_5,    KC_6,    KC_7,             KC_8,    KC_9,    KC_0,
         KC_Q,    KC_W,    KC_E,             KC_R,    KC_T,    KC_Y,    KC_U,             KC_I,    KC_O,    KC_P
     ),
 [1] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     ),
 [2] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     ),
 [3] = LAYOUT(
-        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS, 
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
     ),
 	};
diff --git a/keyboards/handwired/consolekeyboard/20key/keymaps/via/rules.mk b/keyboards/handwired/consolekeyboard/20key/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/20key/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/consolekeyboard/20key/readme.md b/keyboards/handwired/consolekeyboard/20key/readme.md
new file mode 100644
index 0000000000..80765c01dd
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/20key/readme.md
@@ -0,0 +1,17 @@
+# Console Keyboard
+
+[Console Keyboard](https://i.imgur.com/5aLT7CLl.jpeg)
+
+A 3d printed macro pad based on the Stream Cheap with  20 keys
+
+* Keyboard Maintainer: [Gareth Edwards](https://github.com/gazeddy)
+* Hardware Supported: Arduino Pro Micro
+* Hardware Availability:https://www.thingiverse.com/thing:3167050
+
+Make example for this keyboard (after setting up your build environment):
+  
+   make handwired/consolekeyboard/20key:default
+    
+    
+
+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/handwired/consolekeyboard/20key/rules.mk b/keyboards/handwired/consolekeyboard/20key/rules.mk
new file mode 100644
index 0000000000..1b8f014d86
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/20key/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = yes        # 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 = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes			# Link time optimize
diff --git a/keyboards/handwired/consolekeyboard/27key/27key.c b/keyboards/handwired/consolekeyboard/27key/27key.c
new file mode 100644
index 0000000000..06f0bb9a62
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/27key/27key.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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 "27key.h"
diff --git a/keyboards/handwired/consolekeyboard/27key/27key.h b/keyboards/handwired/consolekeyboard/27key/27key.h
new file mode 100644
index 0000000000..2c68f1f03b
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/27key/27key.h
@@ -0,0 +1,28 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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( \
+    K000, K001, K002,      K004, K005, K006,       K008, K009, K010,   \
+    K100, K101, K102,      K104, K105, K106,       K108, K109, K110,   \
+    K200, K201, K202,      K204, K205, K206,       K208, K209, K210    \
+    ) { \
+    { K000,   K001,   K002,   KC_NO, K004,   K005,   K006,   KC_NO, K008,   K009,   K010   }, \
+    { K100,   K101,   K102,   KC_NO, K104,   K105,   K106,   KC_NO, K108,   K109,   K110   }, \
+    { K200,   K201,   K202,   KC_NO, K204,   K205,   K206,   KC_NO, K208,   K209,   K210   }, \
+}
diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h
new file mode 100644
index 0000000000..daddbd6fcb
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/27key/config.h
@@ -0,0 +1,67 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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       0x6761
+#define PRODUCT_ID      0x3433
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Stream Cheap
+#define PRODUCT         Console Keyboard 30
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 11
+
+/*
+ * 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 { D1, D0, F7}
+#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN F4
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 6
+    #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
+#endif
+
diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json
new file mode 100644
index 0000000000..1b753a9bd0
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/27key/info.json
@@ -0,0 +1,42 @@
+{
+    "keyboard_name": "Console Keyboard",
+    "url": "https://www.thingiverse.com/thing:3167050",
+    "maintainer": "Gareth Edwards",
+    "width": 11,
+    "height": 3,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (D1,D4)", "x":0, "y":0},
+                {"label":"K01 (D1,C6)", "x":1, "y":0},
+                {"label":"K02 (D1,D7)", "x":2, "y":0},
+                {"label":"K04 (D1,B3)", "x":4, "y":0},
+                {"label":"K05 (D1,B2)", "x":5, "y":0},
+                {"label":"K06 (D1,B6)", "x":6, "y":0},
+                {"label":"K08 (D1,E6)", "x":8, "y":0},
+                {"label":"K09 (D1,C4)", "x":9, "y":0},
+                {"label":"K0A (D1,C5)", "x":10, "y":0},
+                {"label":"K10 (D0,D4)", "x":0, "y":1},
+                {"label":"K11 (D0,C6)", "x":1, "y":1},
+                {"label":"K12 (D0,D7)", "x":2, "y":1},
+                {"label":"K14 (D0,B3)", "x":4, "y":1},
+                {"label":"K15 (D0,B2)", "x":5, "y":1},
+                {"label":"K16 (D0,B6)", "x":6, "y":1},
+                {"label":"K18 (D0,E6)", "x":8, "y":1},
+                {"label":"K19 (D0,C4)", "x":9, "y":1},
+                {"label":"K1A (D0,C5)", "x":10, "y":1},
+                {"label":"K20 (F7,D4)", "x":0, "y":2},
+                {"label":"K21 (F7,C6)", "x":1, "y":2},
+                {"label":"K22 (F7,D7)", "x":2, "y":2},
+                {"label":"K24 (F7,B3)", "x":4, "y":2},
+                {"label":"K25 (F7,B2)", "x":5, "y":2},
+                {"label":"K26 (F7,B6)", "x":6, "y":2},
+                {"label":"K27 (F7,E6)", "x":8, "y":2},
+                {"label":"K29 (F7,C4)", "x":9, "y":2},
+                {"label":"K2A (F7,C5)", "x":10, "y":2}
+
+            ]
+        }
+    }
+
+}
diff --git a/keyboards/handwired/consolekeyboard/27key/keymaps/default/keymap.c b/keyboards/handwired/consolekeyboard/27key/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a1f86a2e4a
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/27key/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_1,    KC_2,    KC_3,             KC_4,    KC_5,    KC_6,             KC_8,    KC_9,    KC_0,
+        KC_Q,    KC_W,    KC_E,             KC_R,    KC_T,    KC_Y,             KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,             KC_F,    KC_G,    KC_H,             KC_K,    KC_L,    KC_Z
+    ),
+
+};
diff --git a/keyboards/handwired/consolekeyboard/27key/keymaps/via/keymap.c b/keyboards/handwired/consolekeyboard/27key/keymaps/via/keymap.c
new file mode 100644
index 0000000000..6a4610bd1e
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/27key/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_1,    KC_2,    KC_3,             KC_4,    KC_5,    KC_6,             KC_8,    KC_9,    KC_0,
+        KC_Q,    KC_W,    KC_E,             KC_R,    KC_T,    KC_Y,             KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,             KC_F,    KC_G,    KC_H,             KC_K,    KC_L,    KC_Z
+    ),
+[1] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+[2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+[3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,            KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+	};
diff --git a/keyboards/handwired/consolekeyboard/27key/keymaps/via/rules.mk b/keyboards/handwired/consolekeyboard/27key/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/27key/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/consolekeyboard/27key/readme.md b/keyboards/handwired/consolekeyboard/27key/readme.md
new file mode 100644
index 0000000000..10ca4c64ca
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/27key/readme.md
@@ -0,0 +1,16 @@
+# Console Keyboard
+
+[Console Keyboard](https://i.imgur.com/5aLT7CLl.jpeg)
+
+A 3d printed macro pad based on the Stream Cheap with  27keys
+
+* Keyboard Maintainer: [Gareth Edwards](https://github.com/gazeddy)
+* Hardware Supported: Arduino Pro Micro
+* Hardware Availability:https://www.thingiverse.com/thing:3167050
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/consolekeyboard/27key:default
+    
+
+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/handwired/consolekeyboard/27key/rules.mk b/keyboards/handwired/consolekeyboard/27key/rules.mk
new file mode 100644
index 0000000000..1b8f014d86
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/27key/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = yes        # 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 = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes			# Link time optimize
diff --git a/keyboards/handwired/consolekeyboard/30key/30key.c b/keyboards/handwired/consolekeyboard/30key/30key.c
new file mode 100644
index 0000000000..4500206dd3
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/30key/30key.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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 "30key.h"
diff --git a/keyboards/handwired/consolekeyboard/30key/30key.h b/keyboards/handwired/consolekeyboard/30key/30key.h
new file mode 100644
index 0000000000..34008dcb00
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/30key/30key.h
@@ -0,0 +1,28 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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( \
+    K000, K001, K002,      K004, K005, K006, K007,      K009, K010, K011,   \
+    K100, K101, K102,      K104, K105, K106, K107,      K109, K110, K111,   \
+    K200, K201, K202,      K204, K205, K206, K207,      K209, K210, K211    \
+    ) { \
+    { K000,   K001,   K002,   KC_NO, K004,   K005,   K006,   K007,   KC_NO, K009,   K010,   K011   }, \
+    { K100,   K101,   K102,   KC_NO, K104,   K105,   K106,   K107,   KC_NO, K109,   K110,   K111   }, \
+    { K200,   K201,   K202,   KC_NO, K204,   K205,   K206,   K207,   KC_NO, K209,   K210,   K211   }, \
+}
diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h
new file mode 100644
index 0000000000..447f4e2a9c
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/30key/config.h
@@ -0,0 +1,67 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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       0x6761
+#define PRODUCT_ID      0x3433
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Stream Cheap
+#define PRODUCT         Console Keyboard 30
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 12
+
+/*
+ * 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 { D1, D0, F7}
+#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4, B5 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN F4
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 6
+    #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
+#endif
+
diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json
new file mode 100644
index 0000000000..2b01cbb2c7
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/30key/info.json
@@ -0,0 +1,44 @@
+{
+    "keyboard_name": "Console Keyboard",
+    "url": "https://www.thingiverse.com/thing:3167050",
+    "maintainer": "Gareth Edwards",
+    "width": 12,
+    "height": 3,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K00 (D1,D4)", "x":0, "y":0},
+                {"label":"K01 (D1,C6)", "x":1, "y":0},
+                {"label":"K02 (D1,D7)", "x":2, "y":0},
+                {"label":"K04 (D1,B3)", "x":4, "y":0},
+                {"label":"K05 (D1,B2)", "x":5, "y":0},
+                {"label":"K06 (D1,B6)", "x":6, "y":0},
+                {"label":"K07 (D1,E6)", "x":7, "y":0},
+                {"label":"K09 (D1,B5)", "x":9, "y":0},
+                {"label":"K0A (D1,C4)", "x":10, "y":0},
+                {"label":"K0B (D1,C5)", "x":11, "y":0},
+                {"label":"K10 (D0,D4)", "x":0, "y":1},
+                {"label":"K11 (D0,C6)", "x":1, "y":1},
+                {"label":"K12 (D0,D7)", "x":2, "y":1},
+                {"label":"K14 (D0,B3)", "x":4, "y":1},
+                {"label":"K15 (D0,B2)", "x":5, "y":1},
+                {"label":"K16 (D0,B6)", "x":6, "y":1},
+                {"label":"K17 (D0,E6)", "x":7, "y":1},
+                {"label":"K19 (D0,B5)", "x":9, "y":1},
+                {"label":"K1A (D0,C4)", "x":10, "y":1},
+                {"label":"K1B (D0,C5)", "x":11, "y":1},
+                {"label":"K20 (F7,D4)", "x":0, "y":2},
+                {"label":"K21 (F7,C6)", "x":1, "y":2},
+                {"label":"K22 (F7,D7)", "x":2, "y":2},
+                {"label":"K24 (F7,B3)", "x":4, "y":2},
+                {"label":"K25 (F7,B2)", "x":5, "y":2},
+                {"label":"K26 (F7,B6)", "x":6, "y":2},
+                {"label":"K27 (F7,E6)", "x":7, "y":2},
+                {"label":"K29 (F7,B5)", "x":9, "y":2},
+                {"label":"K2A (F7,C4)", "x":10, "y":2},
+                {"label":"K2B (F7,C5)", "x":11, "y":2}
+            ]
+        }
+    }
+
+}
diff --git a/keyboards/handwired/consolekeyboard/30key/keymaps/default/keymap.c b/keyboards/handwired/consolekeyboard/30key/keymaps/default/keymap.c
new file mode 100644
index 0000000000..97bb384feb
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/30key/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_1,    KC_2,    KC_3,             KC_4,    KC_5,    KC_6,    KC_7,             KC_8,    KC_9,    KC_0,
+        KC_Q,    KC_W,    KC_E,             KC_R,    KC_T,    KC_Y,    KC_U,             KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,             KC_F,    KC_G,    KC_H,    KC_J,             KC_K,    KC_L,    KC_Q
+    ),
+
+};
diff --git a/keyboards/handwired/consolekeyboard/30key/keymaps/via/keymap.c b/keyboards/handwired/consolekeyboard/30key/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1b47baddf0
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/30key/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2021 Gareth Edwards
+ *
+ * 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_1,    KC_2,    KC_3,             KC_4,    KC_5,    KC_6,    KC_7,             KC_8,    KC_9,    KC_0,
+        KC_Q,    KC_W,    KC_E,             KC_R,    KC_T,    KC_Y,    KC_U,             KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,             KC_F,    KC_G,    KC_H,    KC_J,             KC_K,    KC_L,    KC_Z
+    ),
+[1] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+[2] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+[3] = LAYOUT(
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,             KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+	};
diff --git a/keyboards/handwired/consolekeyboard/30key/keymaps/via/rules.mk b/keyboards/handwired/consolekeyboard/30key/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/30key/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/handwired/consolekeyboard/30key/readme.md b/keyboards/handwired/consolekeyboard/30key/readme.md
new file mode 100644
index 0000000000..b24e3b199f
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/30key/readme.md
@@ -0,0 +1,16 @@
+# Console Keyboard
+
+[Console Keyboard](https://i.imgur.com/5aLT7CLl.jpeg)
+
+A 3d printed macro pad based on the Stream Cheap with  30 keys
+
+* Keyboard Maintainer: [Gareth Edwards](https://github.com/gazeddy)
+* Hardware Supported: Arduino Pro Micro
+* Hardware Availability:https://www.thingiverse.com/thing:3167050
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/consolekeyboard/30key:default
+    
+
+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/handwired/consolekeyboard/30key/rules.mk b/keyboards/handwired/consolekeyboard/30key/rules.mk
new file mode 100644
index 0000000000..1b8f014d86
--- /dev/null
+++ b/keyboards/handwired/consolekeyboard/30key/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = yes        # 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 = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes			# Link time optimize
diff --git a/keyboards/handwired/consolekeyboard/readme.md b/keyboards/handwired/consolekeyboard/readme.md
index 303a394bd5..877245502a 100644
--- a/keyboards/handwired/consolekeyboard/readme.md
+++ b/keyboards/handwired/consolekeyboard/readme.md
@@ -2,7 +2,7 @@
 
 [Console Keyboard](https://i.imgur.com/5aLT7CLl.jpeg)
 
-A 3d printed macro pad based on the Stream Cheap
+A 3d printed macro pad based on the Stream Cheap with  18,20,27,or 30 keys
 
 * Keyboard Maintainer: [Gareth Edwards](https://github.com/gazeddy)
 * Hardware Supported: Arduino Pro Micro
@@ -10,6 +10,10 @@ A 3d printed macro pad based on the Stream Cheap
 
 Make example for this keyboard (after setting up your build environment):
 
-    make handwired/consolekeyboard:default
+    make handwired/consolekeyboard/18key:default
+    make handwired/consolekeyboard/20key:default
+    make handwired/consolekeyboard/27key:default
+    make handwired/consolekeyboard/30key:default
+    
 
 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).