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

author: QMK Bot <hello@qmk.fm> 2021-03-04 01:02:37 +0000
committer: QMK Bot <hello@qmk.fm> 2021-03-04 01:02:37 +0000
commit: d3092ced99b5a529c6bde32d8f352cc40abd317d (patch)
tree: 707d06ae437f088fe77e62b630a5bc9cdcf89d9b
parent: 6c3af2670e41448432052a44b446c1c7ff3da9a5 (diff)
parent: 7aa74c227b03e882915b184d07a5e31c9d720710 (diff)
download: qmk_firmware-d3092ced99b5a529c6bde32d8f352cc40abd317d.tar.gz
qmk_firmware-d3092ced99b5a529c6bde32d8f352cc40abd317d.zip
13 files changed, 340 insertions, 14 deletions
diff --git a/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk.txt b/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk
index 036bd6d1c..036bd6d1c 100644
--- a/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk.txt
+++ b/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk
diff --git a/keyboards/studiokestra/nue/config.h b/keyboards/studiokestra/nue/config.h
new file mode 100644
index 000000000..72514d85c
--- /dev/null
+++ b/keyboards/studiokestra/nue/config.h
@@ -0,0 +1,50 @@
+/*
+Copyright 2021 Studio Kestra
+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       0x7C10
+#define PRODUCT_ID      0x0701
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Studio Kestra
+#define PRODUCT         Nue
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+#define MATRIX_COL_PINS { F0, F6, F7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
+#define MATRIX_ROW_PINS { B0, B7, F1, F5, F4}
+#define DIODE_DIRECTION COL2ROW
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+/* 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
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/studiokestra/nue/info.json b/keyboards/studiokestra/nue/info.json
new file mode 100644
index 000000000..e12b15d74
--- /dev/null
+++ b/keyboards/studiokestra/nue/info.json
@@ -0,0 +1,80 @@
+{
+    "keyboard_name": "Nue",
+    "url": "https://studiokestra.ca/nue",
+    "maintainer": "Studio Kestra",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT":  {
+            "layout": [
+                {"x":0, "y":0}, 
+                {"x":1, "y":0}, 
+                {"x":2, "y":0}, 
+                {"x":3, "y":0}, 
+                {"x":4, "y":0}, 
+                {"x":5, "y":0}, 
+                {"x":6, "y":0}, 
+                {"x":7, "y":0}, 
+                {"x":8, "y":0}, 
+                {"x":9, "y":0}, 
+                {"x":10, "y":0}, 
+                {"x":11, "y":0}, 
+                {"x":12, "y":0}, 
+                {"x":13, "y":0}, 
+                {"x":14, "y":0}, 
+                {"x":0, "y":1, "w":1.5}, 
+                {"x":1.5, "y":1}, 
+                {"x":2.5, "y":1}, 
+                {"x":3.5, "y":1}, 
+                {"x":4.5, "y":1}, 
+                {"x":5.5, "y":1}, 
+                {"x":6.5, "y":1}, 
+                {"x":7.5, "y":1}, 
+                {"x":8.5, "y":1}, 
+                {"x":9.5, "y":1}, 
+                {"x":10.5, "y":1}, 
+                {"x":11.5, "y":1}, 
+                {"x":12.5, "y":1}, 
+                {"x":13.5, "y":1, "w":1.5}, 
+                {"x":0, "y":2, "w":1.75}, 
+                {"x":1.75, "y":2}, 
+                {"x":2.75, "y":2}, 
+                {"x":3.75, "y":2}, 
+                {"x":4.75, "y":2}, 
+                {"x":5.75, "y":2}, 
+                {"x":6.75, "y":2}, 
+                {"x":7.75, "y":2}, 
+                {"x":8.75, "y":2}, 
+                {"x":9.75, "y":2}, 
+                {"x":10.75, "y":2}, 
+                {"x":11.75, "y":2}, 
+                {"x":12.75, "y":2, "w":2.25}, 
+                {"x":0, "y":3, "w":1.25}, 
+                {"x":1.25, "y":3}, 
+                {"x":2.25, "y":3}, 
+                {"x":3.25, "y":3}, 
+                {"x":4.25, "y":3}, 
+                {"x":5.25, "y":3}, 
+                {"x":6.25, "y":3}, 
+                {"x":7.25, "y":3}, 
+                {"x":8.25, "y":3}, 
+                {"x":9.25, "y":3}, 
+                {"x":10.25, "y":3}, 
+                {"x":11.25, "y":3}, 
+                {"x":12.25, "y":3, "w":1.75}, 
+                {"x":14, "y":3}, 
+                {"x":0, "y":4, "w":1.25}, 
+                {"x":1.25, "y":4, "w":1.25}, 
+                {"x":2.5, "y":4, "w":1.25}, 
+                {"x":3.75, "y":4, "w":6.25}, 
+                {"x":10, "y":4, "w":1.25}, 
+                {"x":11.25, "y":4, "w":1.25}, 
+                {"x":12.5, "y":4, "w":1.25}, 
+                {"x":13.75, "y":4, "w":1.25}]
+        }
+    }
+}
diff --git a/keyboards/studiokestra/nue/keymaps/default/keymap.c b/keyboards/studiokestra/nue/keymaps/default/keymap.c
new file mode 100644
index 000000000..b61ab47d4
--- /dev/null
+++ b/keyboards/studiokestra/nue/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+ /* Copyright 2021 Studio Kestra
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+  
+#include QMK_KEYBOARD_H
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_all(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,    KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_ENT,
+    KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI,  KC_MENU,    KC_RCTL),
+    [_FN] = LAYOUT_all(
+    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, RESET,   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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_MPLY,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
+\ No newline at end of file
diff --git a/keyboards/studiokestra/nue/keymaps/default/readme.md b/keyboards/studiokestra/nue/keymaps/default/readme.md
new file mode 100644
index 000000000..3255b4b4a
--- /dev/null
+++ b/keyboards/studiokestra/nue/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Nue
diff --git a/keyboards/studiokestra/nue/keymaps/via/keymap.c b/keyboards/studiokestra/nue/keymaps/via/keymap.c
new file mode 100644
index 000000000..56e64b7c2
--- /dev/null
+++ b/keyboards/studiokestra/nue/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+ /* Copyright 2021 Studio Kestra
+  * 
+  * This program is free software: you can redistribute it and/or modify 
+  * it under the terms of the GNU General Public License as published by 
+  * the Free Software Foundation, either version 2 of the License, or 
+  * (at your option) any later version. 
+  * 
+  * This program is distributed in the hope that it will be useful, 
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+  * GNU General Public License for more details. 
+  * 
+  * You should have received a copy of the GNU General Public License 
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+  */ 
+  
+#include QMK_KEYBOARD_H
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_all(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,    KC_BSLS,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     KC_LBRC,    KC_RBRC,    KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,    KC_ENT,
+    KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_RSFT,    MO(1),
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI,  KC_MENU,    KC_RCTL),
+    [_FN1] = LAYOUT_all(
+    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, RESET,   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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS,                            KC_MPLY,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [_FN2] = LAYOUT_all(
+    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, 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,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+    [_FN3] = LAYOUT_all(
+    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, 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,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/keyboards/studiokestra/nue/keymaps/via/readme.md b/keyboards/studiokestra/nue/keymaps/via/readme.md
new file mode 100644
index 000000000..d97e0a680
--- /dev/null
+++ b/keyboards/studiokestra/nue/keymaps/via/readme.md
@@ -0,0 +1 @@
+# Studio Kestra's Nue keymap for VIA
diff --git a/keyboards/studiokestra/nue/keymaps/via/rules.mk b/keyboards/studiokestra/nue/keymaps/via/rules.mk
new file mode 100644
index 000000000..1e5b99807
--- /dev/null
+++ b/keyboards/studiokestra/nue/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/studiokestra/nue/nue.c b/keyboards/studiokestra/nue/nue.c
new file mode 100644
index 000000000..869aaaa48
--- /dev/null
+++ b/keyboards/studiokestra/nue/nue.c
@@ -0,0 +1,17 @@
+/* Copyright 2021 Studio Kestra
+ *
+ * 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 "nue.h"
diff --git a/keyboards/studiokestra/nue/nue.h b/keyboards/studiokestra/nue/nue.h
new file mode 100644
index 000000000..6f051b67e
--- /dev/null
+++ b/keyboards/studiokestra/nue/nue.h
@@ -0,0 +1,41 @@
+/* Copyright 2021 Studio Kestra
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "quantum.h"
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all(\
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k212,       \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213,             \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313,       \
+    k400, k401, k402,                   k406,             k409, k410, k411, k412              \
+) { \
+    { k000, k001, k002, k003,  k004, k005, k006, k007, k008,  k009, k010, k011, k012, k013 }, \
+    { k100, k101, k102, k103,  k104, k105, k106, k107, k108,  k109, k110, k111, k112, k113 }, \
+    { k200, k201, k202, k203,  k204, k205, k206, k207, k208,  k209, k210, k211, k212, k213 }, \
+    { k300, k301, k302, k303,  k304, k305, k306, k307, k308,  k309, k310, k311, k312, k313 }, \
+    { k400, k401, k402, KC_NO, KC_NO,KC_NO,k406, KC_NO,KC_NO, k409, k410, k411, k412, KC_NO}  \
+}
diff --git a/keyboards/studiokestra/nue/readme.md b/keyboards/studiokestra/nue/readme.md
new file mode 100644
index 000000000..42e72902e
--- /dev/null
+++ b/keyboards/studiokestra/nue/readme.md
@@ -0,0 +1,23 @@
+# Nue
+60% PCB with gasket mounting tabs designed for the Nue keyboard.
+* Keyboard Maintainer: [Studio Kestra](https://github.com/studiokestra/)
+* Hardware Supported: [studiokestra.ca/nue](https://studiokestra.ca/nue/)
+* Hardware Availability: Group-Buy (Q1 2021)
+## Bootload Sequence
+There are 3 ways to put the board in bootloader mode:
+- Hold the top-left key (typically `Esc`) while plugging in the USB cable, OR
+- While the PCB is plugged into the PC, press the physical `RESET` button on the back of the board, OR
+- With the default layout, toggle Layer 1 and press the `R` key. 
+## Compiling Firmware
+Make example for this keyboard (after setting up your build environment):
+    make studiokestra/nue: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/studiokestra/nue/rules.mk b/keyboards/studiokestra/nue/rules.mk
new file mode 100644
index 000000000..59fb880c7
--- /dev/null
+++ b/keyboards/studiokestra/nue/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+# 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 = yes        # 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 = no            # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 5eba218c9..89a7cf7f8 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -79,12 +79,10 @@ enum quantum_keycodes {
    QK_STENO_GEMINI = 0x5A31,
    QK_STENO_MAX    = 0x5A3F,
 #endif
-#ifdef SWAP_HANDS_ENABLE
    QK_SWAP_HANDS     = 0x5B00,
    QK_SWAP_HANDS_MAX = 0x5BFF,
-#endif
+    QK_MOD_TAP        = 0x6000,
-    QK_MOD_TAP     = 0x6000,
+    QK_MOD_TAP_MAX    = 0x7FFF,
-    QK_MOD_TAP_MAX = 0x7FFF,
 #ifdef UNICODE_ENABLE
    QK_UNICODE     = 0x8000,
    QK_UNICODE_MAX = 0xFFFF,
@@ -872,16 +870,14 @@ enum quantum_keycodes {
 #define UC_M_BS UNICODE_MODE_BSD
 #define UC_M_WC UNICODE_MODE_WINC
-#ifdef SWAP_HANDS_ENABLE
+#define SH_T(kc) (QK_SWAP_HANDS | (kc))
-#    define SH_T(kc) (QK_SWAP_HANDS | (kc))
+#define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE)
-#    define SH_TG (QK_SWAP_HANDS | OP_SH_TOGGLE)
+#define SH_TT (QK_SWAP_HANDS | OP_SH_TAP_TOGGLE)
-#    define SH_TT (QK_SWAP_HANDS | OP_SH_TAP_TOGGLE)
+#define SH_OS (QK_SWAP_HANDS | OP_SH_ONESHOT)
-#    define SH_OS (QK_SWAP_HANDS | OP_SH_ONESHOT)
+#define SH_MON (QK_SWAP_HANDS | OP_SH_ON_OFF)
-#    define SH_MON (QK_SWAP_HANDS | OP_SH_ON_OFF)
+#define SH_MOFF (QK_SWAP_HANDS | OP_SH_OFF_ON)
-#    define SH_MOFF (QK_SWAP_HANDS | OP_SH_OFF_ON)
+#define SH_ON (QK_SWAP_HANDS | OP_SH_ON)
-#    define SH_ON (QK_SWAP_HANDS | OP_SH_ON)
+#define SH_OFF (QK_SWAP_HANDS | OP_SH_OFF)
-#    define SH_OFF (QK_SWAP_HANDS | OP_SH_OFF)
-#endif
 // Dynamic Macros aliases
 #define DM_REC1 DYN_REC_START1
author	QMK Bot <hello@qmk.fm>	2021-03-04 01:02:37 +0000
committer	QMK Bot <hello@qmk.fm>	2021-03-04 01:02:37 +0000
commit	d3092ced99b5a529c6bde32d8f352cc40abd317d (patch)
tree	707d06ae437f088fe77e62b630a5bc9cdcf89d9b
parent	6c3af2670e41448432052a44b446c1c7ff3da9a5 (diff)
parent	7aa74c227b03e882915b184d07a5e31c9d720710 (diff)
download	qmk_firmware-d3092ced99b5a529c6bde32d8f352cc40abd317d.tar.gz qmk_firmware-d3092ced99b5a529c6bde32d8f352cc40abd317d.zip

diff --git a/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk.txt b/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk index 036bd6d1c..036bd6d1c 100644 --- a/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk.txt +++ b/keyboards/cannonkeys/atlas_alps/keymaps/via/rules.mk


diff --git a/keyboards/studiokestra/nue/config.h b/keyboards/studiokestra/nue/config.h new file mode 100644 index 000000000..72514d85c --- /dev/null +++ b/keyboards/studiokestra/nue/config.h
@@ -0,0 +1,50 @@
		1	/*
		2	Copyright 2021 Studio Kestra
		3
		4	This program is free software: you can redistribute it and/or modify
		5	it under the terms of the GNU General Public License as published by
		6	the Free Software Foundation, either version 2 of the License, or
		7	(at your option) any later version.
		8
		9	This program is distributed in the hope that it will be useful,
		10	but WITHOUT ANY WARRANTY; without even the implied warranty of
		11	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		12	GNU General Public License for more details.
		13
		14	You should have received a copy of the GNU General Public License
		15	along with this program. If not, see <http://www.gnu.org/licenses/>.
		16	*/
		17
		18	#pragma once
		19
		20	#include "config_common.h"
		21
		22	/* USB Device descriptor parameter */
		23	#define VENDOR_ID 0x7C10
		24	#define PRODUCT_ID 0x0701
		25	#define DEVICE_VER 0x0001
		26	#define MANUFACTURER Studio Kestra
		27	#define PRODUCT Nue
		28
		29	#define MATRIX_ROWS 5
		30	#define MATRIX_COLS 14
		31
		32	#define MATRIX_COL_PINS { F0, F6, F7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7 }
		33	#define MATRIX_ROW_PINS { B0, B7, F1, F5, F4}
		34	#define DIODE_DIRECTION COL2ROW
		35
		36	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
		37	#define DEBOUNCE 5
		38
		39	/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
		40	#define LOCKING_SUPPORT_ENABLE
		41	/* Locking resynchronize hack */
		42	#define LOCKING_RESYNC_ENABLE
		43
		44	/* disable these deprecated features by default */
		45	#define NO_ACTION_MACRO
		46	#define NO_ACTION_FUNCTION
		47
		48	/* Bootmagic Lite key configuration */
		49	#define BOOTMAGIC_LITE_ROW 0
		50	#define BOOTMAGIC_LITE_COLUMN 0


diff --git a/keyboards/studiokestra/nue/info.json b/keyboards/studiokestra/nue/info.json new file mode 100644 index 000000000..e12b15d74 --- /dev/null +++ b/keyboards/studiokestra/nue/info.json
@@ -0,0 +1,80 @@
		1	{
		2	"keyboard_name": "Nue",
		3	"url": "https://studiokestra.ca/nue",
		4	"maintainer": "Studio Kestra",
		5	"width": 15,
		6	"height": 5,
		7	"layouts": {
		8	"LAYOUT": {
		9	"layout": [
		10	{"x":0, "y":0},
		11	{"x":1, "y":0},
		12	{"x":2, "y":0},
		13	{"x":3, "y":0},
		14	{"x":4, "y":0},
		15	{"x":5, "y":0},
		16	{"x":6, "y":0},
		17	{"x":7, "y":0},
		18	{"x":8, "y":0},
		19	{"x":9, "y":0},
		20	{"x":10, "y":0},
		21	{"x":11, "y":0},
		22	{"x":12, "y":0},
		23	{"x":13, "y":0},
		24	{"x":14, "y":0},
		25
		26	{"x":0, "y":1, "w":1.5},
		27	{"x":1.5, "y":1},
		28	{"x":2.5, "y":1},
		29	{"x":3.5, "y":1},
		30	{"x":4.5, "y":1},
		31	{"x":5.5, "y":1},
		32	{"x":6.5, "y":1},
		33	{"x":7.5, "y":1},
		34	{"x":8.5, "y":1},
		35	{"x":9.5, "y":1},
		36	{"x":10.5, "y":1},
		37	{"x":11.5, "y":1},
		38	{"x":12.5, "y":1},
		39	{"x":13.5, "y":1, "w":1.5},
		40
		41	{"x":0, "y":2, "w":1.75},
		42	{"x":1.75, "y":2},
		43	{"x":2.75, "y":2},
		44	{"x":3.75, "y":2},
		45	{"x":4.75, "y":2},
		46	{"x":5.75, "y":2},
		47	{"x":6.75, "y":2},
		48	{"x":7.75, "y":2},
		49	{"x":8.75, "y":2},
		50	{"x":9.75, "y":2},
		51	{"x":10.75, "y":2},
		52	{"x":11.75, "y":2},
		53	{"x":12.75, "y":2, "w":2.25},
		54
		55	{"x":0, "y":3, "w":1.25},
		56	{"x":1.25, "y":3},
		57	{"x":2.25, "y":3},
		58	{"x":3.25, "y":3},
		59	{"x":4.25, "y":3},
		60	{"x":5.25, "y":3},
		61	{"x":6.25, "y":3},
		62	{"x":7.25, "y":3},
		63	{"x":8.25, "y":3},
		64	{"x":9.25, "y":3},
		65	{"x":10.25, "y":3},
		66	{"x":11.25, "y":3},
		67	{"x":12.25, "y":3, "w":1.75},
		68	{"x":14, "y":3},
		69
		70	{"x":0, "y":4, "w":1.25},
		71	{"x":1.25, "y":4, "w":1.25},
		72	{"x":2.5, "y":4, "w":1.25},
		73	{"x":3.75, "y":4, "w":6.25},
		74	{"x":10, "y":4, "w":1.25},
		75	{"x":11.25, "y":4, "w":1.25},
		76	{"x":12.5, "y":4, "w":1.25},
		77	{"x":13.75, "y":4, "w":1.25}]
		78	}
		79	}
		80	}


diff --git a/keyboards/studiokestra/nue/keymaps/default/keymap.c b/keyboards/studiokestra/nue/keymaps/default/keymap.c new file mode 100644 index 000000000..b61ab47d4 --- /dev/null +++ b/keyboards/studiokestra/nue/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
		1	/* Copyright 2021 Studio Kestra
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
		16
		17	#include QMK_KEYBOARD_H
		18
		19	// Defines names for use in layer keycodes and the keymap
		20	enum layer_names {
		21	_BASE,
		22	_FN
		23	};
		24
		25	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		26
		27
		28	[_BASE] = LAYOUT_all(
		29	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC,
		30	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
		31	KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
		32	KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
		33	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL),
		34
		35	[_FN] = LAYOUT_all(
		36	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,
		37	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		38	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,
		39	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,
		40	KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
		41	}; \ No newline at end of file


diff --git a/keyboards/studiokestra/nue/keymaps/default/readme.md b/keyboards/studiokestra/nue/keymaps/default/readme.md new file mode 100644 index 000000000..3255b4b4a --- /dev/null +++ b/keyboards/studiokestra/nue/keymaps/default/readme.md
@@ -0,0 +1 @@
			# The default keymap for Nue


diff --git a/keyboards/studiokestra/nue/keymaps/via/keymap.c b/keyboards/studiokestra/nue/keymaps/via/keymap.c new file mode 100644 index 000000000..56e64b7c2 --- /dev/null +++ b/keyboards/studiokestra/nue/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
		1	/* Copyright 2021 Studio Kestra
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
		16
		17	#include QMK_KEYBOARD_H
		18
		19	// Defines names for use in layer keycodes and the keymap
		20	enum layer_names {
		21	_BASE,
		22	_FN1,
		23	_FN2,
		24	_FN3
		25	};
		26
		27	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		28
		29	[_BASE] = LAYOUT_all(
		30	KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSLS,
		31	KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
		32	KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
		33	KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
		34	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_MENU, KC_RCTL),
		35	[_FN1] = LAYOUT_all(
		36	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,
		37	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
		38	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,
		39	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,
		40	KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
		41	[_FN2] = LAYOUT_all(
		42	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,
		43	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,
		44	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,
		45	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,
		46	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
		47	[_FN3] = LAYOUT_all(
		48	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,
		49	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,
		50	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,
		51	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,
		52	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
		53	};


diff --git a/keyboards/studiokestra/nue/keymaps/via/readme.md b/keyboards/studiokestra/nue/keymaps/via/readme.md new file mode 100644 index 000000000..d97e0a680 --- /dev/null +++ b/keyboards/studiokestra/nue/keymaps/via/readme.md
@@ -0,0 +1 @@
			# Studio Kestra's Nue keymap for VIA


diff --git a/keyboards/studiokestra/nue/keymaps/via/rules.mk b/keyboards/studiokestra/nue/keymaps/via/rules.mk new file mode 100644 index 000000000..1e5b99807 --- /dev/null +++ b/keyboards/studiokestra/nue/keymaps/via/rules.mk
@@ -0,0 +1 @@
			VIA_ENABLE = yes


diff --git a/keyboards/studiokestra/nue/nue.c b/keyboards/studiokestra/nue/nue.c new file mode 100644 index 000000000..869aaaa48 --- /dev/null +++ b/keyboards/studiokestra/nue/nue.c
@@ -0,0 +1,17 @@
		1	/* Copyright 2021 Studio Kestra
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
		16
		17	#include "nue.h"


diff --git a/keyboards/studiokestra/nue/nue.h b/keyboards/studiokestra/nue/nue.h new file mode 100644 index 000000000..6f051b67e --- /dev/null +++ b/keyboards/studiokestra/nue/nue.h
@@ -0,0 +1,41 @@
		1	/* Copyright 2021 Studio Kestra
		2	*
		3	* This program is free software: you can redistribute it and/or modify
		4	* it under the terms of the GNU General Public License as published by
		5	* the Free Software Foundation, either version 2 of the License, or
		6	* (at your option) any later version.
		7	*
		8	* This program is distributed in the hope that it will be useful,
		9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		11	* GNU General Public License for more details.
		12	*
		13	* You should have received a copy of the GNU General Public License
		14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		15	*/
		16
		17	#pragma once
		18
		19	#include "quantum.h"
		20
		21	/* This is a shortcut to help you visually see your layout.
		22	*
		23	* The first section contains all of the arguments representing the physical
		24	* layout of the board and position of the keys.
		25	*
		26	* The second converts the arguments into a two-dimensional array which
		27	* represents the switch matrix.
		28	*/
		29	#define LAYOUT_all(\
		30	k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113, \
		31	k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k212, \
		32	k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, \
		33	k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \
		34	k400, k401, k402, k406, k409, k410, k411, k412 \
		35	) { \
		36	{ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013 }, \
		37	{ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
		38	{ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
		39	{ k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \
		40	{ k400, k401, k402, KC_NO, KC_NO,KC_NO,k406, KC_NO,KC_NO, k409, k410, k411, k412, KC_NO} \
		41	}


diff --git a/keyboards/studiokestra/nue/readme.md b/keyboards/studiokestra/nue/readme.md new file mode 100644 index 000000000..42e72902e --- /dev/null +++ b/keyboards/studiokestra/nue/readme.md
@@ -0,0 +1,23 @@
		1	# Nue
		2
		3	60% PCB with gasket mounting tabs designed for the Nue keyboard.
		4
		5	* Keyboard Maintainer: [Studio Kestra](https://github.com/studiokestra/)
		6	* Hardware Supported: [studiokestra.ca/nue](https://studiokestra.ca/nue/)
		7	* Hardware Availability: Group-Buy (Q1 2021)
		8
		9	## Bootload Sequence
		10
		11	There are 3 ways to put the board in bootloader mode:
		12
		13	- Hold the top-left key (typically `Esc`) while plugging in the USB cable, OR
		14	- While the PCB is plugged into the PC, press the physical `RESET` button on the back of the board, OR
		15	- With the default layout, toggle Layer 1 and press the `R` key.
		16
		17	## Compiling Firmware
		18
		19	Make example for this keyboard (after setting up your build environment):
		20
		21	make studiokestra/nue:default
		22
		23	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/studiokestra/nue/rules.mk b/keyboards/studiokestra/nue/rules.mk new file mode 100644 index 000000000..59fb880c7 --- /dev/null +++ b/keyboards/studiokestra/nue/rules.mk
@@ -0,0 +1,22 @@
		1	# MCU name
		2	MCU = atmega32u4
		3
		4	# Bootloader selection
		5	BOOTLOADER = atmel-dfu
		6
		7	# Build Options
		8	# change yes to no to disable
		9	#
		10	BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
		11	MOUSEKEY_ENABLE = no # Mouse keys
		12	EXTRAKEY_ENABLE = yes # Audio control and System control
		13	CONSOLE_ENABLE = yes # Console for debug
		14	COMMAND_ENABLE = yes # Commands for debug and configuration
		15	# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
		16	SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
		17	# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
		18	NKRO_ENABLE = no # USB Nkey Rollover
		19	BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
		20	RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
		21	BLUETOOTH_ENABLE = no # Enable Bluetooth
		22	AUDIO_ENABLE = no # Audio output


diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h index 5eba218c9..89a7cf7f8 100644 --- a/quantum/quantum_keycodes.h +++ b/quantum/quantum_keycodes.h
@@ -79,12 +79,10 @@ enum quantum_keycodes {
79	QK_STENO_GEMINI = 0x5A31,	79	QK_STENO_GEMINI = 0x5A31,
80	QK_STENO_MAX = 0x5A3F,	80	QK_STENO_MAX = 0x5A3F,
81	#endif	81	#endif
82	#ifdef SWAP_HANDS_ENABLE
83	QK_SWAP_HANDS = 0x5B00,	82	QK_SWAP_HANDS = 0x5B00,
84	QK_SWAP_HANDS_MAX = 0x5BFF,	83	QK_SWAP_HANDS_MAX = 0x5BFF,
85	#endif	84	QK_MOD_TAP = 0x6000,
86	QK_MOD_TAP = 0x6000,	85	QK_MOD_TAP_MAX = 0x7FFF,
87	QK_MOD_TAP_MAX = 0x7FFF,
88	#ifdef UNICODE_ENABLE	86	#ifdef UNICODE_ENABLE
89	QK_UNICODE = 0x8000,	87	QK_UNICODE = 0x8000,
90	QK_UNICODE_MAX = 0xFFFF,	88	QK_UNICODE_MAX = 0xFFFF,
@@ -872,16 +870,14 @@ enum quantum_keycodes {
872	#define UC_M_BS UNICODE_MODE_BSD	870	#define UC_M_BS UNICODE_MODE_BSD
873	#define UC_M_WC UNICODE_MODE_WINC	871	#define UC_M_WC UNICODE_MODE_WINC
874		872
875	#ifdef SWAP_HANDS_ENABLE	873	#define SH_T(kc) (QK_SWAP_HANDS \| (kc))
876	# define SH_T(kc) (QK_SWAP_HANDS \| (kc))	874	#define SH_TG (QK_SWAP_HANDS \| OP_SH_TOGGLE)
877	# define SH_TG (QK_SWAP_HANDS \| OP_SH_TOGGLE)	875	#define SH_TT (QK_SWAP_HANDS \| OP_SH_TAP_TOGGLE)
878	# define SH_TT (QK_SWAP_HANDS \| OP_SH_TAP_TOGGLE)	876	#define SH_OS (QK_SWAP_HANDS \| OP_SH_ONESHOT)
879	# define SH_OS (QK_SWAP_HANDS \| OP_SH_ONESHOT)	877	#define SH_MON (QK_SWAP_HANDS \| OP_SH_ON_OFF)
880	# define SH_MON (QK_SWAP_HANDS \| OP_SH_ON_OFF)	878	#define SH_MOFF (QK_SWAP_HANDS \| OP_SH_OFF_ON)
881	# define SH_MOFF (QK_SWAP_HANDS \| OP_SH_OFF_ON)	879	#define SH_ON (QK_SWAP_HANDS \| OP_SH_ON)
882	# define SH_ON (QK_SWAP_HANDS \| OP_SH_ON)	880	#define SH_OFF (QK_SWAP_HANDS \| OP_SH_OFF)
883	# define SH_OFF (QK_SWAP_HANDS \| OP_SH_OFF)
884	#endif
885		881
886	// Dynamic Macros aliases	882	// Dynamic Macros aliases
887	#define DM_REC1 DYN_REC_START1	883	#define DM_REC1 DYN_REC_START1