update preonic, add info.json

4 files changed, 148 insertions, 7 deletions

diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h
index 8aa88b7f0..74db9202d 100644
--- a/keyboards/preonic/config.h
+++ b/keyboards/preonic/config.h
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x6061
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Ortholinear Keyboards
+#define MANUFACTURER    OLKB
 #define PRODUCT         The Preonic Keyboard
 #define DESCRIPTION     A compact ortholinear keyboard
 
diff --git a/keyboards/preonic/info.json b/keyboards/preonic/info.json
new file mode 100644
index 000000000..27e06bcd8
--- /dev/null
+++ b/keyboards/preonic/info.json
@@ -0,0 +1,141 @@
+{
+  "keyboard_name": "Preonic",
+  "keyboard_folder": "preonic",
+  "manufacturer": "OLKB",
+  "identifier": "FEED:6061:0001",
+  "url": "https://olkb.com/preonic",
+  "maintainer": "jackhumbert",
+  "processor": "atmega32u4",
+  "bootloader": "atmel-dfu",
+  "width": 12,
+  "height": 5,
+  "layouts": {
+    "LAYOUT_preonic_mit": {
+      "key_count": 59,
+      "layout": [ 
+        { "w": 1, "x": 0, "y": 0 }, 
+        { "w": 1, "x": 1, "y": 0 }, 
+        { "w": 1, "x": 2, "y": 0 }, 
+        { "w": 1, "x": 3, "y": 0 }, 
+        { "w": 1, "x": 4, "y": 0 }, 
+        { "w": 1, "x": 5, "y": 0 }, 
+        { "w": 1, "x": 6, "y": 0 }, 
+        { "w": 1, "x": 7, "y": 0 }, 
+        { "w": 1, "x": 8, "y": 0 }, 
+        { "w": 1, "x": 9, "y": 0 }, 
+        { "w": 1, "x": 10, "y": 0 }, 
+        { "w": 1, "x": 11, "y": 0 }, 
+        { "w": 1, "x": 0, "y": 1 }, 
+        { "w": 1, "x": 1, "y": 1 }, 
+        { "w": 1, "x": 2, "y": 1 }, 
+        { "w": 1, "x": 3, "y": 1 }, 
+        { "w": 1, "x": 4, "y": 1 }, 
+        { "w": 1, "x": 5, "y": 1 }, 
+        { "w": 1, "x": 6, "y": 1 }, 
+        { "w": 1, "x": 7, "y": 1 }, 
+        { "w": 1, "x": 8, "y": 1 }, 
+        { "w": 1, "x": 9, "y": 1 }, 
+        { "w": 1, "x": 10, "y": 1 }, 
+        { "w": 1, "x": 11, "y": 1 }, 
+        { "w": 1, "x": 0, "y": 2 }, 
+        { "w": 1, "x": 1, "y": 2 }, 
+        { "w": 1, "x": 2, "y": 2 }, 
+        { "w": 1, "x": 3, "y": 2 }, 
+        { "w": 1, "x": 4, "y": 2 }, 
+        { "w": 1, "x": 5, "y": 2 }, 
+        { "w": 1, "x": 6, "y": 2 }, 
+        { "w": 1, "x": 7, "y": 2 }, 
+        { "w": 1, "x": 8, "y": 2 }, 
+        { "w": 1, "x": 9, "y": 2 }, 
+        { "w": 1, "x": 10, "y": 2 }, 
+        { "w": 1, "x": 11, "y": 2 }, 
+        { "w": 1, "x": 0, "y": 3 }, 
+        { "w": 1, "x": 1, "y": 3 }, 
+        { "w": 1, "x": 2, "y": 3 }, 
+        { "w": 1, "x": 3, "y": 3 }, 
+        { "w": 1, "x": 4, "y": 3 }, 
+        { "w": 1, "x": 5, "y": 3 }, 
+        { "w": 1, "x": 6, "y": 3 }, 
+        { "w": 1, "x": 7, "y": 3 }, 
+        { "w": 1, "x": 8, "y": 3 }, 
+        { "w": 1, "x": 9, "y": 3 }, 
+        { "w": 1, "x": 10, "y": 3 }, 
+        { "w": 1, "x": 11, "y": 3 }, 
+        { "w": 1, "x": 0, "y": 4 }, 
+        { "w": 1, "x": 1, "y": 4 }, 
+        { "w": 1, "x": 2, "y": 4 }, 
+        { "w": 1, "x": 3, "y": 4 }, 
+        { "w": 1, "x": 4, "y": 4 }, 
+        { "w": 2, "x": 5.5, "y": 4 }, 
+        { "w": 1, "x": 7, "y": 4 }, 
+        { "w": 1, "x": 8, "y": 4 }, 
+        { "w": 1, "x": 9, "y": 4 }, 
+        { "w": 1, "x": 10, "y": 4 }, 
+        { "w": 1, "x": 11, "y": 4 } ]
+    },
+    "LAYOUT_preonic_grid": {
+      "key_count": 60,
+      "layout": [ 
+        { "w": 1, "x": 0, "y": 0 }, 
+        { "w": 1, "x": 1, "y": 0 }, 
+        { "w": 1, "x": 2, "y": 0 }, 
+        { "w": 1, "x": 3, "y": 0 }, 
+        { "w": 1, "x": 4, "y": 0 }, 
+        { "w": 1, "x": 5, "y": 0 }, 
+        { "w": 1, "x": 6, "y": 0 }, 
+        { "w": 1, "x": 7, "y": 0 }, 
+        { "w": 1, "x": 8, "y": 0 }, 
+        { "w": 1, "x": 9, "y": 0 }, 
+        { "w": 1, "x": 10, "y": 0 }, 
+        { "w": 1, "x": 11, "y": 0 }, 
+        { "w": 1, "x": 0, "y": 1 }, 
+        { "w": 1, "x": 1, "y": 1 }, 
+        { "w": 1, "x": 2, "y": 1 }, 
+        { "w": 1, "x": 3, "y": 1 }, 
+        { "w": 1, "x": 4, "y": 1 }, 
+        { "w": 1, "x": 5, "y": 1 }, 
+        { "w": 1, "x": 6, "y": 1 }, 
+        { "w": 1, "x": 7, "y": 1 }, 
+        { "w": 1, "x": 8, "y": 1 }, 
+        { "w": 1, "x": 9, "y": 1 }, 
+        { "w": 1, "x": 10, "y": 1 }, 
+        { "w": 1, "x": 11, "y": 1 }, 
+        { "w": 1, "x": 0, "y": 2 }, 
+        { "w": 1, "x": 1, "y": 2 }, 
+        { "w": 1, "x": 2, "y": 2 }, 
+        { "w": 1, "x": 3, "y": 2 }, 
+        { "w": 1, "x": 4, "y": 2 }, 
+        { "w": 1, "x": 5, "y": 2 }, 
+        { "w": 1, "x": 6, "y": 2 }, 
+        { "w": 1, "x": 7, "y": 2 }, 
+        { "w": 1, "x": 8, "y": 2 }, 
+        { "w": 1, "x": 9, "y": 2 }, 
+        { "w": 1, "x": 10, "y": 2 }, 
+        { "w": 1, "x": 11, "y": 2 }, 
+        { "w": 1, "x": 0, "y": 3 }, 
+        { "w": 1, "x": 1, "y": 3 }, 
+        { "w": 1, "x": 2, "y": 3 }, 
+        { "w": 1, "x": 3, "y": 3 }, 
+        { "w": 1, "x": 4, "y": 3 }, 
+        { "w": 1, "x": 5, "y": 3 }, 
+        { "w": 1, "x": 6, "y": 3 }, 
+        { "w": 1, "x": 7, "y": 3 }, 
+        { "w": 1, "x": 8, "y": 3 }, 
+        { "w": 1, "x": 9, "y": 3 }, 
+        { "w": 1, "x": 10, "y": 3 }, 
+        { "w": 1, "x": 11, "y": 3 },
+        { "w": 1, "x": 0, "y": 4 }, 
+        { "w": 1, "x": 1, "y": 4 }, 
+        { "w": 1, "x": 2, "y": 4 }, 
+        { "w": 1, "x": 3, "y": 4 }, 
+        { "w": 1, "x": 4, "y": 4 }, 
+        { "w": 1, "x": 5, "y": 4 }, 
+        { "w": 1, "x": 6, "y": 4 }, 
+        { "w": 1, "x": 7, "y": 4 }, 
+        { "w": 1, "x": 8, "y": 4 }, 
+        { "w": 1, "x": 9, "y": 4 }, 
+        { "w": 1, "x": 10, "y": 4 }, 
+        { "w": 1, "x": 11, "y": 4 } ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/keyboards/preonic/preonic.h b/keyboards/preonic/preonic.h
index c142825ba..aa1d93d84 100644
--- a/keyboards/preonic/preonic.h
+++ b/keyboards/preonic/preonic.h
@@ -3,7 +3,7 @@
 
 #include "quantum.h"
 
-#define PREONIC_MIT( \
+#define LAYOUT_preonic_mit( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
@@ -18,7 +18,7 @@
 	{ k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \
 }
 
-#define PREONIC_GRID( \
+#define LAYOUT_preonic_grid( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
@@ -33,7 +33,7 @@
 	{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \
 }
 
-#define KEYMAP PREONIC_MIT
-#define LAYOUT_ortho_5x12 PREONIC_GRID
+#define KEYMAP LAYOUT_preonic_mit
+#define LAYOUT_ortho_5x12 LAYOUT_preonic_grid
 
 #endif
diff --git a/keyboards/preonic/readme.md b/keyboards/preonic/readme.md
index 80f27c7f7..e116021fd 100644
--- a/keyboards/preonic/readme.md
+++ b/keyboards/preonic/readme.md
@@ -5,8 +5,8 @@ Preonic
 
 A compact 50% (12x5) ortholinear keyboard kit made and sold by OLKB and Massdrop. [More info on qmk.fm](http://qmk.fm/preonic/)
 
-Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert)
-Hardware Supported: Preonic PCB rev1, Teensy 2.0
+Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert)  
+Hardware Supported: Preonic PCB rev1, Teensy 2.0  
 Hardware Availability: [OLKB.com](https://olkb.com/preonic/), [Massdrop](https://www.massdrop.com/buy/preonic-mechanical-keyboard?mode=guest_open)
 
 Make example for this keyboard (after setting up your build environment):