Merge remote-tracking branch 'origin/master' into develop

4 files changed, 54 insertions, 94 deletions

diff --git a/keyboards/a_dux/a_dux.c b/keyboards/a_dux/a_dux.c
index 16c3406f48..e4d831f914 100644
--- a/keyboards/a_dux/a_dux.c
+++ b/keyboards/a_dux/a_dux.c
@@ -1,22 +1,9 @@
-/* Copyright 2018-2020
- * ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
- * David Philip Barr <@davidphilipbarr>
- * Pierre Chevalier <pierrechevalier83@gmail.com>
- * @filterpaper
- *
- * 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/>.
- */
+// Copyright 2018-2020
+// ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
+// David Philip Barr <@davidphilipbarr>
+// Pierre Chevalier <pierrechevalier83@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
+
 #include "quantum.h"
 
 #ifdef SWAP_HANDS_ENABLE
diff --git a/keyboards/a_dux/config.h b/keyboards/a_dux/config.h
index b929e02b8f..35cf8d4151 100644
--- a/keyboards/a_dux/config.h
+++ b/keyboards/a_dux/config.h
@@ -1,25 +1,9 @@
-/* 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/>.
-*/
+// Copyright 2018-2020
+// ENDO Katsuhiro <ka2hiro@curlybracket.co.jp>
+// David Philip Barr <@davidphilipbarr>
+// Pierre Chevalier <pierrechevalier83@gmail.com>
+// SPDX-License-Identifier: GPL-2.0+
 
 #pragma once
 
-/* 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
-
 #define EE_HANDS
diff --git a/keyboards/a_dux/info.json b/keyboards/a_dux/info.json
index 29259a180c..7392adda0b 100644
--- a/keyboards/a_dux/info.json
+++ b/keyboards/a_dux/info.json
@@ -8,8 +8,13 @@
         "pid": "0x3939",
         "device_version": "0.0.1"
     },
-    "processor": "atmega32u4",
-    "bootloader": "atmel-dfu",
+    "development_board": "promicro",
+    "features": {
+        "bootmagic": true,
+        "extrakey": true,
+        "mousekey": true,
+        "unicode": true
+    },
     "matrix_pins": {
         "direct": [
             ["C6", "D2", "F7", "B2", "F4"],
@@ -19,6 +24,7 @@
         ]
     },
     "split": {
+        "enabled": true,
         "soft_serial_pin": "D1",
         "bootmagic": {
             "matrix": [4, 4]
@@ -41,47 +47,43 @@
     "layouts": {
         "LAYOUT_split_3x5_2": {
             "layout": [
-                {"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, "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, "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, "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, "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]},
+                { "label": "L01", "matrix": [0, 0], "x": 0, "y": 1.33 },
+                { "label": "L02", "matrix": [0, 1], "x": 1, "y": 0.31 },
+                { "label": "L03", "matrix": [0, 2], "x": 2, "y": 0 },
+                { "label": "L04", "matrix": [0, 3], "x": 3, "y": 0.28 },
+                { "label": "L05", "matrix": [0, 4], "x": 4, "y": 0.42 },
+                { "label": "R01", "matrix": [4, 0], "x": 8, "y": 0.42 },
+                { "label": "R02", "matrix": [4, 1], "x": 9, "y": 0.28 },
+                { "label": "R03", "matrix": [4, 2], "x": 10, "y": 0 },
+                { "label": "R04", "matrix": [4, 3], "x": 11, "y": 0.31 },
+                { "label": "R05", "matrix": [4, 4], "x": 12, "y": 1.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]},
+                { "label": "L06", "matrix": [1, 0], "x": 0, "y": 2.33 },
+                { "label": "L07", "matrix": [1, 1], "x": 1, "y": 1.31 },
+                { "label": "L08", "matrix": [1, 2], "x": 2, "y": 1 },
+                { "label": "L09", "matrix": [1, 3], "x": 3, "y": 1.28 },
+                { "label": "L10", "matrix": [1, 4], "x": 4, "y": 1.42 },
+                { "label": "R06", "matrix": [5, 0], "x": 8, "y": 1.42 },
+                { "label": "R07", "matrix": [5, 1], "x": 9, "y": 1.28 },
+                { "label": "R08", "matrix": [5, 2], "x": 10, "y": 1 },
+                { "label": "R09", "matrix": [5, 3], "x": 11, "y": 1.31 },
+                { "label": "R10", "matrix": [5, 4], "x": 12, "y": 2.33 },
 
-                {"x": 4, "y": 3.75, "matrix": [3, 0]},
-                {"x": 5, "y": 4, "matrix": [3, 1]},
+                { "label": "L11", "matrix": [2, 0], "x": 0, "y": 3.33 },
+                { "label": "L12", "matrix": [2, 1], "x": 1, "y": 2.31 },
+                { "label": "L13", "matrix": [2, 2], "x": 2, "y": 2 },
+                { "label": "L14", "matrix": [2, 3], "x": 3, "y": 2.28 },
+                { "label": "L15", "matrix": [2, 4], "x": 4, "y": 2.42 },
+                { "label": "R11", "matrix": [6, 0], "x": 8, "y": 2.42 },
+                { "label": "R12", "matrix": [6, 1], "x": 9, "y": 2.28 },
+                { "label": "R13", "matrix": [6, 2], "x": 10, "y": 2 },
+                { "label": "R14", "matrix": [6, 3], "x": 11, "y": 2.31 },
+                { "label": "R15", "matrix": [6, 4], "x": 12, "y": 3.33 },
 
-                {"x": 7, "y": 4, "matrix": [7, 0]},
-                {"x": 8, "y": 3.75, "matrix": [7, 1]}
+                { "label": "L16", "matrix": [3, 0], "x": 4, "y": 3.75 },
+                { "label": "L17", "matrix": [3, 1], "x": 5, "y": 4 },
+                { "label": "R16", "matrix": [7, 0], "x": 7, "y": 4 },
+                { "label": "R17", "matrix": [7, 1], "x": 8, "y": 3.75 }
             ]
         }
     }
diff --git a/keyboards/a_dux/rules.mk b/keyboards/a_dux/rules.mk
index 935483d839..6e7633bfe0 100644
--- a/keyboards/a_dux/rules.mk
+++ b/keyboards/a_dux/rules.mk
@@ -1,14 +1 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-UNICODE_ENABLE = yes        # Unicode
-AUDIO_ENABLE = no           # Audio output
-SPLIT_KEYBOARD = yes        # Use shared split_common code
+# This file intentionally left blank