Noxary 268.2 update (#6254)

* Fix Noxary 268.2 layout macros & info.json

* Update Noxary 268.2 to current QMK code style

7 files changed, 428 insertions, 139 deletions

diff --git a/keyboards/noxary/268_2/268_2.c b/keyboards/noxary/268_2/268_2.c
index da4e5efb7..9e2d82236 100644
--- a/keyboards/noxary/268_2/268_2.c
+++ b/keyboards/noxary/268_2/268_2.c
@@ -15,40 +15,14 @@
  */
 #include "268_2.h"
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	// put your per-action keyboard code here
-	// runs for every action, just before processing by the firmware
-
-	return process_record_user(keycode, record);
-}
-
 void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-
-	led_set_user(usb_led);
-}
-
-__attribute__((weak))
-void led_set_user(uint8_t usb_led) {
-
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        DDRB |= (1 << 0); PORTB |= (1 << 0);
-    }
-    else {
-        DDRB &= ~(1 << 0); PORTB &= ~(1 << 0);
+    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+        setPinOutput(B0);
+        writePinHigh(B0);
+    } else {
+        setPinInput(B0);
+        writePinLow(B0);
     }
+
+    led_set_user(usb_led);
 }
diff --git a/keyboards/noxary/268_2/268_2.h b/keyboards/noxary/268_2/268_2.h
index 2f5d985a3..71fd84417 100644
--- a/keyboards/noxary/268_2/268_2.h
+++ b/keyboards/noxary/268_2/268_2.h
@@ -13,8 +13,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef N268_2_H
-#define N268_2_H
+#pragma once
 
 #include "quantum.h"
 
@@ -27,17 +26,57 @@
  * represents the switch matrix.
  */
 #define LAYOUT( \
-	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,                   K406,             K409, K410,       K412,       K414, K415  \
+    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,                   K406,                   K409, K410,       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, K406,  KC_NO, KC_NO, K409,  K410,  KC_NO, K412,  KC_NO, 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, K406,  KC_NO, KC_NO, K409,  K410,  KC_NO, K412,  KC_NO, K414,  K415 }  \
 }
 
-#endif
+#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,                   K406,                   K409, K410,       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, K406,  KC_NO, KC_NO, K409,  K410,  KC_NO, 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,                   K406,                         K410,       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, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, 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,                   K406,                         K410,       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, K406,  KC_NO, KC_NO, KC_NO, K410,  KC_NO, K412,  KC_NO, K414,  K415 }  \
+}
diff --git a/keyboards/noxary/268_2/config.h b/keyboards/noxary/268_2/config.h
index 547c729f9..fbfb97f02 100644
--- a/keyboards/noxary/268_2/config.h
+++ b/keyboards/noxary/268_2/config.h
@@ -41,7 +41,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
 */
-/* key matrix pins */
 #define MATRIX_ROW_PINS { F7, F6, F5, F0, B5 }
 #define MATRIX_COL_PINS { C6, B6, C7, F4, E6, D0, D7, D1, D2, B4, D6, D4, D5, F1, D3, B1 }
 #define UNUSED_PINS
@@ -49,11 +48,42 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/* number of backlight levels */
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
 #define BACKLIGHT_PIN B7
-#ifdef BACKLIGHT_PIN
+//define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
-#endif
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
@@ -106,6 +136,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
+
 /* control how magic key switches layers */
 //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
 //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
@@ -115,8 +149,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
 //#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
 //#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1          H
-//#define MAGIC_KEY_HELP2          SLASH
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
 //#define MAGIC_KEY_DEBUG          D
 //#define MAGIC_KEY_DEBUG_MATRIX   X
 //#define MAGIC_KEY_DEBUG_KBD      K
@@ -124,9 +158,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MAGIC_KEY_VERSION        V
 //#define MAGIC_KEY_STATUS         S
 //#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0_ALT1    ESC
-//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
 //#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
 //#define MAGIC_KEY_LAYER1         1
 //#define MAGIC_KEY_LAYER2         2
 //#define MAGIC_KEY_LAYER3         3
@@ -136,9 +169,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define MAGIC_KEY_LAYER7         7
 //#define MAGIC_KEY_LAYER8         8
 //#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     PAUSE
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
 //#define MAGIC_KEY_LOCK           CAPS
 //#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
 //#define MAGIC_KEY_NKRO           N
 //#define MAGIC_KEY_SLEEP_LED      Z
 
diff --git a/keyboards/noxary/268_2/info.json b/keyboards/noxary/268_2/info.json
index 8d227afd8..b47e2de98 100644
--- a/keyboards/noxary/268_2/info.json
+++ b/keyboards/noxary/268_2/info.json
@@ -5,8 +5,289 @@
   "width": 16,
   "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, "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}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
-      }
+    "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, "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}
+      ]
+    }
   }
 }
diff --git a/keyboards/noxary/268_2/keymaps/default/keymap.c b/keyboards/noxary/268_2/keymaps/default/keymap.c
index 994fe36b0..c22ec2b1d 100644
--- a/keyboards/noxary/268_2/keymaps/default/keymap.c
+++ b/keyboards/noxary/268_2/keymaps/default/keymap.c
@@ -4,80 +4,51 @@
 // 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.
-#define _BL 0
-#define _FL1 1
-#define _FL2 2
+enum layer_names {
+    _BL,
+    _FL
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* _BL: Base Layer(Default) - For ISO enter use ANSI enter
-    * ,----------------------------------------------------------------.
-    * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| \|BSpc| Grv|
-    * |----------------------------------------------------------------|
-    * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | Del|
-    * |----------------------------------------------------------------|
-    * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| #| Ent|PgUp|
-    * |----------------------------------------------------------------|
-    * |Shift| \|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-    * |----------------------------------------------------------------|
-    * |Ctrl|Win |Alt |        Space        |Alt|Mo(1)|Ctrl|Lef|Dow|Rght|
-    * `----------------------------------------------------------------'
+    /* 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(
-        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_BSLS, KC_BSPC, KC_GRV,
+        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),
-    /* _FL1: Function Layer 1 - For ISO enter use ANSI enter
-    * ,----------------------------------------------------------------.
-    * |  `|F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |PScr|    |
-    * |----------------------------------------------------------------|
-    * |     |   |   |   |RST|   |   |   |   |   |   |   |   |     | Ins|
-    * |----------------------------------------------------------------|
-    * |       |   |   |   |   |   |   |   |   |   |   |   |  |    |Home|
-    * |----------------------------------------------------------------|
-    * |     |   |   |   |   |   |   |   |   |Bl-|Bl+|   |Mute|Vol+| End|
-    * |----------------------------------------------------------------|
-    * |    |    |    |      BL_Toggle       |   |   |   |    |Vol-|    |
-    * `----------------------------------------------------------------'
+        KC_LCTL, KC_LGUI, KC_LALT,                         KC_SPC,                             KC_RALT, MO(_FL),           KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /* Function Layer
+    * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+    * │ ` │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│  PScr │   │
+    * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+    * │     │   │   │   │RST│   │   │   │   │   │   │   │   │     │Ins│
+    * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+    * │      │   │   │   │   │   │   │   │   │   │   │   │        │Hom│
+    * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+    * │        │   │   │   │   │   │   │   │   │Bl-│Bl+│ Mute │Vl+│End│
+    * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+    * │    │    │    │      BL Toggle         │    │    │ │   │Vl-│   │
+    * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
     */
-    [_FL1] = LAYOUT(
-        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, _______,
+    [_FL] = LAYOUT(
+        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, _______,
         _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_INS,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_HOME,
-        _______,          _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  _______, KC_MUTE,          KC_VOLU, KC_END,
-        _______, _______, _______,                            BL_TOGG,                   _______, _______,          _______,          KC_VOLD, _______),
-    /* _FL2: Function Layer 2 - For ISO enter use ANSI enter
-    * ,----------------------------------------------------------------.
-    * |   |  |   |   |   |   |   |   |   |   |   |   |   |    |   |    |
-    * |----------------------------------------------------------------|
-    * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-    * |----------------------------------------------------------------|
-    * |       |   |   |   |   |   |   |   |   |   |   |   |  |    |    |
-    * |----------------------------------------------------------------|
-    * |     |   |   |   |   |   |   |   |   |   |   |   |    |    |    |
-    * |----------------------------------------------------------------|
-    * |    |    |    |                      |   |   |   |    |    |    |
-    * `----------------------------------------------------------------'
-    */
-    [_FL2] = LAYOUT(
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______,
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-        _______, _______, _______,                            _______,                   _______, _______,          _______,          _______, _______),
-
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC,  BL_INC,  KC_MUTE,          KC_VOLU, KC_END,
+        _______, _______, _______,                            BL_TOGG,                            _______, _______,          _______, KC_VOLD, _______
+    )
 };
-
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-
diff --git a/keyboards/noxary/268_2/readme.md b/keyboards/noxary/268_2/readme.md
index 85d1a4717..075a1d26c 100644
--- a/keyboards/noxary/268_2/readme.md
+++ b/keyboards/noxary/268_2/readme.md
@@ -4,10 +4,9 @@
 
 A fully customizable 65% keyboard.
 
-* Keyboard Maintainer: [Rozakiin](https://github.com/rozakiin)
-* Hardware Supported: 268.2 PCB
-  * rev1 
-* Hardware Availability: [Noxary](https://shop.noxary.co/collections/268-2/products/noxary-268-2-polycarbonate)
+Keyboard Maintainer: [Rozakiin](https://github.com/rozakiin)  
+Hardware Supported: 268.2 PCB  
+Hardware Availability: [Noxary](https://shop.noxary.co/collections/268-2/products/noxary-268-2-polycarbonate)
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/keyboards/noxary/268_2/rules.mk b/keyboards/noxary/268_2/rules.mk
index 9b6d7e672..a89c930a1 100644
--- a/keyboards/noxary/268_2/rules.mk
+++ b/keyboards/noxary/268_2/rules.mk
@@ -48,16 +48,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 BOOTLOADER = atmel-dfu
 
 
-# If you don't know the bootloader type, then you can specify the
-# Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
-#   Teensy halfKay      512
-#   Teensy++ halfKay    1024
-#   Atmel DFU loader    4096
-#   LUFA bootloader     4096
-#   USBaspLoader        2048
-# OPT_DEFS += -DBOOTLOADER_SIZE=4096
-
-
 # Build Options
 #   change yes to no to disable
 #