4 files changed, 27 insertions, 79 deletions
diff --git a/keyboards/40percentclub/polyandry/teensy2/config.h b/keyboards/40percentclub/polyandry/teensy2/config.h
deleted file mode 100644
index 8eaeb3167a..0000000000
--- a/keyboards/40percentclub/polyandry/teensy2/config.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021
- *
- * 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
-
-
-/* key matrix pins */
-
-// Note from original contributor (ryjelsum):
-// Untested - don't have teensy2. if some keys do not function or are in wrong place,
-// please check the pin definitions. I may have screwed up. :) 
-
-#define MATRIX_ROW_PINS { D3 }
-#define MATRIX_COL_PINS { B7, D0, D1, D2, C6, C7, F6, F7, B6, B5, D7, D6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/40percentclub/polyandry/teensy2/info.json b/keyboards/40percentclub/polyandry/teensy2/info.json
index 0b2db81c11..33fd1d71df 100644
--- a/keyboards/40percentclub/polyandry/teensy2/info.json
+++ b/keyboards/40percentclub/polyandry/teensy2/info.json
@@ -1,4 +1,30 @@
 {
+    "matrix_pins": {
+        "cols": ["B7", "D0", "D1", "D2", "C6", "C7", "F6", "F7", "B6", "B5", "D7", "D6"],
+        "rows": ["D3"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
-    "bootloader": "halfkay"
+    "bootloader": "halfkay",
+    "layouts": {
+        "LAYOUT_ortho_4x3": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+
+                {"matrix": [0, 3], "x": 0, "y": 1},
+                {"matrix": [0, 4], "x": 1, "y": 1},
+                {"matrix": [0, 5], "x": 2, "y": 1},
+
+                {"matrix": [0, 6], "x": 0, "y": 2},
+                {"matrix": [0, 7], "x": 1, "y": 2},
+                {"matrix": [0, 8], "x": 2, "y": 2},
+
+                {"matrix": [0, 9], "x": 0, "y": 3},
+                {"matrix": [0, 10], "x": 1, "y": 3},
+                {"matrix": [0, 11], "x": 2, "y": 3}
+            ]
+        }
+    }
 }
diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.c b/keyboards/40percentclub/polyandry/teensy2/teensy2.c
deleted file mode 100644
index 33cfb6e553..0000000000
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Copyright 2021
- *
- * 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 "teensy2.h"
diff --git a/keyboards/40percentclub/polyandry/teensy2/teensy2.h b/keyboards/40percentclub/polyandry/teensy2/teensy2.h
deleted file mode 100644
index ce7790434b..0000000000
--- a/keyboards/40percentclub/polyandry/teensy2/teensy2.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Copyright 2021
- *
- * 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
-
-//NOTE TO FUTURE FROM RYJELSUM (original contributor):
-//This has been unchanged from the promicro.h file. 
-//I DO NOT HAVE A TEENSY 2.0 TO TEST WITH.
-//I believe this should still work - but it's not a sure thing.
-
-#include "polyandry.h"
-
-#define LAYOUT_ortho_4x3( \
-	K000, K001, K002, \
- 	K003, K004, K005, \
-	K006, K007, K008, \
-	K009, K010, K011  \
-) { \
-	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011 }  \
-}