Merge upstream master

8 files changed, 201 insertions, 0 deletions

diff --git a/keyboards/emptystring/nqg/config.h b/keyboards/emptystring/nqg/config.h
new file mode 100644
index 0000000000..8a0a71766f
--- /dev/null
+++ b/keyboards/emptystring/nqg/config.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2019 Bernard Shih (twitter: @SA_EndlessGame)
+
+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"
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 10
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS {B6, B2, B3, B1}
+#define MATRIX_COL_PINS {F7, F6, B5, B4, E6, D7, C6, D4, D0, D1}
+
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/emptystring/nqg/info.json b/keyboards/emptystring/nqg/info.json
new file mode 100644
index 0000000000..6ccbc01370
--- /dev/null
+++ b/keyboards/emptystring/nqg/info.json
@@ -0,0 +1,54 @@
+{
+    "keyboard_name": "NQG",
+    "manufacturer": "emptystring",
+    "url": "",
+    "maintainer": "culturalsnow",
+    "usb": {
+        "vid": "0x0076",
+        "pid": "0x0037",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Q", "x":1, "y":0},
+                {"label":"W", "x":2, "y":0},
+                {"label":"E", "x":3, "y":0},
+                {"label":"R", "x":4, "y":0},
+                {"label":"T", "x":5, "y":0},
+                {"label":"Y", "x":6, "y":0},
+                {"label":"U", "x":7, "y":0},
+                {"label":"I", "x":8, "y":0},
+                {"label":"O", "x":9, "y":0},
+                {"label":"P", "x":10, "y":0},
+                {"label":"A", "x":1, "y":1},
+                {"label":"S", "x":2, "y":1},
+                {"label":"D", "x":3, "y":1},
+                {"label":"F", "x":4, "y":1},
+                {"label":"G", "x":5, "y":1},
+                {"label":"H", "x":6, "y":1},
+                {"label":"J", "x":7, "y":1},
+                {"label":"K", "x":8, "y":1},
+                {"label":"L", "x":9, "y":1},
+                {"label":"; '", "x":10, "y":1},
+                {"label":"Z", "x":1, "y":2},
+                {"label":"X", "x":2, "y":2},
+                {"label":"C", "x":3, "y":2},
+                {"label":"V", "x":4, "y":2},
+                {"label":"B", "x":5, "y":2},
+                {"label":"N", "x":6, "y":2},
+                {"label":"M", "x":7, "y":2},
+                {"label":",", "x":8, "y":2},
+                {"label":".", "x":9, "y":2},
+                {"label":"/ Enter", "x":10, "y":2},
+                {"label":"Shift / Tab", "x":0, "y":2},
+                {"label":"LT(_LOWER, KC_ESC)", "x":3, "y":3},
+                {"label":"Ctrl / Backspace", "x":4, "y":3},
+                {"label":"Ctrl / Backspace", "x":5, "y":3},
+                {"label":"Space", "x":6, "y":3},
+                {"label":"Space", "x":7, "y":3},
+                {"label":"MO(_RAISE)", "x":8, "y":3}
+            ]
+        }
+    }
+}
diff --git a/keyboards/emptystring/nqg/keymaps/default/keymap.c b/keyboards/emptystring/nqg/keymaps/default/keymap.c
new file mode 100644
index 0000000000..eec249187b
--- /dev/null
+++ b/keyboards/emptystring/nqg/keymaps/default/keymap.c
@@ -0,0 +1,61 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+#define _BASE 0
+#define _LOWER 1
+#define _RAISE 2
+
+enum tapdances{
+  TD_SCCL = 0,
+  TD_ENSL,
+  TD_N0BS,
+  TD_RPPI,
+};
+
+#define KC_SCCL  TD(TD_SCCL)
+#define KC_ENSL  TD(TD_ENSL)
+#define KC_N0BS  TD(TD_N0BS)
+#define KC_RPPI  TD(TD_RPPI)
+
+#define KC_BSCT LCTL_T(KC_BSPC)
+#define KC_ALEN LALT(KC_ENT)
+#define KC_CTEN LCTL(KC_ENT)
+#define KC_STAB LSFT_T(KC_TAB)
+#define KC_WLNG LALT(KC_LSFT)
+#define WIN_LOCK LGUI(KC_L)
+#define KC_ULCK LCTL(LALT(KC_DEL))
+#define KC_DSTP LGUI(KC_D)
+#define KC_ESLO LT(_LOWER, KC_ESC)
+
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_SCCL] = ACTION_TAP_DANCE_DOUBLE(KC_SCLN, KC_QUOT),
+  [TD_ENSL] = ACTION_TAP_DANCE_DOUBLE(KC_SLSH, KC_ENT),
+  [TD_N0BS] = ACTION_TAP_DANCE_DOUBLE(KC_0, KC_BSLS),
+  [TD_RPPI] = ACTION_TAP_DANCE_DOUBLE(KC_RPRN, KC_PIPE),
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT(
+             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_SCCL,
+             KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_ENSL,
+             KC_STAB,          KC_ESLO, KC_BSCT, KC_BSCT, KC_SPC,  KC_SPC,  MO(_RAISE)
+  ),
+
+  [_LOWER] = LAYOUT(
+             KC_EXLM, KC_AT,   KC_HASH,   KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPPI,
+             _______, _______, KC_DSTP,   _______, KC_WLNG, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
+             _______, _______, _______,   _______, _______, _______, KC_INS,  KC_DEL,  KC_HOME, KC_END,
+             KC_CTEN,          _______,   KC_BSCT, KC_BSCT, KC_SPC,  KC_SPC,  KC_ULCK
+  ),
+
+  [_RAISE] = LAYOUT(
+             KC_1,    KC_2,    KC_3,      KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_N0BS,
+             _______, _______, _______,   _______, _______, _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
+             _______, _______, _______,   _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
+             KC_ALEN,          WIN_LOCK,  KC_BSCT, KC_BSCT, KC_SPC,  KC_SPC,  _______
+  )
+};
diff --git a/keyboards/emptystring/nqg/keymaps/default/rules.mk b/keyboards/emptystring/nqg/keymaps/default/rules.mk
new file mode 100644
index 0000000000..e5ddcae8d9
--- /dev/null
+++ b/keyboards/emptystring/nqg/keymaps/default/rules.mk
@@ -0,0 +1 @@
+TAP_DANCE_ENABLE = yes
diff --git a/keyboards/emptystring/nqg/nqg.c b/keyboards/emptystring/nqg/nqg.c
new file mode 100644
index 0000000000..8001a3a11b
--- /dev/null
+++ b/keyboards/emptystring/nqg/nqg.c
@@ -0,0 +1,3 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "nqg.h"
diff --git a/keyboards/emptystring/nqg/nqg.h b/keyboards/emptystring/nqg/nqg.h
new file mode 100644
index 0000000000..004fbb5456
--- /dev/null
+++ b/keyboards/emptystring/nqg/nqg.h
@@ -0,0 +1,17 @@
+// Copyright 2022 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+         L00, L01, L02, L03, L04,      L05, L06, L07, L08, L09, \
+         L10, L11, L12, L13, L14,      L15, L16, L17, L18, L19, \
+         L20, L21, L22, L23, L24,      L25, L26, L27, L28, L29, \
+         L30,      L32, L33, L34,      L35, L36, L37            \
+    ) { \
+        {L00, L01,   L02, L03, L04, L05, L06, L07, L08,   L09},  \
+        {L10, L11,   L12, L13, L14, L15, L16, L17, L18,   L19},  \
+        {L20, L21,   L22, L23, L24, L25, L26, L27, L28,   L29},  \
+        {L30, KC_NO, L32, L33, L34, L35, L36, L37, KC_NO, KC_NO} \
+      }
diff --git a/keyboards/emptystring/nqg/readme.md b/keyboards/emptystring/nqg/readme.md
new file mode 100644
index 0000000000..b2ceeeb87d
--- /dev/null
+++ b/keyboards/emptystring/nqg/readme.md
@@ -0,0 +1,15 @@
+# NQG: Not Quite Gherkin
+
+![NQG](https://github.com/culturalsnow/NQG/blob/master/images/NQGLayout.jpg)
+
+NQG (Not Quite Gherkin) is a 30% ortholinear keyboard with a macro key and dedicated row for thumb keys, made by emptystring studio.
+
+Keyboard Maintainer: [Culturalsnow](http://github.com/culturalsnow)  
+Hardware Supported: NQG PCB, Pro Micro  
+Hardware Availability: Kits are available from [SA_EndlessGame](http://twitter.com/SA_EndlessGame)  
+
+Make example for this keyboard (after setting up your build environment):
+
+    make emptystring/nqg: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/emptystring/nqg/rules.mk b/keyboards/emptystring/nqg/rules.mk
new file mode 100644
index 0000000000..e61c7dbfd0
--- /dev/null
+++ b/keyboards/emptystring/nqg/rules.mk
@@ -0,0 +1,18 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = no      # Mouse keys
+EXTRAKEY_ENABLE = no      # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+RGBLIGHT_ENABLE = no      # Enable WS2812 RGB underlight.