Merge remote-tracking branch 'upstream/develop'

6 files changed, 66 insertions, 139 deletions

diff --git a/keyboards/a_dux/a_dux.c b/keyboards/a_dux/a_dux.c
index 16bac16fa9..16c3406f48 100644
--- a/keyboards/a_dux/a_dux.c
+++ b/keyboards/a_dux/a_dux.c
@@ -17,7 +17,7 @@
  * 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 "a_dux.h"
+#include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
 __attribute__ ((weak))
diff --git a/keyboards/a_dux/a_dux.h b/keyboards/a_dux/a_dux.h
deleted file mode 100644
index 83c0a3692b..0000000000
--- a/keyboards/a_dux/a_dux.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2018-2020 ENDO Katsuhiro <ka2hiro@curlybracket.co.jp> David Philip Barr <@davidphilipbarr> Pierre Chevalier <pierrechevalier83@gmail.com>
- *
- * 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 "quantum.h"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-// readability
-#define ___ KC_NO
-
-#define LAYOUT_split_3x5_2( \
-        L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, \
-        L06, L07, L08, L09, L10, R06, R07, R08, R09, R10, \
-        L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, \
-                       L16, L17, R16, R17                 \
-    ) \
-    { \
-        { L01, L02, L03, L04, L05 }, \
-        { L06, L07, L08, L09, L10 }, \
-        { L11, L12, L13, L14, L15 }, \
-        { L16, L17, ___, ___, ___ }, \
-        { R01, R02, R03, R04, R05 }, \
-        { R06, R07, R08, R09, R10 }, \
-        { R11, R12, R13, R14, R15 }, \
-        { R16, R17, ___, ___, ___ }  \
-    }
-
-#define LAYOUT LAYOUT_split_3x5_2
-
diff --git a/keyboards/a_dux/config.h b/keyboards/a_dux/config.h
index c7e3775028..b929e02b8f 100644
--- a/keyboards/a_dux/config.h
+++ b/keyboards/a_dux/config.h
@@ -16,57 +16,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "config_common.h"
-
-/* key matrix size */
-#define MATRIX_ROWS 8
-#define MATRIX_COLS 5
-
-/*
- * 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)
- *                  NO_DIODE = switches are directly connected to AVR pins
- *
-*/
-#define DIRECT_PINS { \
-    { C6, D2, F7, B2, F4 }, \
-    { D7, D0, F6, B3, F5 }, \
-    { E6, D4, D3, B1, B6 }, \
-    { B4, B5, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-#define DIRECT_PINS_RIGHT { \
-    { F4, B2, F7, D2, C6 }, \
-    { F5, B3, F6, D0, D7 }, \
-    { B6, B1, D3, D4, E6 }, \
-    { B5, B4, NO_PIN, NO_PIN, NO_PIN } \
-}
-
-
-
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D1
-
 #define EE_HANDS
-
-/* Top left key on left half */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
-/* Top right key on right half */
-#define BOOTMAGIC_LITE_ROW_RIGHT 4
-#define BOOTMAGIC_LITE_COLUMN_RIGHT 4
diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json
index 7b9a43822a..29259a180c 100644
--- a/keyboards/a_dux/info.json
+++ b/keyboards/a_dux/info.json
@@ -8,50 +8,80 @@
         "pid": "0x3939",
         "device_version": "0.0.1"
     },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",
+    "matrix_pins": {
+        "direct": [
+            ["C6", "D2", "F7", "B2", "F4"],
+            ["D7", "D0", "F6", "B3", "F5"],
+            ["E6", "D4", "D3", "B1", "B6"],
+            ["B4", "B5", null, null, null]
+        ]
+    },
+    "split": {
+        "soft_serial_pin": "D1",
+        "bootmagic": {
+            "matrix": [4, 4]
+        },
+        "matrix_pins": {
+            "right": {
+                "direct": [
+                    ["F4", "B2", "F7", "D2", "C6"],
+                    ["F5", "B3", "F6", "D0", "D7"],
+                    ["B6", "B1", "D3", "D4", "E6"],
+                    ["B5", "B4", null, null, null]
+                ]
+            }
+        }
+    },
+    "community_layouts": ["split_3x5_2"],
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_split_3x5_2"
+    },
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                {"x": 0, "y": 1.33},
-                {"x": 1, "y": 0.31},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0.28},
-                {"x": 4, "y": 0.42},
+                {"x": 0, "y": 1.33, "matrix": [0, 0]},
+                {"x": 1, "y": 0.31, "matrix": [0, 1]},
+                {"x": 2, "y": 0, "matrix": [0, 2]},
+                {"x": 3, "y": 0.28, "matrix": [0, 3]},
+                {"x": 4, "y": 0.42, "matrix": [0, 4]},
 
-                {"x": 8, "y": 0.42},
-                {"x": 9, "y": 0.28},
-                {"x": 10, "y": 0},
-                {"x": 11, "y": 0.31},
-                {"x": 12, "y": 1.33},
+                {"x": 8, "y": 0.42, "matrix": [4, 0]},
+                {"x": 9, "y": 0.28, "matrix": [4, 1]},
+                {"x": 10, "y": 0, "matrix": [4, 2]},
+                {"x": 11, "y": 0.31, "matrix": [4, 3]},
+                {"x": 12, "y": 1.33, "matrix": [4, 4]},
 
-                {"x": 0, "y": 2.33},
-                {"x": 1, "y": 1.31},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1.28},
-                {"x": 4, "y": 1.42},
+                {"x": 0, "y": 2.33, "matrix": [1, 0]},
+                {"x": 1, "y": 1.31, "matrix": [1, 1]},
+                {"x": 2, "y": 1, "matrix": [1, 2]},
+                {"x": 3, "y": 1.28, "matrix": [1, 3]},
+                {"x": 4, "y": 1.42, "matrix": [1, 4]},
 
-                {"x": 8, "y": 1.42},
-                {"x": 9, "y": 1.28},
-                {"x": 10, "y": 1},
-                {"x": 11, "y": 1.31},
-                {"x": 12, "y": 2.33},
+                {"x": 8, "y": 1.42, "matrix": [5, 0]},
+                {"x": 9, "y": 1.28, "matrix": [5, 1]},
+                {"x": 10, "y": 1, "matrix": [5, 2]},
+                {"x": 11, "y": 1.31, "matrix": [5, 3]},
+                {"x": 12, "y": 2.33, "matrix": [5, 4]},
 
-                {"x": 0, "y": 3.33},
-                {"x": 1, "y": 2.31},
-                {"x": 2, "y": 2},
-                {"x": 3, "y": 2.28},
-                {"x": 4, "y": 2.42},
+                {"x": 0, "y": 3.33, "matrix": [2, 0]},
+                {"x": 1, "y": 2.31, "matrix": [2, 1]},
+                {"x": 2, "y": 2, "matrix": [2, 2]},
+                {"x": 3, "y": 2.28, "matrix": [2, 3]},
+                {"x": 4, "y": 2.42, "matrix": [2, 4]},
 
-                {"x": 8, "y": 2.42},
-                {"x": 9, "y": 2.28},
-                {"x": 10, "y": 2},
-                {"x": 11, "y": 2.31},
-                {"x": 12, "y": 3.33},
+                {"x": 8, "y": 2.42, "matrix": [6, 0]},
+                {"x": 9, "y": 2.28, "matrix": [6, 1]},
+                {"x": 10, "y": 2, "matrix": [6, 2]},
+                {"x": 11, "y": 2.31, "matrix": [6, 3]},
+                {"x": 12, "y": 3.33, "matrix": [6, 4]},
 
-                {"x": 4, "y": 3.75},
-                {"x": 5, "y": 4},
+                {"x": 4, "y": 3.75, "matrix": [3, 0]},
+                {"x": 5, "y": 4, "matrix": [3, 1]},
 
-                {"x": 7, "y": 4},
-                {"x": 8, "y": 3.75}
+                {"x": 7, "y": 4, "matrix": [7, 0]},
+                {"x": 8, "y": 3.75, "matrix": [7, 1]}
             ]
         }
     }
diff --git a/keyboards/a_dux/keymaps/daliusd/keymap.c b/keyboards/a_dux/keymaps/daliusd/keymap.c
index 72f2417278..7dec77b01e 100644
--- a/keyboards/a_dux/keymaps/daliusd/keymap.c
+++ b/keyboards/a_dux/keymaps/daliusd/keymap.c
@@ -101,7 +101,7 @@ enum unicode_names {
     LT_CB,
 };
 
-const uint32_t PROGMEM unicode_map[] = {
+const uint32_t unicode_map[] PROGMEM = {
     [SNEK]  = 0x1F40D, // 🐍
     [EURO]  = 0x20ac, // €
     [LT_S_A] = 0x105, // ą
diff --git a/keyboards/a_dux/rules.mk b/keyboards/a_dux/rules.mk
index f4f3aaf382..935483d839 100644
--- a/keyboards/a_dux/rules.mk
+++ b/keyboards/a_dux/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
 # Build Options
 #   change yes to no to disable
 #
@@ -18,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 UNICODE_ENABLE = yes        # Unicode
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes        # Use shared split_common code
-LAYOUTS = split_3x5_2