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

11 files changed, 691 insertions, 0 deletions

diff --git a/keyboards/noxary/268_2_rgb/268_2_rgb.c b/keyboards/noxary/268_2_rgb/268_2_rgb.c
new file mode 100644
index 0000000000..038d34c83c
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/268_2_rgb.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 Rozakiin
+ *
+ * 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 "268_2_rgb.h"
diff --git a/keyboards/noxary/268_2_rgb/268_2_rgb.h b/keyboards/noxary/268_2_rgb/268_2_rgb.h
new file mode 100644
index 0000000000..a302dccf21
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/268_2_rgb.h
@@ -0,0 +1,82 @@
+/* Copyright 2018 Rozakiin
+ *
+ * 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 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_65_ansi_blocker( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
+    K400, K401, K402,                         K407,             K410, K411, K412,       K414, K415  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
+    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
+    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, K407,  KC_NO, KC_NO, K410,  K411,  K412,  KC_NO, K414,  K415 }  \
+}
+
+#define LAYOUT_split_bs( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
+    K400, K401, K402,                         K407,             K410, K411, K412,       K414, K415  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
+    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
+    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, K407,  KC_NO, KC_NO, K410,  K411,  K412,  KC_NO, K414,  K415 }  \
+}
+
+#define LAYOUT_7u_space( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
+    K400, K401, K402,                         K407,                   K411, K412,       K414, K415  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  KC_NO, K014,  K015 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
+    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
+    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, K407,  KC_NO, KC_NO, KC_NO, K411,  K412,  KC_NO, K414,  K415 }  \
+}
+
+#define LAYOUT_7u_space_split_bs( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K114, K115, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K214, K215, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K314, K315, \
+    K400, K401, K402,                         K407,                   K411, K412,       K414, K415  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO, K114,  K115 }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  KC_NO, KC_NO, K214,  K215 }, \
+    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  KC_NO, K314,  K315 }, \
+    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, K407,  KC_NO, KC_NO, KC_NO, K411,  K412,  KC_NO, K414,  K415 }  \
+}
diff --git a/keyboards/noxary/268_2_rgb/config.h b/keyboards/noxary/268_2_rgb/config.h
new file mode 100644
index 0000000000..eafbbd4092
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/config.h
@@ -0,0 +1,73 @@
+/*
+Copyright 2020 Rozakiin
+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       0x4E58 //"NX"
+#define PRODUCT_ID      0x0A7C //2684
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Noxary
+#define PRODUCT         268.2_RGB
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * 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 { F6, F5, F4, F0, B6 }
+#define MATRIX_COL_PINS { C6, C7, F7, F1, E6, B2, B1, D6, B4, D7, D4, D5, D3, D2, D1, D0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN B0
+
+#define BACKLIGHT_PIN B7
+//define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+
+/* ws2812b options */
+#define RGB_DI_PIN B5
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 16
+#define RGBLIGHT_HUE_STEP 16
+#define RGBLIGHT_SAT_STEP 16
+#define RGBLIGHT_VAL_STEP 16
+/*#define RGBLIGHT_LIMIT_VAL 255 */
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
diff --git a/keyboards/noxary/268_2_rgb/info.json b/keyboards/noxary/268_2_rgb/info.json
new file mode 100644
index 0000000000..ac63e23a18
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/info.json
@@ -0,0 +1,294 @@
+{
+    "keyboard_name": "Noxary 268.2 RGB",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 16,
+    "height": 5,
+    "layouts": {
+      "LAYOUT_65_ansi_blocker": {
+        "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, "w":2},
+          {"x":15, "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":15, "y":1},
+          {"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":15, "y":2},
+          {"x":0, "y":3, "w":2.25},
+          {"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":15, "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":13, "y":4},
+          {"x":14, "y":4},
+          {"x":15, "y":4}
+        ]
+      },
+      "LAYOUT_split_bs": {
+        "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":15, "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":15, "y":1},
+          {"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":15, "y":2},
+          {"x":0, "y":3, "w":2.25},
+          {"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":15, "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":13, "y":4},
+          {"x":14, "y":4},
+          {"x":15, "y":4}
+        ]
+      },
+      "LAYOUT_7u_space": {
+        "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, "w":2},
+          {"x":15, "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":15, "y":1},
+          {"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":15, "y":2},
+          {"x":0, "y":3, "w":2.25},
+          {"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":15, "y":3},
+          {"x":0, "y":4, "w":1.5},
+          {"x":1.5, "y":4},
+          {"x":2.5, "y":4, "w":1.5},
+          {"x":4, "y":4, "w":7},
+          {"x":11, "y":4, "w":1.5},
+          {"x":13, "y":4},
+          {"x":14, "y":4},
+          {"x":15, "y":4}
+        ]
+      },
+      "LAYOUT_7u_space_split_bs": {
+        "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":15, "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":15, "y":1},
+          {"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":15, "y":2},
+          {"x":0, "y":3, "w":2.25},
+          {"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":15, "y":3},
+          {"x":0, "y":4, "w":1.5},
+          {"x":1.5, "y":4},
+          {"x":2.5, "y":4, "w":1.5},
+          {"x":4, "y":4, "w":7},
+          {"x":11, "y":4, "w":1.5},
+          {"x":13, "y":4},
+          {"x":14, "y":4},
+          {"x":15, "y":4}
+        ]
+      }
+    }
+  }
+  
\ No newline at end of file
diff --git a/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c b/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..4557ae07ac
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2020 Rozakiin
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BL,
+    _FL1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base Layer
+    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+    * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │  Bspc │ ` │
+    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+    * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
+    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+    * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │PgU│
+    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+    * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │PgD│
+    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+    * │Ctrl│Win │Alt │        Space           │Alt │ Fn │ │ ← │ ↓ │ → │
+    * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+    */
+    [_BL] = LAYOUT_65_ansi_blocker(
+        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_GRV,
+        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_DEL,
+        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_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,   KC_C,    KC_V,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,           KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                             KC_RALT, MO(_FL1),          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    /* Function Layer 1
+    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+    * │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│  PScr │   │
+    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+    * │ RGB │VAI│SAI│HUI│RST│   │   │   │   │   │   │   │   │     │Ins│
+    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+    * │      │VAD│SAD│HUD│   │   │   │   │   │   │   │   │        │Hom│
+    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+    * │        │   │   │   │   │   │   │   │   │Bl-│Bl+│ Mute │Vl+│End│
+    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+    * │    │    │    │      BL Toggle         │    │    │ │   │Vl-│   │
+    * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+    */
+    [_FL1] = LAYOUT_65_ansi_blocker(
+        KC_GRV,  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_PSCR, _______,
+        RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, RESET,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
+        _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  KC_MUTE,          KC_VOLU, KC_END,
+        _______, _______, _______,                            BL_TOGG,                            _______, _______,          _______, KC_VOLD, _______
+    ),
+};
diff --git a/keyboards/noxary/268_2_rgb/keymaps/default/readme.md b/keyboards/noxary/268_2_rgb/keymaps/default/readme.md
new file mode 100644
index 0000000000..1551482768
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# The default keymap for 268.2 RGB
+
+![Noxary 268.2 RGB Layout Image](https://i.imgur.com/oIQiqcy.png)
diff --git a/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c b/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..4ca46d2a61
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/keymaps/via/keymap.c
@@ -0,0 +1,110 @@
+/* Copyright 2020 Rozakiin
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_names {
+    _BL,
+    _FL1,
+    _FL2,
+    _FL3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base Layer
+    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+    * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │  Bspc │ ` │
+    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+    * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
+    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+    * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │PgU│
+    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+    * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │Shift │ ↑ │PgD│
+    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+    * │Ctrl│Win │Alt │        Space           │Alt │ Fn │ │ ← │ ↓ │ → │
+    * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+    */
+    [_BL] = LAYOUT_65_ansi_blocker(
+        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_GRV,
+        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_DEL,
+        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_PGUP,
+        KC_LSFT,          KC_Z,    KC_X,   KC_C,    KC_V,  KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,           KC_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                             KC_RALT, MO(_FL1),          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    /* Function Layer 1
+    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+    * │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│  PScr │   │
+    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+    * │ RGB │VAI│SAI│HUI│RST│   │   │   │   │   │   │   │   │     │Ins│
+    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+    * │      │VAD│SAD│HUD│   │   │   │   │   │   │   │   │        │Hom│
+    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+    * │        │   │   │   │   │   │   │   │   │Bl-│Bl+│ Mute │Vl+│End│
+    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+    * │    │    │    │      BL Toggle         │    │    │ │   │Vl-│   │
+    * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+    */
+    [_FL1] = LAYOUT_65_ansi_blocker(
+        KC_GRV,  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_PSCR, _______,
+        RGB_TOG, RGB_VAI, RGB_SAI, RGB_HUI, RESET,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
+        _______, RGB_VAD, RGB_SAD, RGB_HUD, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_HOME,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  KC_MUTE,          KC_VOLU, KC_END,
+        _______, _______, _______,                            BL_TOGG,                            _______, _______,          _______, KC_VOLD, _______
+    ),
+    /* Function Layer 2
+    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+    * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
+    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+    * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+    * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+    * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+    * │    │    │    │                        │    │    │ │   │   │   │
+    * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+    */
+    [_FL2] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
+    /* Function Layer 3
+    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+    * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
+    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+    * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+    * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+    * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+    * │    │    │    │                        │    │    │ │   │   │   │
+    * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+    */
+    [_FL3] = LAYOUT_65_ansi_blocker(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
+};
\ No newline at end of file
diff --git a/keyboards/noxary/268_2_rgb/keymaps/via/readme.md b/keyboards/noxary/268_2_rgb/keymaps/via/readme.md
new file mode 100644
index 0000000000..1bfd5a5a3b
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# The VIA keymap for 268.2 RGB
+
+![Noxary 268.2 RGB Layout Image](https://i.imgur.com/oIQiqcy.png)
diff --git a/keyboards/noxary/268_2_rgb/keymaps/via/rules.mk b/keyboards/noxary/268_2_rgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1974f5d3f5
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/keymaps/via/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+MOUSEKEY_ENABLE = no
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # Commands for debug and configuration
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/noxary/268_2_rgb/readme.md b/keyboards/noxary/268_2_rgb/readme.md
new file mode 100644
index 0000000000..9a56d3dbcf
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/readme.md
@@ -0,0 +1,15 @@
+# Noxary 268.2 RGB
+
+![268.2 RGB](https://cdn.shopify.com/s/files/1/0071/6377/3043/products/Cyan_Comp_1512x.jpg?v=1585859371)
+
+A fully customizable 65% keyboard with RGB.
+
+* Keyboard Maintainer: [Rozakiin](https://github.com/rozakiin)
+* Hardware Supported: 268.2 RGB PCB
+* Hardware Availability: [Noxary](https://noxary.co/collections/268-2-polycarbonate-r3)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make noxary/268_2_RGB: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/noxary/268_2_rgb/rules.mk b/keyboards/noxary/268_2_rgb/rules.mk
new file mode 100644
index 0000000000..62796a3999
--- /dev/null
+++ b/keyboards/noxary/268_2_rgb/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 = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output