6 files changed, 16 insertions, 146 deletions
diff --git a/keyboards/afternoonlabs/gust/gust.c b/keyboards/afternoonlabs/gust/gust.c
deleted file mode 100644
index ee2a9fa5ca..0000000000
--- a/keyboards/afternoonlabs/gust/gust.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 "gust.h"
diff --git a/keyboards/afternoonlabs/gust/gust.h b/keyboards/afternoonlabs/gust/gust.h
deleted file mode 100644
index 886dc3786f..0000000000
--- a/keyboards/afternoonlabs/gust/gust.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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
-
-#ifdef KEYBOARD_afternoonlabs_gust_rev1
-#    include "rev1.h"
-#endif
diff --git a/keyboards/afternoonlabs/gust/rev1/config.h b/keyboards/afternoonlabs/gust/rev1/config.h
deleted file mode 100644
index db2839cfc9..0000000000
--- a/keyboards/afternoonlabs/gust/rev1/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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
-
-// wiring of each half
-#define MATRIX_ROW_PINS { F5, F4, D0 }
-#define MATRIX_COL_PINS { D1, D2, D3 }
-
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/info.json
index a07fab20e2..4cfac9dc59 100644
--- a/keyboards/afternoonlabs/gust/rev1/info.json
+++ b/keyboards/afternoonlabs/gust/rev1/info.json
@@ -8,47 +8,27 @@
         "pid": "0x0002",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["D1", "D2", "D3"],
+        "rows": ["F5", "F4", "D0"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {
-                    "x": 0,
-                    "y": 0
-                },
-                {
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "x": 1,
-                    "y": 1
-                },
-                {
-                    "x": 2,
-                    "y": 1
-                },
-                {
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "x": 1,
-                    "y": 3
-                },
-                {
-                    "x": 2,
-                    "y": 3
-                }
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 3},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 3}
             ]
         }
     }
diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.c b/keyboards/afternoonlabs/gust/rev1/rev1.c
deleted file mode 100644
index ee2a9fa5ca..0000000000
--- a/keyboards/afternoonlabs/gust/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 "gust.h"
diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.h b/keyboards/afternoonlabs/gust/rev1/rev1.h
deleted file mode 100644
index 22c1910a1f..0000000000
--- a/keyboards/afternoonlabs/gust/rev1/rev1.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021 eithanshavit
- *
- * 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 "gust.h"
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    M00, M01, M02, \
-    M10, M11, M12,  \
-    M20, M21, M22  \
-) \
-{ \
-    { M00, M01, M02 }, \
-    { M10, M11, M12 }, \
-    { M20, M21, M22 }  \
-}