Merge branch 'develop'

7 files changed, 36 insertions, 99 deletions

diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h
index 858f99208f..db2ff42a1e 100644
--- a/keyboards/gboards/georgi/config.h
+++ b/keyboards/gboards/georgi/config.h
@@ -25,9 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VERSION "v1.1: ClayM"
 #define VERBOSE
 
-#define FORCE_NKRO
 #define NO_ACTION_ONESHOT
-#define IGNORE_MOD_TAP_INTERRUPT
 
 /* key matrix size */
 #define MATRIX_ROWS 14
@@ -42,7 +40,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TAPPING_TOGGLE  2
 
 #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
@@ -54,5 +51,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
     get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
 )
-
-#define USB_MAX_POWER_CONSUMPTION 500
diff --git a/keyboards/gboards/georgi/georgi.c b/keyboards/gboards/georgi/georgi.c
index 8866886ce7..dd95b593f1 100644
--- a/keyboards/gboards/georgi/georgi.c
+++ b/keyboards/gboards/georgi/georgi.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include "georgi.h"
 
 bool i2c_initialized = 0;
 i2c_status_t mcp23018_status = 0x20;
diff --git a/keyboards/gboards/georgi/georgi.h b/keyboards/gboards/georgi/georgi.h
index 47fb1831c8..e23fc264f4 100644
--- a/keyboards/gboards/georgi/georgi.h
+++ b/keyboards/gboards/georgi/georgi.h
@@ -26,55 +26,3 @@ extern i2c_status_t mcp23018_status;
 
 void init_ergodox(void);
 uint8_t init_mcp23018(void);
-
-/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */
-#define LAYOUT(                                                   \
-    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
index 3f1c69b7f5..0a654eaa4a 100644
--- a/keyboards/gboards/georgi/info.json
+++ b/keyboards/gboards/georgi/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0xFEED",
         "pid": "0x1337",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "force_nkro": true
     },
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
@@ -16,41 +17,41 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0.5},
-                {"x": 1, "y": 0.5},
-                {"x": 2, "y": 0.3},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0.4},
-                {"x": 5, "y": 0.5},
+                {"matrix": [12, 1], "x": 0, "y": 0.5},
+                {"matrix": [11, 1], "x": 1, "y": 0.5},
+                {"matrix": [10, 1], "x": 2, "y": 0.3},
+                {"matrix": [9, 1], "x": 3, "y": 0},
+                {"matrix": [8, 1], "x": 4, "y": 0.4},
+                {"matrix": [7, 1], "x": 5, "y": 0.5},
 
-                {"x": 7, "y": 0.5},
-                {"x": 8, "y": 0.4},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0.3},
-                {"x": 11, "y": 0.5},
-                {"x": 12, "y": 0.5},
+                {"matrix": [0, 1], "x": 7, "y": 0.5},
+                {"matrix": [1, 1], "x": 8, "y": 0.4},
+                {"matrix": [2, 1], "x": 9, "y": 0},
+                {"matrix": [3, 1], "x": 10, "y": 0.3},
+                {"matrix": [4, 1], "x": 11, "y": 0.5},
+                {"matrix": [5, 1], "x": 12, "y": 0.5},
 
-                {"x": 0, "y": 1.5},
-                {"x": 1, "y": 1.5},
-                {"x": 2, "y": 1.3},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1.4},
-                {"x": 5, "y": 1.5},
+                {"matrix": [12, 2], "x": 0, "y": 1.5},
+                {"matrix": [11, 2], "x": 1, "y": 1.5},
+                {"matrix": [10, 2], "x": 2, "y": 1.3},
+                {"matrix": [9, 2], "x": 3, "y": 1},
+                {"matrix": [8, 2], "x": 4, "y": 1.4},
+                {"matrix": [7, 2], "x": 5, "y": 1.5},
 
-                {"x": 7, "y": 1.5},
-                {"x": 8, "y": 1.4},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1.3},
-                {"x": 11, "y": 1.5},
-                {"x": 12, "y": 1.5},
+                {"matrix": [0, 2], "x": 7, "y": 1.5},
+                {"matrix": [1, 2], "x": 8, "y": 1.4},
+                {"matrix": [2, 2], "x": 9, "y": 1},
+                {"matrix": [3, 2], "x": 10, "y": 1.3},
+                {"matrix": [4, 2], "x": 11, "y": 1.5},
+                {"matrix": [5, 2], "x": 12, "y": 1.5},
 
-                {"x": 3, "y": 2.75},
-                {"x": 4, "y": 2.75},
-                {"x": 5, "y": 2.75},
+                {"matrix": [9, 3], "x": 3, "y": 2.75},
+                {"matrix": [8, 3], "x": 4, "y": 2.75},
+                {"matrix": [7, 3], "x": 5, "y": 2.75},
 
-                {"x": 7, "y": 2.75},
-                {"x": 8, "y": 2.75},
-                {"x": 9, "y": 2.75}
+                {"matrix": [1, 3], "x": 7, "y": 2.75},
+                {"matrix": [0, 3], "x": 8, "y": 2.75},
+                {"matrix": [2, 3], "x": 9, "y": 2.75}
             ]
         }
     }
diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
index bb6ed9dd3e..9b3365d02f 100644
--- a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
@@ -13,7 +13,6 @@
 #include QMK_KEYBOARD_H
 #include "sten.h"
 #include "keymap_steno.h"
-#define IGNORE_MOD_TAP_INTERRUPT
 
 // Steno Layers
 #define FUNCT	( LSD | LK | LP | LH )
diff --git a/keyboards/gboards/georgi/matrix.c b/keyboards/gboards/georgi/matrix.c
index 5ac696fd31..b66b1a194c 100644
--- a/keyboards/gboards/georgi/matrix.c
+++ b/keyboards/gboards/georgi/matrix.c
@@ -17,16 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "matrix.h"
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
 #include "wait.h"
-#include "action_layer.h"
-#include "print.h"
 #include "debug.h"
 #include "util.h"
-#include "keymap_steno.h"
-#include QMK_KEYBOARD_H
+#include "georgi.h"
 
 #ifndef DEBOUNCE
 #   define DEBOUNCE	5
diff --git a/keyboards/gboards/georgi/sten.h b/keyboards/gboards/georgi/sten.h
index 320c49514c..b5aa79893e 100644
--- a/keyboards/gboards/georgi/sten.h
+++ b/keyboards/gboards/georgi/sten.h
@@ -4,10 +4,10 @@
 // the slave and the master. Until we return from main.
 //
 // Amen.
+#pragma once
 
-#include QMK_KEYBOARD_H
+#include "georgi.h"
 #include "mousekey.h"
-#include "keymap.h"
 #include "keymap_steno.h"
 #include "wait.h"