Merge branch 'develop'

4 files changed, 88 insertions, 100 deletions

diff --git a/keyboards/handwired/videowriter/config.h b/keyboards/handwired/videowriter/config.h
index b519d82153..d1f1e1b0bf 100644
--- a/keyboards/handwired/videowriter/config.h
+++ b/keyboards/handwired/videowriter/config.h
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { D7, C6, D1, D0, D4, D2, D3, E6, B4, B5 }
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/handwired/videowriter/info.json b/keyboards/handwired/videowriter/info.json
index 329085fe85..14c33f399f 100644
--- a/keyboards/handwired/videowriter/info.json
+++ b/keyboards/handwired/videowriter/info.json
@@ -8,6 +8,11 @@
         "pid": "0x5657",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+        "rows": ["D7", "C6", "D1", "D0", "D4", "D2", "D3", "E6", "B4", "B5"]
+    },
+    "diode_direction": "COL2ROW",
     "bootmagic": {
         "matrix": [1, 7]
     },
@@ -16,13 +21,89 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"menu", "x":1, "y":1, "h":0.75}, {"label":"print", "x":2, "y":1, "h":0.75}, {"label":"spell", "x":3, "y":1, "h":0.75}, {"label":"page", "x":4.5, "y":1, "h":0.75}, {"label":"center", "x":5.5, "y":1, "h":0.75}, {"label":"split", "x":6.5, "y":1, "h":0.75}, {"label":"find", "x":7.5, "y":1, "h":0.75}, {"label":"copy", "x":9, "y":1, "h":0.75}, {"label":"move", "x":10, "y":1, "h":0.75}, {"label":"go to", "x":11, "y":1, "h":0.75},
-                {"label":"left", "x":13, "y":0.5}, {"label":"down", "x":14, "y":1}, {"label":"up", "x":14, "y":0}, {"label":"right", "x":15, "y":0.5},
-                {"label":"del", "x":0, "y":2.5}, {"label":"1", "x":1, "y":2.5}, {"label":"2", "x":2, "y":2.5}, {"label":"3", "x":3, "y":2.5}, {"label":"4", "x":4, "y":2.5}, {"label":"5", "x":5, "y":2.5}, {"label":"6", "x":6, "y":2.5}, {"label":"7", "x":7, "y":2.5}, {"label":"8", "x":8, "y":2.5}, {"label":"9", "x":9, "y":2.5}, {"label":"0", "x":10, "y":2.5}, {"label":"-", "x":11, "y":2.5}, {"label":"=", "x":12, "y":2.5}, {"label":"backspace", "x":13, "y":2.5, "w":1.5}, {"label":"do", "x":15, "y":2.5, "h":1.33},
-                {"label":"tab", "x":0, "y":3.5, "w":1.5}, {"label":"Q", "x":1.5, "y":3.5}, {"label":"W", "x":2.5, "y":3.5}, {"label":"E", "x":3.5, "y":3.5}, {"label":"R", "x":4.5, "y":3.5}, {"label":"T", "x":5.5, "y":3.5}, {"label":"Y", "x":6.5, "y":3.5}, {"label":"U", "x":7.5, "y":3.5}, {"label":"I", "x":8.5, "y":3.5}, {"label":"O", "x":9.5, "y":3.5}, {"label":"P", "x":10.5, "y":3.5}, {"label":"[", "x":11.5, "y":3.5}, {"label":"]", "x":12.5, "y":3.5}, {"label":"help", "x":15, "y":3.833, "h":1.33},
-                {"label":"caps lock", "x":0, "y":4.5, "w":1.75}, {"label":"A", "x":1.75, "y":4.5}, {"label":"S", "x":2.75, "y":4.5}, {"label":"D", "x":3.75, "y":4.5}, {"label":"F", "x":4.75, "y":4.5}, {"label":"G", "x":5.75, "y":4.5}, {"label":"H", "x":6.75, "y":4.5}, {"label":"J", "x":7.75, "y":4.5}, {"label":"K", "x":8.75, "y":4.5}, {"label":"L", "x":9.75, "y":4.5}, {"label":";", "x":10.75, "y":4.5}, {"label":"'", "x":11.75, "y":4.5}, {"label":"return", "x":12.75, "y":4.5, "w":1.75}, {"label":"undo", "x":15, "y":5.167, "h":1.33},
-                {"label":"shift", "x":0, "y":5.5, "w":2.25}, {"label":"Z", "x":2.25, "y":5.5}, {"label":"X", "x":3.25, "y":5.5}, {"label":"C", "x":4.25, "y":5.5}, {"label":"V", "x":5.25, "y":5.5}, {"label":"B", "x":6.25, "y":5.5}, {"label":"N", "x":7.25, "y":5.5}, {"label":"M", "x":8.25, "y":5.5}, {"label":"<", "x":9.25, "y":5.5}, {"label":">", "x":10.25, "y":5.5}, {"label":"?", "x":11.25, "y":5.5}, {"label":"shift", "x":12.25, "y":5.5, "w":2.25},
-                {"label":"style", "x":1.25, "y":6.5, "w":1.5}, {"label":"space", "x":2.75, "y":6.5, "w":9}, {"label":"insert", "x":11.75, "y":6.5, "w":1.5}
+                {"matrix": [1, 7], "x": 1, "y": 1, "h": 0.75},
+                {"matrix": [1, 6], "x": 2, "y": 1, "h": 0.75},
+                {"matrix": [1, 5], "x": 3, "y": 1, "h": 0.75},
+
+                {"matrix": [1, 4], "x": 4.5, "y": 1, "h": 0.75},
+                {"matrix": [1, 3], "x": 5.5, "y": 1, "h": 0.75},
+                {"matrix": [1, 2], "x": 6.5, "y": 1, "h": 0.75},
+                {"matrix": [1, 1], "x": 7.5, "y": 1, "h": 0.75},
+
+                {"matrix": [1, 0], "x": 9, "y": 1, "h": 0.75},
+                {"matrix": [2, 7], "x": 10, "y": 1, "h": 0.75},
+                {"matrix": [2, 6], "x": 11, "y": 1, "h": 0.75},
+
+                {"matrix": [8, 0], "x": 13, "y": 0.5},
+                {"matrix": [9, 7], "x": 14, "y": 1},
+                {"matrix": [8, 1], "x": 14, "y": 0},
+                {"matrix": [9, 6], "x": 15, "y": 0.5},
+
+                {"matrix": [2, 5], "x": 0, "y": 2.5},
+                {"matrix": [2, 4], "x": 1, "y": 2.5},
+                {"matrix": [2, 3], "x": 2, "y": 2.5},
+                {"matrix": [2, 2], "x": 3, "y": 2.5},
+                {"matrix": [2, 1], "x": 4, "y": 2.5},
+                {"matrix": [2, 0], "x": 5, "y": 2.5},
+                {"matrix": [3, 7], "x": 6, "y": 2.5},
+                {"matrix": [3, 6], "x": 7, "y": 2.5},
+                {"matrix": [3, 5], "x": 8, "y": 2.5},
+                {"matrix": [3, 4], "x": 9, "y": 2.5},
+                {"matrix": [3, 3], "x": 10, "y": 2.5},
+                {"matrix": [3, 2], "x": 11, "y": 2.5},
+                {"matrix": [3, 1], "x": 12, "y": 2.5},
+                {"matrix": [3, 0], "x": 13, "y": 2.5, "w": 1.5},
+
+                {"matrix": [9, 5], "x": 15, "y": 2.5, "h": 1.33},
+
+                {"matrix": [4, 7], "x": 0, "y": 3.5, "w": 1.5},
+                {"matrix": [4, 6], "x": 1.5, "y": 3.5},
+                {"matrix": [4, 5], "x": 2.5, "y": 3.5},
+                {"matrix": [4, 4], "x": 3.5, "y": 3.5},
+                {"matrix": [4, 3], "x": 4.5, "y": 3.5},
+                {"matrix": [4, 2], "x": 5.5, "y": 3.5},
+                {"matrix": [4, 1], "x": 6.5, "y": 3.5},
+                {"matrix": [4, 0], "x": 7.5, "y": 3.5},
+                {"matrix": [5, 7], "x": 8.5, "y": 3.5},
+                {"matrix": [5, 6], "x": 9.5, "y": 3.5},
+                {"matrix": [5, 5], "x": 10.5, "y": 3.5},
+                {"matrix": [5, 4], "x": 11.5, "y": 3.5},
+                {"matrix": [5, 3], "x": 12.5, "y": 3.5},
+
+                {"matrix": [9, 4], "x": 15, "y": 3.833, "h": 1.33},
+
+                {"matrix": [0, 7], "x": 0, "y": 4.5, "w": 1.75},
+                {"matrix": [5, 1], "x": 1.75, "y": 4.5},
+                {"matrix": [5, 0], "x": 2.75, "y": 4.5},
+                {"matrix": [6, 7], "x": 3.75, "y": 4.5},
+                {"matrix": [6, 6], "x": 4.75, "y": 4.5},
+                {"matrix": [6, 5], "x": 5.75, "y": 4.5},
+                {"matrix": [6, 4], "x": 6.75, "y": 4.5},
+                {"matrix": [6, 3], "x": 7.75, "y": 4.5},
+                {"matrix": [6, 2], "x": 8.75, "y": 4.5},
+                {"matrix": [6, 1], "x": 9.75, "y": 4.5},
+                {"matrix": [6, 0], "x": 10.75, "y": 4.5},
+                {"matrix": [7, 7], "x": 11.75, "y": 4.5},
+                {"matrix": [5, 2], "x": 12.75, "y": 4.5, "w": 1.75},
+
+                {"matrix": [9, 3], "x": 15, "y": 5.167, "h": 1.33},
+
+                {"matrix": [0, 6], "x": 0, "y": 5.5, "w": 2.25},
+                {"matrix": [7, 6], "x": 2.25, "y": 5.5},
+                {"matrix": [7, 5], "x": 3.25, "y": 5.5},
+                {"matrix": [7, 4], "x": 4.25, "y": 5.5},
+                {"matrix": [7, 3], "x": 5.25, "y": 5.5},
+                {"matrix": [7, 2], "x": 6.25, "y": 5.5},
+                {"matrix": [7, 1], "x": 7.25, "y": 5.5},
+                {"matrix": [7, 0], "x": 8.25, "y": 5.5},
+                {"matrix": [8, 7], "x": 9.25, "y": 5.5},
+                {"matrix": [8, 6], "x": 10.25, "y": 5.5},
+                {"matrix": [8, 5], "x": 11.25, "y": 5.5},
+                {"matrix": [9, 2], "x": 12.25, "y": 5.5, "w": 2.25},
+
+                {"matrix": [8, 4], "x": 1.25, "y": 6.5, "w": 1.5},
+                {"matrix": [8, 3], "x": 2.75, "y": 6.5, "w": 9},
+                {"matrix": [8, 2], "x": 11.75, "y": 6.5, "w": 1.5}
             ]
         }
     }
diff --git a/keyboards/handwired/videowriter/videowriter.c b/keyboards/handwired/videowriter/videowriter.c
deleted file mode 100644
index 5f0f3d7122..0000000000
--- a/keyboards/handwired/videowriter/videowriter.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2019 DmNosachev
- *
- * 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 "videowriter.h"
diff --git a/keyboards/handwired/videowriter/videowriter.h b/keyboards/handwired/videowriter/videowriter.h
deleted file mode 100644
index f06a5d50aa..0000000000
--- a/keyboards/handwired/videowriter/videowriter.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright 2019 DmNosachev
- *
- * 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 XXX KC_NO
-
-/* 
- * ,---------------------------------------------------------------------------------------.
- * |   ,----------------.  ,-----------------------.  ,--------------.          | up |     |
- * |   |menu|print|spell|  |page|center|split|find |  |copy|move|goto|     |left|down|right|
- * |---------------------------------------------------------------------------------------|
- * |del|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  = |   BSp| do  |
- * |---------------------------------------------------------------------------------------|
- * |Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   | help|
- * |-----------------------------------------------------------------------------'   |-----|
- * |Caps  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  "  | return | undo|
- * |---------------------------------------------------------------------------------------|
- * |  Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  <  |  >  |  ?  |   Shift   |     |
- * '---------------------------------------------------------------------------------------'
- *        | style|                     Space                         | insert|             
- *        '------------------------------------------------------------------'
- */
- 
-#define LAYOUT( \
-	K17, K16, K15,      K14, K13, K12, K11,    K10, K27, K26,   K80, K97, K81, K96, \
-	K25, K24, K23, K22, K21, K20, K37, K36, K35, K34, K33, K32, K31, K30, K95, \
-	K47, K46, K45, K44, K43, K42, K41, K40, K57, K56, K55, K54, K53,      K94, \
-	K07, K51, K50, K67, K66, K65, K64, K63, K62, K61, K60, K77,      K52, K93, \
-	K06, K76, K75, K74, K73, K72, K71, K70, K87, K86, K85, K92, \
-	K84,                     K83,                          K82 \
-) \
-{ \
-	{ XXX, XXX, XXX, XXX, XXX, XXX, K06, K07 }, \
-	{ K10, K11, K12, K13, K14, K15, K16, K17 }, \
-	{ K20, K21, K22, K23, K24, K25, K26, K27 }, \
-	{ K30, K31, K32, K33, K34, K35, K36, K37 }, \
-	{ K40, K41, K42, K43, K44, K45, K46, K47 }, \
-	{ K50, K51, K52, K53, K54, K55, K56, K57 }, \
-	{ K60, K61, K62, K63, K64, K65, K66, K67 }, \
-	{ K70, K71, K72, K73, K74, K75, K76, K77 }, \
-	{ K80, K81, K82, K83, K84, K85, K86, K87 }, \
-	{ XXX, XXX, K92, K93, K94, K95, K96, K97 }  \
-}