Noxary 378 Layout Macro rework (#13998)

* physically arrange layout macro

* add info.json

4 files changed, 131 insertions, 37 deletions

diff --git a/keyboards/noxary/378/378.h b/keyboards/noxary/378/378.h
index db92f21d2f..55158f3695 100644
--- a/keyboards/noxary/378/378.h
+++ b/keyboards/noxary/378/378.h
@@ -22,10 +22,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define ___ KC_NO
 
 #define LAYOUT_all( \
-	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
-	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,      K3G, \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K1G, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K2G, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E, K3G, \
 	K40, K41, K42, K43, K44,                K48,                K4C,      K4E, K4F, K4G  \
 ) { \
     {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
diff --git a/keyboards/noxary/378/info.json b/keyboards/noxary/378/info.json
new file mode 100644
index 0000000000..a63a2890ae
--- /dev/null
+++ b/keyboards/noxary/378/info.json
@@ -0,0 +1,94 @@
+{
+    "keyboard_name": "Noxary 378",
+    "url": "",
+    "maintainer": "Gondolindrim",
+    "height": 5,
+    "width": 19.25,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "F1", "x": 0, "y": 0 },
+                { "label": "F6", "x": 1, "y": 0 },
+                { "label": "Esc", "x": 2.25, "y": 0 },
+                { "label": "1!", "x": 3.25, "y": 0 },
+                { "label": "2@", "x": 4.25, "y": 0 },
+                { "label": "3#", "x": 5.25, "y": 0 },
+                { "label": "4$", "x": 6.25, "y": 0 },
+                { "label": "5%", "x": 7.25, "y": 0 },
+                { "label": "6^", "x": 8.25, "y": 0 },
+                { "label": "7&", "x": 9.25, "y": 0 },
+                { "label": "8*", "x": 10.25, "y": 0 },
+                { "label": "9(", "x": 11.25, "y": 0 },
+                { "label": "0)", "x": 12.25, "y": 0 },
+                { "label": "-_", "x": 13.25, "y": 0 },
+                { "label": "=+", "x": 14.25, "y": 0 },
+                { "label": "Backspace", "x": 15.25, "y": 0 },
+                { "label": "Backspace", "x": 16.25, "y": 0 },
+                { "label": "Print Screen", "x": 17.25, "y": 0 },
+
+                { "label": "F2", "x": 0, "y": 1 },
+                { "label": "F7", "x": 1, "y": 1 },
+                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 3.75, "y": 1 },
+                { "label": "W", "x": 4.75, "y": 1 },
+                { "label": "E", "x": 5.75, "y": 1 },
+                { "label": "R", "x": 6.75, "y": 1 },
+                { "label": "T", "x": 7.75, "y": 1 },
+                { "label": "Y", "x": 8.75, "y": 1 },
+                { "label": "U", "x": 9.75, "y": 1 },
+                { "label": "I", "x": 10.75, "y": 1 },
+                { "label": "O", "x": 11.75, "y": 1 },
+                { "label": "P", "x": 12.75, "y": 1 },
+                { "label": "[{", "x": 13.75, "y": 1 },
+                { "label": "]}", "x": 14.75, "y": 1 },
+                { "label": "\\|", "x": 15.75, "y": 1, "w": 1.5 },
+                { "label": "Delete", "x": 17.25, "y": 1 },
+
+                { "label": "F3", "x": 0, "y": 2 },
+                { "label": "F8", "x": 1, "y": 2 },
+                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 4, "y": 2 },
+                { "label": "S", "x": 5, "y": 2 },
+                { "label": "D", "x": 6, "y": 2 },
+                { "label": "F", "x": 7, "y": 2 },
+                { "label": "G", "x": 8, "y": 2 },
+                { "label": "H", "x": 9, "y": 2 },
+                { "label": "J", "x": 10, "y": 2 },
+                { "label": "K", "x": 11, "y": 2 },
+                { "label": "L", "x": 12, "y": 2 },
+                { "label": ";:", "x": 13, "y": 2 },
+                { "label": "'\"", "x": 14, "y": 2 },
+                { "label": "Enter", "x": 15, "y": 2, "w": 2.25 },
+                { "label": "Home", "x": 17.25, "y": 2 },
+
+                { "label": "F4", "x": 0, "y": 3 },
+                { "label": "F9", "x": 1, "y": 3 },
+                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
+                { "label": "Z", "x": 4.5, "y": 3 },
+                { "label": "X", "x": 5.5, "y": 3 },
+                { "label": "C", "x": 6.5, "y": 3 },
+                { "label": "V", "x": 7.5, "y": 3 },
+                { "label": "B", "x": 8.5, "y": 3 },
+                { "label": "N", "x": 9.5, "y": 3 },
+                { "label": "M", "x": 10.5, "y": 3 },
+                { "label": "<", "x": 11.5, "y": 3 },
+                { "label": ">", "x": 12.5, "y": 3 },
+                { "label": "?", "x": 13.5, "y": 3 },
+                { "label": "Shift", "x": 14.5, "y": 3, "w": 1.75 },
+                { "label": "\u2191", "x": 16.25, "y": 3 },
+                { "label": "End", "x": 17.25, "y": 3 },
+
+                { "label": "F5", "x": 0, "y": 4 },
+                { "label": "F10", "x": 1, "y": 4 },
+                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.5 },
+                { "label": "GUI", "x": 3.75, "y": 4 },
+                { "label": "Alt", "x": 4.75, "y": 4, "w": 1.5 },
+                { "label": "Space", "x": 6.25, "y": 4, "w": 7 },
+                { "label": "Alt", "x": 13.25, "y": 4, "w": 1.5 },
+                { "label": "\u2190", "x": 15.25, "y": 4 },
+                { "label": "\u2193", "x": 16.25, "y": 4 },
+                { "label": "\u2192", "x": 17.25, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/noxary/378/keymaps/default/keymap.c b/keyboards/noxary/378/keymaps/default/keymap.c
index d78d05be36..0bd9b7390d 100755
--- a/keyboards/noxary/378/keymaps/default/keymap.c
+++ b/keyboards/noxary/378/keymaps/default/keymap.c
@@ -17,11 +17,11 @@ 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(
-        KC_F1  , KC_F6  , 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_BSPC, KC_BSPC,
-        KC_F2  , KC_F7  , 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_PSCR,
-        KC_F3  , KC_F8  , 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_HOME, KC_DEL ,
-        KC_F4  , KC_F9  , 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_END ,
+    [0] = LAYOUT_all(
+        KC_F1  , KC_F6  , 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_BSPC, KC_BSPC, KC_PSCR,
+        KC_F2  , KC_F7  , 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_F3  , KC_F8  , 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_HOME,
+        KC_F4  , KC_F9  , 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_END ,
         KC_F5  , KC_F10 , KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
-)
+    )
 };
diff --git a/keyboards/noxary/378/keymaps/via/keymap.c b/keyboards/noxary/378/keymaps/via/keymap.c
index f8f4e4687f..bcbe816903 100755
--- a/keyboards/noxary/378/keymaps/via/keymap.c
+++ b/keyboards/noxary/378/keymaps/via/keymap.c
@@ -17,32 +17,32 @@ 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(
-        KC_F1  , KC_F6  , 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_BSPC, KC_BSPC,
-        KC_F2  , KC_F7  , 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_PSCR,
-        KC_F3  , KC_F8  , 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_HOME, KC_DEL ,
-        KC_F4  , KC_F9  , 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_END ,
+    [0] = LAYOUT_all(
+        KC_F1  , KC_F6  , 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_BSPC, KC_BSPC, KC_PSCR,
+        KC_F2  , KC_F7  , 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_F3  , KC_F8  , 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_HOME,
+        KC_F4  , KC_F9  , 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_END ,
         KC_F5  , KC_F10 , KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
-),
-   [1] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-),
-   [2] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-),
-   [3] = LAYOUT_all(
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,  
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
-)
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                   KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS
+    )
 };