Merge upstream master

7 files changed, 280 insertions, 0 deletions

diff --git a/keyboards/nixkeyboards/day_off/config.h b/keyboards/nixkeyboards/day_off/config.h
new file mode 100644
index 0000000000..1ed4ea91e3
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/config.h
@@ -0,0 +1,43 @@
+/* Copyright 2021 Nix Keyboards
+ *
+ * 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 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS \
+    { B3, B7, F5, F4, F1 }
+#define MATRIX_COL_PINS \
+    { F0, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 }
+#define DIODE_DIRECTION COL2ROW
+
+/* encoder */
+#define ENCODERS_PAD_A \
+    { B0 }
+#define ENCODERS_PAD_B \
+    { B1 }
+#define ENCODER_RESOLUTION 4
+
+/* Debounce reduces chatter */
+#define DEBOUNCE 5
+
+/* Set the Bootmagic key to the escape key (default key doesn't exist 0,0) */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/nixkeyboards/day_off/day_off.c b/keyboards/nixkeyboards/day_off/day_off.c
new file mode 100644
index 0000000000..2694682f09
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/day_off.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 Nix Keyboards
+ *
+ * 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 "day_off.h"
diff --git a/keyboards/nixkeyboards/day_off/day_off.h b/keyboards/nixkeyboards/day_off/day_off.h
new file mode 100644
index 0000000000..f890b837e6
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/day_off.h
@@ -0,0 +1,32 @@
+/* Copyright 2021 Nix Keyboards
+ *
+ * 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_all(K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,\
+	       K011, K012, K013, K014, K101, K102, K103, K104, K105, K106, \
+	       K107, K108, K109, K110, K111, K112, K113, K114, K200, K201, \
+	       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+	       K212, K213, K214, K300, K301, K302, K303, K304, K305, K306, \
+	       K307, K308, K309, K310, K311, K312, K313, K314, K400, K401, \
+	       K402, K403, K405, K407, K408, K410, K411, K412, K413, K414) \
+    {   {KC_NO, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014}, \
+      	{KC_NO, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114}, \
+        {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214}, \
+	{K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314}, \
+	{K400, K401, K402, K403, KC_NO, K405, KC_NO, K407, K408, KC_NO, K410, K411, K412, K413, KC_NO} \
+    }
diff --git a/keyboards/nixkeyboards/day_off/info.json b/keyboards/nixkeyboards/day_off/info.json
new file mode 100644
index 0000000000..0c57be6e82
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/info.json
@@ -0,0 +1,87 @@
+{
+    "keyboard_name": "DayOff",
+    "manufacturer": "NixKeyboards",
+    "url": "nixkeyboards.com",
+    "maintainer": "Schrobie",
+    "usb": {
+        "vid": "0x6E6B",
+        "pid": "0x444F",
+        "device_version": "0.0.1"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"~", "x":1.5, "y":0},
+                {"label":"!", "x":2.5, "y":0},
+                {"label":"@", "x":3.5, "y":0},
+                {"label":"#", "x":4.5, "y":0},
+                {"label":"$", "x":5.5, "y":0},
+                {"label":"%", "x":6.5, "y":0},
+                {"label":"^", "x":7.5, "y":0},
+                {"label":"&", "x":8.5, "y":0},
+                {"label":"*", "x":9.5, "y":0},
+                {"label":"(", "x":10.5, "y":0},
+                {"label":")", "x":11.5, "y":0},
+                {"label":"_", "x":12.5, "y":0},
+                {"label":"+", "x":13.5, "y":0},
+                {"label":"Bksp", "x":14.5, "y":0},
+                {"label":"Del", "x":15.5, "y":0},
+                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
+                {"label":"Q", "x":3, "y":1},
+                {"label":"W", "x":4, "y":1},
+                {"label":"E", "x":5, "y":1},
+                {"label":"R", "x":6, "y":1},
+                {"label":"T", "x":7, "y":1},
+                {"label":"Y", "x":8, "y":1},
+                {"label":"U", "x":9, "y":1},
+                {"label":"I", "x":10, "y":1},
+                {"label":"O", "x":11, "y":1},
+                {"label":"P", "x":12, "y":1},
+                {"label":"{", "x":13, "y":1},
+                {"label":"}", "x":14, "y":1},
+                {"label":"|", "x":15, "y":1, "w":1.5},
+                {"label":"M1", "x":0, "y":2},
+                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
+                {"label":"A", "x":3.25, "y":2},
+                {"label":"S", "x":4.25, "y":2},
+                {"label":"D", "x":5.25, "y":2},
+                {"label":"F", "x":6.25, "y":2},
+                {"label":"G", "x":7.25, "y":2},
+                {"label":"H", "x":8.25, "y":2},
+                {"label":"J", "x":9.25, "y":2},
+                {"label":"K", "x":10.25, "y":2},
+                {"label":"L", "x":11.25, "y":2},
+                {"label":":", "x":12.25, "y":2},
+                {"label":"\"", "x":13.25, "y":2},
+                {"label":"Enter", "x":14.25, "y":2, "w":2.25},
+                {"label":"M2", "x":0, "y":3},
+                {"label":"", "x":1.5, "y":3, "w":1.25},
+                {"label":"Shift", "x":2.75, "y":3},
+                {"label":"Z", "x":3.75, "y":3},
+                {"label":"X", "x":4.75, "y":3},
+                {"label":"C", "x":5.75, "y":3},
+                {"label":"V", "x":6.75, "y":3},
+                {"label":"B", "x":7.75, "y":3},
+                {"label":"N", "x":8.75, "y":3},
+                {"label":"M", "x":9.75, "y":3},
+                {"label":"<", "x":10.75, "y":3},
+                {"label":">", "x":11.75, "y":3},
+                {"label":"?", "x":12.75, "y":3},
+                {"label":"Shift", "x":13.75, "y":3, "w":1.75},
+                {"label":"", "x":15.5, "y":3},
+                {"label":"M3", "x":0, "y":4},
+                {"label":"Ctrl", "x":1.5, "y":4, "w":1.25},
+                {"label":"Win", "x":2.75, "y":4, "w":1.25},
+                {"label":"Alt", "x":4, "y":4, "w":1.25},
+                {"label":"Space", "x":5.25, "y":4, "w":6.25},
+                {"label":"Space", "x":5.25, "y":4, "w":2.25},
+                {"label":"Mod", "x":7.5, "y":4, "w":1.25},
+                {"label":"Space", "x":8.75, "y":4, "w":2.25},
+                {"label":"Alt", "x":11.5, "y":4, "w":1.25},
+                {"label":"Win", "x":12.75, "y":4, "w":1.25},
+                {"label":"Menu", "x":14, "y":4, "w":1.25},
+                {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}
+            ]
+        }
+    }
+}
diff --git a/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c b/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4718f49798
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2021 Nix Keyboards
+ *
+ * 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_all(
+                  QK_GESC,   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_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_BSPC,
+      KC_MPLY,    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_BSLS,  KC_ENT,
+      KC_MNXT,    KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_BSLS,
+      KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  QK_BOOT
+    ),
+    
+    [1] = LAYOUT_all(
+                  QK_BOOT,     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_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_BSPC,
+      KC_MPLY,    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_BSLS,  KC_ENT,
+      KC_MNXT,    KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_BSLS,
+      KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  QK_BOOT
+    ),
+    
+    [2] = LAYOUT_all(
+                     QK_GESC,   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_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_BSPC,
+         KC_MPLY,    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_BSLS,  KC_ENT,
+         KC_MNXT,    KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_BSLS,
+         KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  QK_BOOT
+    ),
+    
+    [3] = LAYOUT_all(
+                     QK_GESC,   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_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_BSPC,
+         KC_MPLY,    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_BSLS,  KC_ENT,
+         KC_MNXT,    KC_LSFT,   KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,  KC_BSLS,
+         KC_MPRV,    KC_LCTL,   KC_LALT, KC_LGUI,          KC_SPC,           KC_SPC,  KC_SPC,           KC_RGUI, KC_RALT, KC_APP,  KC_RCTL,  QK_BOOT
+    ),
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } 
+    else {
+        tap_code(KC_VOLD);
+    }
+    return false;
+}
diff --git a/keyboards/nixkeyboards/day_off/readme.md b/keyboards/nixkeyboards/day_off/readme.md
new file mode 100644
index 0000000000..74d48ca60e
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/readme.md
@@ -0,0 +1,23 @@
+# Day Off Support
+
+[More info at nixkeyboards.com](https://nixkeyboards.com/)
+
+* Keyboard Maintainer: [Schrobie](https://github.com/schrobie)
+* Hardware Supported: Day Off PCBs, both solderable and hotswap
+* Hardware Availability: [Nix Keyboards](https://nixkeyboards.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nixkeyboards/day_off:default
+
+Flashing example for this keyboard:
+
+    make nixkeyboards/day_off:default:flash
+
+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).
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,1) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/nixkeyboards/day_off/rules.mk b/keyboards/nixkeyboards/day_off/rules.mk
new file mode 100644
index 0000000000..05e63bf5b8
--- /dev/null
+++ b/keyboards/nixkeyboards/day_off/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes