Merge branch 'develop'

4 files changed, 97 insertions, 162 deletions

diff --git a/keyboards/handwired/zergo/config.h b/keyboards/handwired/zergo/config.h
deleted file mode 100644
index 63666aa09f..0000000000
--- a/keyboards/handwired/zergo/config.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright 2020 E.Zelianin
-
-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 */
-#define MATRIX_ROW_PINS { B1, D7, C3, D6, D5, D4 }
-#define MATRIX_COL_PINS { C7, C6, C5, C4, C2, C1, B7, D3, D2, B6, B5, B4, B3, B2 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/handwired/zergo/info.json b/keyboards/handwired/zergo/info.json
index 7b9776134c..56b1b8f0cd 100644
--- a/keyboards/handwired/zergo/info.json
+++ b/keyboards/handwired/zergo/info.json
@@ -1,99 +1,112 @@
 {
-    "keyboard_name": "zErgo", 
+    "keyboard_name": "zErgo",
     "manufacturer": "GreenJack",
-    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/zergo", 
-    "maintainer": "greenjack", 
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/zergo",
+    "maintainer": "greenjack",
     "usb": {
         "vid": "0xFEED",
         "pid": "0xB92B",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["C7", "C6", "C5", "C4", "C2", "C1", "B7", "D3", "D2", "B6", "B5", "B4", "B3", "B2"],
+        "rows": ["B1", "D7", "C3", "D6", "D5", "D4"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "at90usb1286",
     "bootloader": "halfkay",
     "layouts": {
         "LAYOUT": {
             "layout": [
-              {"label":"Esc", "x":0, "y":0},
-              {"label":"F1", "x":2, "y":0}, 
-              {"label":"F2", "x":3, "y":0}, 
-              {"label":"F3", "x":4, "y":0}, 
-              {"label":"F4", "x":5, "y":0}, 
-              {"label":"F5", "x":6.5, "y":0}, 
-              {"label":"F6", "x":7.5, "y":0}, 
-              {"label":"F7", "x":8.5, "y":0}, 
-              {"label":"F8", "x":9.5, "y":0}, 
-              {"label":"F9", "x":11, "y":0}, 
-              {"label":"F10", "x":12, "y":0}, 
-              {"label":"F11", "x":13, "y":0}, 
-              {"label":"F12", "x":14, "y":0}, 
-              {"label":"Del", "x":0, "y":1.25}, 
-              {"label":"`", "x":1, "y":1.25}, 
-              {"label":"1", "x":2, "y":1.25}, 
-              {"label":"2", "x":3, "y":1.25}, 
-              {"label":"3", "x":4, "y":1.25}, 
-              {"label":"4", "x":5, "y":1.25}, 
-              {"label":"5", "x":6, "y":1.25}, 
-              {"label":"6", "x":7, "y":1.25}, 
-              {"label":"7", "x":8, "y":1.25}, 
-              {"label":"8", "x":9, "y":1.25}, 
-              {"label":"9", "x":10, "y":1.25}, 
-              {"label":"0", "x":11, "y":1.25}, 
-              {"label":"-", "x":12, "y":1.25}, 
-              {"label":"=", "x":13, "y":1.25}, 
-              {"label":"Backspace", "x":14, "y":1.25}, 
-              {"label":"Tab", "x":0, "y":2.25, "w":1.5}, 
-              {"label":"Q", "x":1.5, "y":2.25}, 
-              {"label":"W", "x":2.5, "y":2.25}, 
-              {"label":"E", "x":3.5, "y":2.25}, 
-              {"label":"R", "x":4.5, "y":2.25}, 
-              {"label":"T", "x":5.5, "y":2.25}, 
-              {"label":"modifier", "x":6.5, "y":2.25}, 
-              {"label":"Y", "x":7.5, "y":2.25}, 
-              {"label":"U", "x":8.5, "y":2.25}, 
-              {"label":"I", "x":9.5, "y":2.25}, 
-              {"label":"O", "x":10.5, "y":2.25}, 
-              {"label":"P", "x":11.5, "y":2.25}, 
-              {"label":"{", "x":12.5, "y":2.25}, 
-              {"label":"|", "x":13.5, "y":2.25, "w":1.5}, 
-              {"label":"modifier", "x":0, "y":3.25, "w":1.25}, 
-              {"label":"A", "x":1.25, "y":3.25}, 
-              {"label":"S", "x":2.25, "y":3.25}, 
-              {"label":"D", "x":3.25, "y":3.25}, 
-              {"label":"F", "x":4.25, "y":3.25}, 
-              {"label":"G", "x":5.25, "y":3.25}, 
-              {"label":"H", "x":7.75, "y":3.25}, 
-              {"label":"J", "x":8.75, "y":3.25}, 
-              {"label":"K", "x":9.75, "y":3.25}, 
-              {"label":"L", "x":10.75, "y":3.25}, 
-              {"label":":", "x":11.75, "y":3.25}, 
-              {"label":"\"", "x":12.75, "y":3.25}, 
-              {"label":"modifier", "x":13.75, "y":3.25, "w":1.25}, 
-              {"label":"LShift", "x":0, "y":4.25}, 
-              {"label":"Z", "x":1, "y":4.25}, 
-              {"label":"X", "x":2, "y":4.25}, 
-              {"label":"C", "x":3, "y":4.25}, 
-              {"label":"V", "x":4, "y":4.25}, 
-              {"label":"B", "x":5, "y":4.25}, 
-              {"label":"Backspace", "x":6, "y":4.25, "w":2}, 
-              {"label":"N", "x":8, "y":4.25}, 
-              {"label":"M", "x":9, "y":4.25}, 
-              {"label":"<", "x":10, "y":4.25}, 
-              {"label":">", "x":11, "y":4.25}, 
-              {"label":"?", "x":12, "y":4.25}, 
-              {"label":"}", "x":13, "y":4.25}, 
-              {"label":"Rshift", "x":14, "y":4.25}, 
-              {"label":"LControl", "x":0, "y":5.25}, 
-              {"label":"free-1", "x":1, "y":5.25}, 
-              {"label":"free-2", "x":2, "y":5.25}, 
-              {"label":"LAlt", "x":3, "y":5.25, "w":1.25}, 
-              {"label":"Space", "x":4.25, "y":5.25, "w":2.25}, 
-              {"label":"Enter", "x":6.5, "y":5.25}, 
-              {"label":"Space", "x":7.5, "y":5.25, "w":2.75}, 
-              {"label":"RAlt", "x":10.25, "y":5.25, "w":1.25}, 
-              {"label":"Win", "x":11.5, "y":5.25, "w":1.25}, 
-              {"label":"Menu", "x":12.75, "y":5.25, "w":1.25}, 
-              {"label":"RControl", "x":14, "y":5.25}
-             ]
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
+
+                {"matrix": [0, 6], "x": 6.5, "y": 0},
+                {"matrix": [0, 7], "x": 7.5, "y": 0},
+                {"matrix": [0, 8], "x": 8.5, "y": 0},
+                {"matrix": [0, 9], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 10], "x": 11, "y": 0},
+                {"matrix": [0, 11], "x": 12, "y": 0},
+                {"matrix": [0, 12], "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 14, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+                {"matrix": [1, 5], "x": 5, "y": 1.25},
+                {"matrix": [2, 6], "x": 6, "y": 1.25},
+                {"matrix": [1, 6], "x": 7, "y": 1.25},
+                {"matrix": [1, 7], "x": 8, "y": 1.25},
+                {"matrix": [1, 8], "x": 9, "y": 1.25},
+                {"matrix": [1, 9], "x": 10, "y": 1.25},
+                {"matrix": [1, 10], "x": 11, "y": 1.25},
+                {"matrix": [1, 11], "x": 12, "y": 1.25},
+                {"matrix": [1, 12], "x": 13, "y": 1.25},
+                {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+                {"matrix": [3, 6], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+                {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.25},
+                {"matrix": [4, 1], "x": 1, "y": 4.25},
+                {"matrix": [4, 2], "x": 2, "y": 4.25},
+                {"matrix": [4, 3], "x": 3, "y": 4.25},
+                {"matrix": [4, 4], "x": 4, "y": 4.25},
+                {"matrix": [4, 5], "x": 5, "y": 4.25},
+                {"matrix": [4, 6], "x": 6, "y": 4.25, "w": 2},
+                {"matrix": [4, 7], "x": 8, "y": 4.25},
+                {"matrix": [4, 8], "x": 9, "y": 4.25},
+                {"matrix": [4, 9], "x": 10, "y": 4.25},
+                {"matrix": [4, 10], "x": 11, "y": 4.25},
+                {"matrix": [4, 11], "x": 12, "y": 4.25},
+                {"matrix": [4, 12], "x": 13, "y": 4.25},
+                {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.25},
+                {"matrix": [5, 1], "x": 1, "y": 5.25},
+                {"matrix": [5, 2], "x": 2, "y": 5.25},
+                {"matrix": [5, 3], "x": 3, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 5], "x": 4.25, "y": 5.25, "w": 2.25},
+                {"matrix": [5, 6], "x": 6.5, "y": 5.25},
+                {"matrix": [5, 7], "x": 7.5, "y": 5.25, "w": 2.75},
+                {"matrix": [5, 9], "x": 10.25, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25},
+                {"matrix": [5, 13], "x": 14, "y": 5.25}
+            ]
         }
     }
 }
diff --git a/keyboards/handwired/zergo/zergo.c b/keyboards/handwired/zergo/zergo.c
deleted file mode 100644
index 8b283d126c..0000000000
--- a/keyboards/handwired/zergo/zergo.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2020 E.Zelianin
- *
- * 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 "zergo.h"
diff --git a/keyboards/handwired/zergo/zergo.h b/keyboards/handwired/zergo/zergo.h
deleted file mode 100644
index ba6532164d..0000000000
--- a/keyboards/handwired/zergo/zergo.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 E.Zelianin
- *
- * 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 "quantum.h"
-
-#define LAYOUT( \
-	  K000,         K002,  K003,  K004,  K005, K006,  K007, K008, K009, K010, K011, K012, K013, \
-	  K100,  K101,  K102,  K103,  K104,  K105, K206,  K106, K107, K108, K109, K110, K111, K112, K113, \
-	  K200,  K201,  K202,  K203,  K204,  K205,        K306, K207, K208, K209, K210, K211, K212, K213, \
-	  K300,  K301,  K302,  K303,  K304,  K305,        K307, K308, K309, K310, K311, K312, K313, \
-	  K400,  K401,  K402,  K403,  K404,  K405, K406,  K407, K408, K409, K410, K411, K412, K413, \
-	  K500,  K501,  K502,  K503,         K505, K506,  K507,       K509, K510, K512, K513  \
-) { \
-	{ K000,  KC_NO, K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
-	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113 }, \
-	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213 }, \
-	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313 }, \
-	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413 }, \
-	{ K500,  K501,  K502,  K503,  KC_NO, K505,  K506,  K507,  KC_NO, K509,  K510,  KC_NO, K512,  K513 }  \
-}