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

11 files changed, 314 insertions, 0 deletions

diff --git a/keyboards/nix_studio/n60_a/config.h b/keyboards/nix_studio/n60_a/config.h
new file mode 100644
index 0000000000..dea1c3587d
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/config.h
@@ -0,0 +1,45 @@
+/* Copyright Nix Studio & Valdiieee
+  * 
+  * 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       0x6E78
+#define PRODUCT_ID      0x3630
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Nix Studio
+#define PRODUCT         N60A
+
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { E6, B7, F7, F4, F5 }
+#define MATRIX_COL_PINS { F6, B0, F1, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1 }
+
+#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/nix_studio/n60_a/info.json b/keyboards/nix_studio/n60_a/info.json
new file mode 100644
index 0000000000..5e26857ebe
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/info.json
@@ -0,0 +1,74 @@
+{
+    "keyboard_name": "Nix_N60A",
+    "url": "",
+    "maintainer": "Nix Studio",
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "K00 (E6,F6)", "x": 0, "y": 0 },
+                { "label": "K01 (E6,B0)", "x": 1, "y": 0 },
+                { "label": "K02 (E6,F1)", "x": 2, "y": 0 },
+                { "label": "K03 (E6,C7)", "x": 3, "y": 0 },
+                { "label": "K04 (E6,C6)", "x": 4, "y": 0 },
+                { "label": "K05 (E6,B6)", "x": 5, "y": 0 },
+                { "label": "K06 (E6,B5)", "x": 6, "y": 0 },
+                { "label": "K07 (E6,B4)", "x": 7, "y": 0 },
+                { "label": "K08 (E6,D7)", "x": 8, "y": 0 },
+                { "label": "K09 (E6,D6)", "x": 9, "y": 0 },
+                { "label": "K0A (E6,D4)", "x": 10, "y": 0 },
+                { "label": "K0B (E6,D5)", "x": 11, "y": 0 },
+                { "label": "K0C (E6,D3)", "x": 12, "y": 0 },
+                { "label": "K0D (E6,D2)", "x": 13, "y": 0 },
+                { "label": "K0E (E6,D1)", "x": 14, "y": 0 },
+                { "label": "K10 (B7,F6)", "x": 0, "y": 1, "w": 1.5 },
+                { "label": "K11 (B7,B0)", "x": 1.5, "y": 1 },
+                { "label": "K12 (B7,F1)", "x": 2.5, "y": 1 },
+                { "label": "K13 (B7,C7)", "x": 3.5, "y": 1 },
+                { "label": "K14 (B7,C6)", "x": 4.5, "y": 1 },
+                { "label": "K15 (B7,B6)", "x": 5.5, "y": 1 },
+                { "label": "K16 (B7,B5)", "x": 6.5, "y": 1 },
+                { "label": "K17 (B7,B4)", "x": 7.5, "y": 1 },
+                { "label": "K18 (B7,D7)", "x": 8.5, "y": 1 },
+                { "label": "K19 (B7,D6)", "x": 9.5, "y": 1 },
+                { "label": "K1A (B7,D4)", "x": 10.5, "y": 1 },
+                { "label": "K1B (B7,D5)", "x": 11.5, "y": 1 },
+                { "label": "K1C (B7,D3)", "x": 12.5, "y": 1 },
+                { "label": "K1D (B7,D2)", "x": 13.5, "y": 1, "w": 1.5 },
+                { "label": "K20 (F7,F6)", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "K21 (F7,B0)", "x": 1.75, "y": 2 },
+                { "label": "K22 (F7,F1)", "x": 2.75, "y": 2 },
+                { "label": "K23 (F7,C7)", "x": 3.75, "y": 2 },
+                { "label": "K24 (F7,C6)", "x": 4.75, "y": 2 },
+                { "label": "K25 (F7,B6)", "x": 5.75, "y": 2 },
+                { "label": "K26 (F7,B5)", "x": 6.75, "y": 2 },
+                { "label": "K27 (F7,B4)", "x": 7.75, "y": 2 },
+                { "label": "K28 (F7,D7)", "x": 8.75, "y": 2 },
+                { "label": "K29 (F7,D6)", "x": 9.75, "y": 2 },
+                { "label": "K2A (F7,D4)", "x": 10.75, "y": 2 },
+                { "label": "K2B (F7,D5)", "x": 11.75, "y": 2 },
+                { "label": "K2D (F7,D2)", "x": 12.75, "y": 2, "w": 2.25 },
+                { "label": "K30 (F4,F6)", "x": 0, "y": 3, "w": 2.25 },
+                { "label": "K32 (F4,F1)", "x": 2.25, "y": 3 },
+                { "label": "K33 (F4,C7)", "x": 3.25, "y": 3 },
+                { "label": "K34 (F4,C6)", "x": 4.25, "y": 3 },
+                { "label": "K35 (F4,B6)", "x": 5.25, "y": 3 },
+                { "label": "K36 (F4,B5)", "x": 6.25, "y": 3 },
+                { "label": "K37 (F4,B4)", "x": 7.25, "y": 3 },
+                { "label": "K38 (F4,D7)", "x": 8.25, "y": 3 },
+                { "label": "K39 (F4,D6)", "x": 9.25, "y": 3 },
+                { "label": "K3A (F4,D4)", "x": 10.25, "y": 3 },
+                { "label": "K3B (F4,D5)", "x": 11.25, "y": 3 },
+                { "label": "K3C (F4,D3)", "x": 12.25, "y": 3, "w": 1.75 },
+                { "label": "K3D (F4,D2)", "x": 14, "y": 3 },
+                { "label": "K40 (F5,F6)", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "K41 (F5,B0)", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "K42 (F5,F1)", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "K46 (F5,B5)", "x": 3.75, "y": 4, "w": 6.25 },
+                { "label": "K4A (F5,D4)", "x": 10, "y": 4, "w": 1.25 },
+                { "label": "K4B (F5,D5)", "x": 11.25, "y": 4, "w": 1.25 },
+                { "label": "K4C (F5,D3)", "x": 12.5, "y": 4, "w": 1.25 },
+                { "label": "K4D (F5,D2)", "x": 13.75, "y": 4, "w": 1.25 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/nix_studio/n60_a/keymaps/default/keymap.c b/keyboards/nix_studio/n60_a/keymaps/default/keymap.c
new file mode 100644
index 0000000000..7c6e9cbcfc
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright Nix Studio & Valdiieee
+  * 
+  * 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(
+        KC_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_GRV,  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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, MO(1),   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_LALT, KC_LGUI, KC_MENU, KC_LCTL  
+    ),
+
+    [1] = LAYOUT(
+        KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TILD, KC_DEL,  
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______  
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______  
+    ),
+    [3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______  
+    )
+};
diff --git a/keyboards/nix_studio/n60_a/keymaps/default/readme.md b/keyboards/nix_studio/n60_a/keymaps/default/readme.md
new file mode 100644
index 0000000000..314c466067
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for N60A
diff --git a/keyboards/nix_studio/n60_a/keymaps/via/keymap.c b/keyboards/nix_studio/n60_a/keymaps/via/keymap.c
new file mode 100644
index 0000000000..f31f1c9135
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright Nix Studio & Valdiieee
+  * 
+  * 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(
+        KC_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_GRV,  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_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_LSFT, MO(1),   
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_LALT, KC_LGUI, KC_MENU, KC_LCTL  
+    ),
+
+    [1] = LAYOUT(
+        KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_TILD, KC_DEL,  
+        _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______  
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______  
+    ),
+    [3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+        _______, _______, _______, _______, _______, _______, _______, _______  
+    )
+};
diff --git a/keyboards/nix_studio/n60_a/keymaps/via/readme.md b/keyboards/nix_studio/n60_a/keymaps/via/readme.md
new file mode 100644
index 0000000000..984856f1f1
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default VIA keymap for N60A
diff --git a/keyboards/nix_studio/n60_a/keymaps/via/rules.mk b/keyboards/nix_studio/n60_a/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/nix_studio/n60_a/n60_a.c b/keyboards/nix_studio/n60_a/n60_a.c
new file mode 100644
index 0000000000..9a5563cb89
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/n60_a.c
@@ -0,0 +1,16 @@
+/* Copyright Nix Studio & Valdiieee
+  * 
+  * 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 "n60_a.h"
diff --git a/keyboards/nix_studio/n60_a/n60_a.h b/keyboards/nix_studio/n60_a/n60_a.h
new file mode 100644
index 0000000000..0f5e03747a
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/n60_a.h
@@ -0,0 +1,36 @@
+/* Copyright Nix Studio & Valdiieee
+  * 
+  * 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 XXX KC_NO
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \
+    K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
+    K40, K41, K42, K46, K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX }, \
+}
diff --git a/keyboards/nix_studio/n60_a/readme.md b/keyboards/nix_studio/n60_a/readme.md
new file mode 100644
index 0000000000..d16d269499
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/readme.md
@@ -0,0 +1,21 @@
+# N60_A
+
+60% PCB for Sofia keyboard
+
+* Keyboard Maintainer: [Nix Studio](https://github.com/Nix-Studio) & [Valdiieee](https://github.com/valdiieee)
+* Hardware Supported: N60_A
+* Hardware Availability: Groupbuy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make n60_a:default
+    
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) 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 `RESET` if it is available
+
+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/nix_studio/n60_a/rules.mk b/keyboards/nix_studio/n60_a/rules.mk
new file mode 100644
index 0000000000..cbeed4653c
--- /dev/null
+++ b/keyboards/nix_studio/n60_a/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+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
+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
+
+