[Keyboard] move g heavy industry boards into /gboards (#16040)

Co-authored-by: zvecr <git@zvecr.com>

28 files changed, 4182 insertions, 0 deletions

diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h
new file mode 100644
index 0000000000..5cd2f1620e
--- /dev/null
+++ b/keyboards/gboards/georgi/config.h
@@ -0,0 +1,72 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
+
+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/>.
+*/
+
+// Copy and worked on with love from the EZ team
+
+#pragma once
+#include "config_common.h"
+
+/* Defaults */
+
+#define VERSION "v1.1: ClayM"
+#define VERBOSE
+
+#define FORCE_NKRO
+#define NO_ACTION_FUNCTION
+#define NO_ACTION_ONESHOT
+#define NO_ACTION_MACRO
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x1337
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    g Heavy Industries 
+#define PRODUCT         Georgi
+
+/* key matrix size */
+#define MATRIX_ROWS 14
+#define MATRIX_ROWS_PER_SIDE (MATRIX_ROWS / 2)
+#define MATRIX_COLS 4
+
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_DELAY          0
+#define MOUSEKEY_TIME_TO_MAX    60
+#define MOUSEKEY_MAX_SPEED      7
+#define MOUSEKEY_WHEEL_DELAY 0
+#define TAPPING_TOGGLE  2
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+#define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
+
+/* 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
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
+    get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
+)
+
+#define DEBOUNCE    5
+#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/gboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
new file mode 100644
index 0000000000..8866886ce7
--- /dev/null
+++ b/keyboards/gboards/georgi/georgi.c
@@ -0,0 +1,68 @@
+#include QMK_KEYBOARD_H
+
+bool i2c_initialized = 0;
+i2c_status_t mcp23018_status = 0x20;
+
+void matrix_init_kb(void) {
+  	steno_set_mode(STENO_MODE_GEMINI); // or STENO_MODE_BOLT
+
+    // (tied to Vcc for hardware convenience)
+    //DDRB  &= ~(1<<4);  // set B(4) as input
+    //PORTB &= ~(1<<4);  // set B(4) internal pull-up disabled
+
+    // unused pins - C7, D4, D5, D7, E6
+    // set as input with internal pull-up enabled
+    DDRC  &= ~(1<<7);
+    DDRD  &= ~(1<<5 | 1<<4 | 1<<6 | 1<<7);
+    DDRE  &= ~(1<<6);
+    PORTC |=  (1<<7);
+    PORTD |=  (1<<5 | 1<<4 | 1<<6 | 1<<7);
+    PORTE |=  (1<<6);
+
+    matrix_init_user();
+}
+
+
+uint8_t init_mcp23018(void) {
+    print("starting init");
+    mcp23018_status = 0x20;
+
+    // I2C subsystem
+
+    // uint8_t sreg_prev;
+    // sreg_prev=SREG;
+    // cli();
+
+    if (i2c_initialized == 0) {
+        i2c_init();  // on pins D(1,0)
+        i2c_initialized = true;
+        _delay_ms(1000);
+    }
+    // i2c_init(); // on pins D(1,0)
+    // _delay_ms(1000);
+
+    // set pin direction
+    // - unused  : input  : 1
+    // - input   : input  : 1
+    // - driving : output : 0
+    mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(IODIRA, ERGODOX_EZ_I2C_TIMEOUT);            if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(0b10000000, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(0b11111111, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
+    i2c_stop();
+
+    // set pull-up
+    // - unused  : on  : 1
+    // - input   : on  : 1
+    // - driving : off : 0
+    mcp23018_status = i2c_start(I2C_ADDR_WRITE, ERGODOX_EZ_I2C_TIMEOUT);    if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(GPPUA, ERGODOX_EZ_I2C_TIMEOUT);             if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(0b10000000, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
+    mcp23018_status = i2c_write(0b11111111, ERGODOX_EZ_I2C_TIMEOUT);        if (mcp23018_status) goto out;
+
+out:
+    i2c_stop();
+    // SREG=sreg_prev;
+    //uprintf("Init %x\n", mcp23018_status);
+    return mcp23018_status;
+}
diff --git a/keyboards/gboards/georgi/georgi.h b/keyboards/gboards/georgi/georgi.h
new file mode 100644
index 0000000000..e5a52c585d
--- /dev/null
+++ b/keyboards/gboards/georgi/georgi.h
@@ -0,0 +1,80 @@
+#pragma once
+#include <util/delay.h>
+#include <stdint.h>
+#include <stdbool.h>
+#include "quantum.h"
+#include "i2c_master.h"
+#include "matrix.h"
+
+
+extern i2c_status_t mcp23018_status;
+#define ERGODOX_EZ_I2C_TIMEOUT 1000
+
+// I2C aliases and register addresses (see "mcp23018.md")
+//#define I2C_ADDR        0b0100000
+#define I2C_ADDR        0x20
+#define I2C_ADDR_WRITE  ( (I2C_ADDR<<1) | I2C_WRITE )
+#define I2C_ADDR_READ   ( (I2C_ADDR<<1) | I2C_READ  )
+#define IODIRA          0x00            // i/o direction register
+#define IODIRB          0x01
+#define GPPUA           0x0C            // GPIO pull-up resistor register
+#define GPPUB           0x0D
+#define GPIOA           0x12            // general purpose i/o port register (write modifies OLAT)
+#define GPIOB           0x13
+#define OLATA           0x14            // output latch register
+#define OLATB           0x15
+
+void init_ergodox(void);
+uint8_t init_mcp23018(void);
+
+/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */
+#define LAYOUT_georgi(                                            \
+    L00,L01,L02,L03,L04,L05,            R00,R01,R02,R03,R04,R05,  \
+    L10,L11,L12,L13,L14,L15,            R10,R11,R12,R13,R14,R15,  \
+               	L20,L21,L22,            R20,R21,R22)              \
+                                                                  \
+    {                         \
+    { KC_NO,  R00,   R10,   R21},     \
+    { KC_NO,  R01,   R11,   R20},     \
+    { KC_NO,  R02,   R12,   R22},     \
+    { KC_NO,  R03,   R13,   KC_NO},   \
+    { KC_NO,  R04,   R14,   KC_NO},   \
+    { KC_NO,  R05,   R15,   KC_NO},   \
+    { KC_NO,  KC_NO, KC_NO, KC_NO},     \
+							  \
+    { KC_NO,  L05,   L15,   L22},     \
+    { KC_NO,  L04,   L14,   L21},     \
+    { KC_NO,  L03,   L13,   L20},     \
+    { KC_NO,  L02,   L12,   KC_NO},   \
+    { KC_NO,  L01,   L11,   KC_NO},   \
+    { KC_NO,  L00,   L10,   KC_NO},   \
+    { KC_NO,  KC_NO, KC_NO, KC_NO},     \
+                              \
+}
+
+/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- 
+#define LAYOUT_GERGO(                                                    \
+    L00,L01,L02,L03,L04,L05,                   R00,R01,R02,R03,R04,R05,  \
+    L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \
+    L20,L21,L22,L23,L24,L25,L26,           R20,R21,R22,R23,R24,R25,R26,  \
+                L31,L32,                           R33,R34,              \
+                            L30,           R30,                          \
+                        L33,L34,           R31,R32)                      \
+                                                                         \
+    {                               \
+    { KC_NO, L16,   L26,  L30},     \
+    { L05,   L15,   L25,  L34},     \
+    { L04,   L14,   L24,  L33},     \
+    { L03,   L13,   L23,  L32},     \
+    { L02,   L12,   L22,  L31},     \
+    { L01,   L11,   L21,  KC_NO},   \
+    { L00,   L10,   L20,  KC_NO},   \
+                                    \
+    { KC_NO, R10, R20, R30},      \
+    { R00,   R11,   R21, R31},      \
+    { R01,   R12,   R22, R32},      \
+    { R02,   R13,   R23, R33},      \
+    { R03,   R14,   R24, R34},      \
+    { R04,   R15,   R25, KC_NO},    \
+    { R05,   R16,   R26, KC_NO},    \
+} */
diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json
new file mode 100644
index 0000000000..89d2cd883f
--- /dev/null
+++ b/keyboards/gboards/georgi/info.json
@@ -0,0 +1,131 @@
+{
+    "keyboard_name": "Georgi",
+    "url": "http://gboards.ca",
+    "maintainer": "germ",
+    "layouts": {
+        "LAYOUT_georgi": {
+            "layout": [
+                {
+                    "x": 0.05,
+                    "y": 0.54
+                },
+                {
+                    "x": 1.06,
+                    "y": 0.55
+                },
+                {
+                    "x": 2.06,
+                    "y": 0.29
+                },
+                {
+                    "x": 3.05,
+                    "y": 0.16
+                },
+                {
+                    "x": 4.06,
+                    "y": 0.41
+                },
+                {
+                    "x": 5.06,
+                    "y": 0.54
+                },
+                {
+                    "x": 7.1899999999999995,
+                    "y": 0.41
+                },
+                {
+                    "x": 8.2,
+                    "y": 0.3
+                },
+                {
+                    "x": 9.2,
+                    "y": 0.05
+                },
+                {
+                    "x": 10.2,
+                    "y": 0.29
+                },
+                {
+                    "x": 11.2,
+                    "y": 0.43
+                },
+                {
+                    "x": 12.2,
+                    "y": 0.42
+                },
+                {
+                    "x": 0.05,
+                    "y": 1.54
+                },
+                {
+                    "x": 1.06,
+                    "y": 1.54
+                },
+                {
+                    "x": 2.06,
+                    "y": 1.28
+                },
+                {
+                    "x": 3.05,
+                    "y": 1.16
+                },
+                {
+                    "x": 4.06,
+                    "y": 1.4
+                },
+                {
+                    "x": 5.06,
+                    "y": 1.54
+                },
+                {
+                    "x": 7.1899999999999995,
+                    "y": 1.4
+                },
+                {
+                    "x": 8.2,
+                    "y": 1.28
+                },
+                {
+                    "x": 9.2,
+                    "y": 1.04
+                },
+                {
+                    "x": 10.2,
+                    "y": 1.28
+                },
+                {
+                    "x": 11.2,
+                    "y": 1.42
+                },
+                {
+                    "x": 12.2,
+                    "y": 1.42
+                },
+                {
+                    "x": 3.05,
+                    "y": 2.67
+                },
+                {
+                    "x": 4.06,
+                    "y": 2.68
+                },
+                {
+                    "x": 5.06,
+                    "y": 2.68
+                },
+                {
+                    "x": 7.19,
+                    "y": 2.67
+                },
+                {
+                    "x": 8.2,
+                    "y": 2.67
+                },
+                {
+                    "x": 9.2,
+                    "y": 2.66
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
new file mode 100644
index 0000000000..29b35f6abd
--- /dev/null
+++ b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
@@ -0,0 +1,306 @@
+/*
+ * Good on you for modifying your layout, this is the most nonQMK layout you will come across
+ * There are three modes, Steno (the default), QWERTY (Toggleable) and a Momentary symbol layer
+ *
+ * Don't modify the steno layer directly, instead add chords using the keycodes and macros
+ * from sten.h to the layout you want to modify.
+ *
+ * Observe the comment above processQWERTY!
+ *
+ * http://docs.gboards.ca
+ */
+
+#include QMK_KEYBOARD_H
+#include "sten.h"
+#include "keymap_steno.h"
+#define IGNORE_MOD_TAP_INTERRUPT
+
+// Steno Layers
+#define FUNCT	( LSD | LK | LP | LH )
+#define MEDIA	( LSD | LK | LW | LR )
+#define MOVE	( LSD | LK )
+#define NUM		( PWR )
+#define SYM		( RZ )
+
+// Keys and chords that, once they appear, are added to every subsequent partial chord
+// until the whole thing is sent.
+uint32_t stenoLayers[] = {NUM, SYM, MOVE, MEDIA, FUNCT};
+
+// QMK Layers
+#define STENO_LAYER   0
+#define GAMING		  1
+#define GAMING_2	  2
+
+/* Keyboard Layout
+ * ,---------------------------------.	  ,------------------------------.
+ * | FN  | LSU | LFT | LP | LH | ST1 |	  | ST3 | RF | RP | RL | RT | RD |
+ * |-----+-----+-----+----+----|-----|	  |-----|----+----+----+----+----|
+ * | PWR | LSD | LK  | LW | LR | ST2 |	  | ST4 | RR | RB | RG | RS | RZ |
+ * `---------------------------------'	  `------------------------------'
+ *					 ,---------------,	  .---------------.
+ *					 | LNO | LA | LO |	  | RE | RU | RNO |
+ *					 `---------------'	  `---------------'
+ */
+
+// Note: You can only use basic keycodes here!
+//
+// P() is just a wrapper to make your life easier.
+// PC() applies the mapping to all of the StenoLayers. For overloading, define these last.
+//
+// FN is unavailable. That is reserved for system use.
+// Chords containing PWR are always available, even in steno mode.
+//
+// http://docs.gboards.ca
+uint32_t processQwerty(bool lookup) {
+	// Special keys
+	P( RT  | RS  | RD  | RZ | LNO,		SEND_STRING(VERSION); SEND_STRING(__DATE__));
+	P( LFT | LK  | LP  | LW,			REPEAT());
+
+	// Mouse Keys
+	/* P( LO  | LSD | LK,	CLICK_MOUSE(KC_MS_BTN2)); */
+	/* P( LO  | LR  | LW,	CLICK_MOUSE(KC_MS_BTN1)); */
+
+
+/* Function layer
+ * ,-----------------------------------,    ,-----------------------------------,
+ * |     |     |     | NCTFUNCTF |     |    |     | F1  | F2  | F3  | F4  |     |
+ * |     +     +     +     +     +     |    |     + F5  + F6  + F7  + F8  +     |
+ * |     | FUNCTFUNC |     |     |     |    |     | F9  | F10 | F11 | F12 |     |
+ * `-----+-----+-----+-----+-----+-----'    `-----+-----+-----+-----+-----+-----'
+*/
+	P( FUNCT | RF,			SEND(KC_F1));
+	P( FUNCT | RP,			SEND(KC_F2));
+	P( FUNCT | RL,			SEND(KC_F3));
+	P( FUNCT | RT,			SEND(KC_F4));
+
+	P( FUNCT | RF | RR,		SEND(KC_F5));
+	P( FUNCT | RP | RB,		SEND(KC_F6));
+	P( FUNCT | RL | RG,		SEND(KC_F7));
+	P( FUNCT | RT | RS,		SEND(KC_F8));
+
+	P( FUNCT | RR,			SEND(KC_F9));
+	P( FUNCT | RG,			SEND(KC_F10));
+	P( FUNCT | RB,			SEND(KC_F11));
+	P( FUNCT | RS,			SEND(KC_F12));
+
+
+/* Movement layer
+ * ,-----------------------------------,    ,-----------------------------------,
+ * |     |     |     |     |     |     |    |     | <-  |  ↓  |  ↑  | ->  |     |
+ * |     +     +     +     +     +     |    |     +     +     +     +     +     |
+ * |     | MOVEMOVEM |     |     |     |    |     | Hm  | PgD | PgU | End |     |
+ * `-----+-----+-----+-----+-----+-----'    `-----+-----+-----+-----+-----+-----'
+*/
+	P( MOVE | RF,			SEND(KC_LEFT));
+	P( MOVE | RP,			SEND(KC_DOWN));
+	P( MOVE | RL,			SEND(KC_UP));
+	P( MOVE | RT,			SEND(KC_RIGHT));
+
+	P( MOVE | RR,			SEND(KC_HOME));
+	P( MOVE | RB,			SEND(KC_PGDN));
+	P( MOVE | RG,			SEND(KC_PGUP));
+	P( MOVE | RS,			SEND(KC_END));
+
+
+/* Media Layer
+ * ,-----------------------------------,    ,-----------------------------------,
+ * |     |     |     |     |     |     |    |     |Prev |Play | PLY |Next | VolU|
+ * |     +     +     +     +     +     |    |     +     +     +     +     +     |
+ * |     | MEDIAMEDIAMEDIAMEDIAM |     |    |     |     |     |     |Mute | VolD|
+ * `-----+-----+-----+-----+-----+-----'    `-----+-----+-----+-----+-----+-----'
+*/
+	P( MEDIA | RF,			SEND(KC_MPRV));
+	P( MEDIA | RP,			SEND(KC_MPLY));
+	P( MEDIA | RL,			SEND(KC_MPLY));
+	P( MEDIA | RT,			SEND(KC_MNXT));
+	P( MEDIA | RD,			SEND(KC_VOLU));
+
+	P( MEDIA | RS,			SEND(KC_MUTE));
+	P( MEDIA | RZ,			SEND(KC_VOLD));
+
+
+/* Numbers
+ * ,-----------------------------------,    ,-----------------------------------,
+ * |     |     |  a  |  b  |  c  |     |    |  :  |  1  |  2  |  3  |  .  |     |
+ * |     +     +  d  +  e  +  f  +     |    |  0  +  4  +  5  +  6  +  -  +     |
+ * | NUM |     |     |     |     |     |    |     |  7  |  8  |  9  |  0  |     |
+ * `-----+-----+-----+-----+-----+-----'    `-----+-----+-----+-----+-----+-----'
+*/
+	P( NUM | LFT,			SEND(KC_A));
+	P( NUM | LP,			SEND(KC_B));
+	P( NUM | LH,			SEND(KC_C));
+	P( NUM | LK,			SEND(KC_D));
+	P( NUM | LW,			SEND(KC_E));
+	P( NUM | LR,			SEND(KC_F));
+
+	// Right hand
+	P( NUM | ST3,			SEND_STRING(":"));
+	P( NUM | RF,			SEND(KC_1));
+	P( NUM | RP,			SEND(KC_2));
+	P( NUM | RL,			SEND(KC_3));
+	P( NUM | RT,			SEND(KC_DOT));
+
+	P( NUM | ST3 | ST4,		SEND(KC_0));
+	P( NUM | RF  | RR,		SEND(KC_4));
+	P( NUM | RP  | RB,		SEND(KC_5));
+	P( NUM | RG  | RL,		SEND(KC_6));
+	P( NUM | RT  | RS,		SEND(KC_MINUS));
+
+	P( NUM | RR,			SEND(KC_7));
+	P( NUM | RB,			SEND(KC_8));
+	P( NUM | RG,			SEND(KC_9));
+	P( NUM | RS,			SEND(KC_0));
+
+
+/* Symbols
+ * ,-----------------------------------,    ,-----------------------------------,
+ * |     |  `  |  [  |  {  |  (  |  <  |    |  >  |  )  |  }  |  ]  |  ?  |     |
+ * |     +  ~  +  -  +  '  +  :  +  _  |    |  \  +  =  +  "  +  +  +  ?  +     |
+ * |     |  !  |  @  |  #  |  $  |  %  |    |  |  |  ^  |  &  |  *  |  ?  | SYM |
+ * `-----+-----+-----+-----+-----+-----'    `-----+-----+-----+-----+-----+-----'
+*/
+	// Left hand
+	P( SYM | LSU,			SEND(KC_GRV));
+	P( SYM | LFT,			SEND(KC_LBRC));
+	P( SYM | LP,			SEND_STRING("{"));
+	P( SYM | LH,			SEND_STRING("("));
+	P( SYM | ST1,			SEND_STRING("<"));
+
+	P( SYM | LSU | LSD,		SEND_STRING("~"));
+	P( SYM | LFT | LK,		SEND(KC_MINS));
+	P( SYM | LP  | LW,		SEND(KC_QUOTE));
+	P( SYM | LH  | LR,		SEND_STRING(":"));
+	P( SYM | ST1 | ST2,		SEND_STRING("_"));
+
+	P( SYM | LSD,			SEND_STRING("!"));
+	P( SYM | LK,			SEND_STRING("@"));
+	P( SYM | LW,			SEND_STRING("#"));
+	P( SYM | LR,			SEND_STRING("$"));
+	P( SYM | ST2,			SEND_STRING("%"));
+
+	// Right hand
+	P( SYM | ST3,			SEND_STRING(">"));
+	P( SYM | RF,			SEND_STRING(")"));
+	P( SYM | RP,			SEND_STRING("}"));
+	P( SYM | RL,			SEND_STRING("]"));
+	P( SYM | RT,			SEND_STRING("?"));
+
+	P( SYM | ST3 | ST4,		SEND(KC_BSLASH));
+	P( SYM | RF  | RR,		SEND(KC_EQUAL));
+	P( SYM | RP  | RB,		SEND_STRING("\""));
+	P( SYM | RG  | RL,		SEND_STRING("+"));
+	P( SYM | RT  | RS,		SEND_STRING("?"));
+
+	P( SYM | ST4,			SEND_STRING("|"));
+	P( SYM | RR,			SEND_STRING("^"));
+	P( SYM | RB,			SEND_STRING("&"));
+	P( SYM | RG,			SEND_STRING("*"));
+	P( SYM | RS,			SEND_STRING("?"));
+
+
+/* Letters
+ * ,-----------------------------------,    ,-----------------------------------,
+ * |     |  Q  |  W  |  F  |  P  |  B  |    |  J  |  L  |  U  |  Y  |  ;  | ctl |
+ * +-----+- A -+- R -+- S -+- T -+- G -|    |- M -+- N -+- E -+- I -+- O -+-----|
+ * | bsp |  Z  |  X  |  C  |  D  |  V  |    |  K  |  H  |  ,  |  .  |  /  | del |
+ * `-----+-----+-----+-----+-----+-----'    `-----+-----+-----+-----+-----+-----'
+ *					   ,---------------,    .---------------.
+ *					   | alt | ent|shfr|    | spc| gui| alt |
+ *					   `---------------'    `---------------'
+*/
+	// Left hand
+	P( LSU,					SEND(KC_Q));
+	P( LFT,					SEND(KC_W));
+	P( LP,					SEND(KC_F));
+	P( LH,					SEND(KC_P));
+	P( ST1,					SEND(KC_B));
+
+	P( LSU | LSD,			SEND(KC_A));
+	P( LFT | LK,			SEND(KC_R));
+	P( LP  | LW,			SEND(KC_S));
+	P( LH  | LR,			SEND(KC_T));
+	P( ST1 | ST2,			SEND(KC_G));
+
+	P( LSD,					SEND(KC_Z));
+	P( LK,					SEND(KC_X));
+	P( LW,					SEND(KC_C));
+	P( LR,					SEND(KC_D));
+	P( ST2,					SEND(KC_V));
+
+	// Right hand
+	P( ST3,					SEND(KC_J));
+	P( RF,					SEND(KC_L));
+	P( RP,					SEND(KC_U));
+	P( RL,					SEND(KC_Y));
+	P( RT,					SEND(KC_SCLN));
+
+	P( ST3 | ST4,			SEND(KC_M));
+	P( RF  | RR,			SEND(KC_N));
+	P( RP  | RB,			SEND(KC_E));
+	P( RG  | RL,			SEND(KC_I));
+	P( RT  | RS,			SEND(KC_O));
+
+	P( ST4,					SEND(KC_K));
+	P( RR,					SEND(KC_H));
+	P( RB,					SEND(KC_COMM));
+	P( RG,					SEND(KC_DOT));
+	P( RS,					SEND(KC_SLSH));
+
+	// Thumb Chords and modifiers
+	//
+	PC( LNO | RNO | LA | RU,		SEND(KC_LCTL); SEND(KC_LSFT));
+	PC( LNO | LA  | RE,				SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_LALT));
+
+	// overrides
+	P( PWR | LO,			SEND(KC_LSFT); SEND(KC_BSPC));
+	P( PWR | RD,			SEND(KC_LCTL); SEND(KC_BSPC));
+	P( RZ | RD,				SEND(KC_LCTL); SEND(KC_DEL));
+
+	PC( LNO | LA | LO,		SEND(KC_LSFT); SEND(KC_ESC));
+	PC( LA | LO,			SEND(KC_ESC));
+	PC( LNO,				SEND(KC_LALT));
+	PC( LA,					SEND(KC_ENT));
+	PC( LO,					SEND(KC_LSFT));
+
+	PC( RNO,				SEND(KC_RALT));
+	PC( RE | RU,			SEND(KC_TAB));
+	PC( RE,					SEND(KC_SPC));
+	PC( RU,					SEND(KC_LGUI));
+   
+	PC( PWR,				SEND(KC_BSPC));
+	PC( RD,					SEND(KC_LCTL));
+	P( RZ,					SEND(KC_DEL));
+
+	return 0;
+}
+
+// "Layers"
+// Steno layer should be first in your map.
+// When PWR | FN | ST3 | ST4 is pressed, the layer is increased to the next map. You must return to STENO_LAYER at the end.
+// If you need more space for chords, remove the two gaming layers.
+// Note: If using NO_ACTION_TAPPING, LT will not work!
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	// Main layer, everything goes through here
+	[STENO_LAYER] = LAYOUT_georgi(
+			STN_FN,  STN_S1,  STN_TL,  STN_PL,	STN_HL,  STN_ST1,		STN_ST3, STN_FR,  STN_PR,  STN_LR,	STN_TR,  STN_DR,
+			STN_PWR, STN_S2,  STN_KL,  STN_WL,	STN_RL,  STN_ST2,		STN_ST4, STN_RR,  STN_BR,  STN_GR,	STN_SR,  STN_ZR,
+								   STN_N1,		STN_A,	 STN_O,			STN_E,	 STN_U,   STN_N7
+	),
+	// Gaming layer with Numpad, Very limited
+	[GAMING] = LAYOUT_georgi(
+		KC_LSFT, KC_Q,	  KC_W,    KC_E,	KC_R,	 KC_T,						 KC_Y,	  KC_U,    KC_I,	KC_O,	 KC_P,	  KC_ENT,
+		KC_LCTL, KC_A,	  KC_S,    KC_D,	KC_F,	 KC_G,						 KC_H,	  KC_J,    KC_K,	KC_L,	 KC_SCLN, KC_DQUO,
+								   KC_LALT, KC_SPC,  LT(GAMING_2, KC_ENT),		 KC_DEL,  KC_ASTR, TO(STENO_LAYER)
+	),
+
+	[GAMING_2] = LAYOUT_georgi(
+		KC_LSFT, KC_1,	  KC_2,    KC_3,	KC_4,	 KC_5,			KC_6,	 KC_7,	  KC_8,    KC_9,	KC_0,	 KC_MINS,
+		KC_LCTL, KC_Z,	  KC_X,    KC_C,	KC_V,	 KC_B,			KC_N,	 KC_M,	  KC_LT,   KC_GT,	KC_QUES, KC_RSFT,
+								   KC_LALT, KC_SPC,  KC_ENT,		KC_DEL,  KC_ASTR, TO(STENO_LAYER)
+	)
+};
+
+// Don't fuck with this, thanks.
+size_t keymapsCount  = sizeof(keymaps)/sizeof(keymaps[0]);
+size_t stenoLayerCount = sizeof(stenoLayers)/sizeof(stenoLayers[0]);
diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/readme.md b/keyboards/gboards/georgi/keymaps/colemak-dh/readme.md
new file mode 100644
index 0000000000..f9da34b024
--- /dev/null
+++ b/keyboards/gboards/georgi/keymaps/colemak-dh/readme.md
@@ -0,0 +1,11 @@
+# Georgi QWERTY/Steno firmware
+
+This is the default keymap for Georgi, it's based heavily off of the naps62 ErgoDox and the Gergo layout. 
+It is both a ergonomic and programmer friendly keymap.
+
+Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
+
+## Space issues
+If you find yourself running out of space for dictionary entries, disabling mousekeys in rules.mk will save
+you about 4k for entries!
+Get a free 1k by deleting the Gaming layers from the keymap!
diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk b/keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk
new file mode 100644
index 0000000000..07394aef48
--- /dev/null
+++ b/keyboards/gboards/georgi/keymaps/colemak-dh/rules.mk
@@ -0,0 +1,45 @@
+#----------------------------------------------------------------------------
+# make georgi:claymager:dfu
+# Make sure you have dfu-programmer installed!
+#----------------------------------------------------------------------------
+
+NO_REPEAT				 = yes
+VERBOSE					 = yes
+KEYBOARD_SHARED_EP       = yes
+CUSTOM_MATRIX			 = yes
+STENO_LAYERS			 = yes
+
+#Firmware reduction options
+MOUSEKEY_ENABLE			 = yes 		# 1500 bytes
+NO_TAPPING				 = no 	    # 2000 bytes
+NO_PRINT				 = yes
+
+#Debug options
+CONSOLE_ENABLE			 = no
+DEBUG_MATRIX_SCAN_RATE   = no
+DEBUG_MATRIX			 = no
+ONLY_QWERTY				 = no
+
+# A bunch of stuff that you shouldn't touch unless you
+# know what you're doing.
+#
+# No touchy, capiche?
+SRC += matrix.c i2c_master.c
+ifeq ($(strip $(DEBUG_MATRIX)), yes)
+    OPT_DEFS += -DDEBUG_MATRIX
+endif
+ifeq ($(strip $(NO_REPEAT)), yes)
+    OPT_DEFS += -DNO_REPEAT
+endif
+ifeq ($(strip $(NO_PRINT)), yes)
+    OPT_DEFS += -DNO_PRINT -DNO_DEBUG
+endif
+ifeq ($(strip $(ONLY_QWERTY)), yes)
+    OPT_DEFS += -DONLYQWERTY
+endif
+ifeq ($(strip $(NO_TAPPING)), yes)
+    OPT_DEFS += -DNO_ACTION_TAPPING
+endif
+ifeq ($(strip $(STENO_LAYERS)), yes)
+    OPT_DEFS += -DSTENOLAYERS
+endif
diff --git a/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c b/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
new file mode 100644
index 0000000000..09243f2a24
--- /dev/null
+++ b/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
@@ -0,0 +1,237 @@
+/*
+ * Good on you for modifying your layout, this is the most nonQMK layout you will come across
+ * There are three modes, Steno (the default), QWERTY (Toggleable) and a Momentary symbol layer
+ *
+ * Don't modify the steno layer directly, instead add chords using the keycodes and macros
+ * from sten.h to the layout you want to modify.
+ *
+ * Observe the comment above processQWERTY!
+ *
+ * http://docs.gboards.ca
+ */
+
+#include QMK_KEYBOARD_H
+#include "sten.h"
+#include "keymap_steno.h"
+
+// Proper Layers
+#define FUNCT   (LSD | LK | LP | LH)
+#define MEDIA   (LSD | LK | LW | LR)
+#define MOVE    (ST1 | ST2)
+
+// QMK Layers
+#define STENO_LAYER   0
+#define GAMING        1
+#define GAMING_2      2
+
+/* Keyboard Layout
+ * ,---------------------------------.    ,------------------------------.
+ * | FN  | LSU | LFT | LP | LH | ST1 |    | ST3 | RF | RP | RL | RT | RD |
+ * |-----+-----+-----+----+----|-----|    |-----|----+----+----+----+----|
+ * | PWR | LSD | LK  | LW | LR | ST2 |    | ST4 | RR | BB | RG | RS | RZ |
+ * `---------------------------------'    `------------------------------'
+ *                   ,---------------,    .---------------.
+ *                   | LNO | LA | LO |    | RE | RU | RNO |
+ *                   `---------------'    `---------------'
+ */
+
+// Note: You can only use basic keycodes here!
+// P() is just a wrapper to make your life easier.
+//
+// http://docs.gboards.ca
+uint32_t processQwerty(bool lookup) {
+    // Specials
+    P( RT  | RS  | RD  | RZ | LNO,        SEND_STRING(VERSION); SEND_STRING(__DATE__));
+    P( LNO | RNO | LA  | LO | RE | RU,    SEND(KC_MPLY));
+    P( LFT | LK  | LP  | LW,              REPEAT());
+    P( ST1 | ST2 | LW  | ST4,             SEND(KC_BSPC));
+
+    // Mouse Keys
+    P( LO  | LSD | LK,    CLICK_MOUSE(KC_MS_BTN2));
+    P( LO  | LR  | LW,    CLICK_MOUSE(KC_MS_BTN1));
+
+    // Thumb Chords
+    P( LA  | LO  | RE  | RU,    SEND(KC_CAPS));
+    P( LA  | RU,                SEND(KC_ESC));
+    P( LO  | RE,                SEND(KC_LCTL));
+    P( LNO | RNO | LA | RU,     SEND(KC_LCTL); SEND(KC_LSFT));
+    P( LNO | LA  | RE,          SEND(KC_LCTL); SEND(KC_LSFT); SEND(KC_LALT));
+
+    // Mods
+    P( RT |