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

8 files changed, 103 insertions, 197 deletions

diff --git a/keyboards/boardsource/4x12/4x12.c b/keyboards/boardsource/4x12/4x12.c
deleted file mode 100644
index 2aec6900ad..0000000000
--- a/keyboards/boardsource/4x12/4x12.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "4x12.h"
diff --git a/keyboards/boardsource/4x12/4x12.h b/keyboards/boardsource/4x12/4x12.h
deleted file mode 100644
index 52c23708fa..0000000000
--- a/keyboards/boardsource/4x12/4x12.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-#include "quantum.h"
-
-#define LAYOUT_ortho_4x12( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, \
-    K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \
-    K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, \
-    K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47 \
-    ) { \
-        {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11}, \
-        {K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23}, \
-        {K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35}, \
-        {K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47} \
-    }
diff --git a/keyboards/boardsource/4x12/config.h b/keyboards/boardsource/4x12/config.h
deleted file mode 100644
index 4df24944f8..0000000000
--- a/keyboards/boardsource/4x12/config.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0x4273 // "Bs" - Boardsource
-#define PRODUCT_ID      0x0412
-#define DEVICE_VER      0x0000
-#define MANUFACTURER    Boardsource
-#define PRODUCT         4x12
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 12
-#define MATRIX_ROW_PINS { D2, D3, D1, D0}
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5, B4, E6, D7 }
-
-#define DIODE_DIRECTION COL2ROW
-
-/* 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
-
-/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
- */
-// #define GRAVE_ESC_CTRL_OVERRIDE
-
-/*
- * Force NKRO
- *
- * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
- * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
- * makefile for this to work.)
- *
- * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
- * until the next keyboard reset.
- *
- * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
- * fully operational during normal computer usage.
- *
- * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
- * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
- * bootmagic, NKRO mode will always be enabled until it is toggled again during a
- * power-up.
- *
- */
-//#define FORCE_NKRO
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/boardsource/4x12/info.json b/keyboards/boardsource/4x12/info.json
index bb4acbbfe8..ec956ea6d7 100644
--- a/keyboards/boardsource/4x12/info.json
+++ b/keyboards/boardsource/4x12/info.json
@@ -1,62 +1,79 @@
 {
-    "keyboard_name": "Boardsource 4x12",
-    "url": "https://boardsource.xyz",
-    "maintainer": "Boardsource",
-    "layouts": {
-        "LAYOUT_ortho_4x12": {
-            "layout": [
-                { "label": "K01", "x": 0, "y": 0 },
-                { "label": "K02", "x": 1, "y": 0 },
-                { "label": "K03", "x": 2, "y": 0 },
-                { "label": "K04", "x": 3, "y": 0 },
-                { "label": "K05", "x": 4, "y": 0 },
-                { "label": "K06", "x": 5, "y": 0 },
-                { "label": "K07", "x": 6, "y": 0 },
-                { "label": "K08", "x": 7, "y": 0 },
-                { "label": "K09", "x": 8, "y": 0 },
-                { "label": "K010", "x": 9, "y": 0 },
-                { "label": "K011", "x": 10, "y": 0 },
-                { "label": "K012", "x": 11, "y": 0 },
-
-                { "label": "K11", "x": 0, "y": 1 },
-                { "label": "K12", "x": 1, "y": 1 },
-                { "label": "K13", "x": 2, "y": 1 },
-                { "label": "K14", "x": 3, "y": 1 },
-                { "label": "K15", "x": 4, "y": 1 },
-                { "label": "K16", "x": 5, "y": 1 },
-                { "label": "K17", "x": 6, "y": 1 },
-                { "label": "K18", "x": 7, "y": 1 },
-                { "label": "K19", "x": 8, "y": 1 },
-                { "label": "K110", "x": 9, "y": 1 },
-                { "label": "K111", "x": 10, "y": 1 },
-                { "label": "K112", "x": 11, "y": 1 },
-
-                { "label": "K21", "x": 0, "y": 2 },
-                { "label": "K22", "x": 1, "y": 2 },
-                { "label": "K23", "x": 2, "y": 2 },
-                { "label": "K24", "x": 3, "y": 2 },
-                { "label": "K25", "x": 4, "y": 2 },
-                { "label": "K26", "x": 5, "y": 2 },
-                { "label": "K27", "x": 6, "y": 2 },
-                { "label": "K28", "x": 7, "y": 2 },
-                { "label": "K29", "x": 8, "y": 2 },
-                { "label": "K210", "x": 9, "y": 2 },
-                { "label": "K211", "x": 10, "y": 2 },
-                { "label": "K212", "x": 11, "y": 2 },
-
-                { "label": "K31", "x": 0, "y": 3 },
-                { "label": "K32", "x": 1, "y": 3 },
-                { "label": "K33", "x": 2, "y": 3 },
-                { "label": "K34", "x": 3, "y": 3 },
-                { "label": "K35", "x": 4, "y": 3 },
-                { "label": "K36", "x": 5, "y": 3 },
-                { "label": "K37", "x": 6, "y": 3 },
-                { "label": "K38", "x": 7, "y": 3 },
-                { "label": "K39", "x": 8, "y": 3 },
-                { "label": "K310", "x": 9, "y": 3 },
-                { "label": "K311", "x": 10, "y": 3 },
-                { "label": "K312", "x": 11, "y": 3 }
-            ]
-        }
+  "manufacturer": "Boardsource",
+  "keyboard_name": "4x12",
+  "maintainer": "waffle87",
+  "development_board": "promicro",
+  "diode_direction": "COL2ROW",
+  "features": {
+    "bootmagic": true,
+    "extrakey": true,
+    "mousekey": true
+  },
+  "matrix_pins": {
+    "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7"],
+    "rows": ["D2", "D3", "D1", "D0"]
+  },
+  "url": "https://boardsource.xyz/store/5ecb78d286879c9a0c22dafd",
+  "usb": {
+    "device_version": "1.0.0",
+    "pid": "0x0412",
+    "vid": "0x4273"
+  },
+  "community_layouts": [
+    "ortho_4x12"
+  ],
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [
+        { "matrix": [0, 0], "x": 0, "y": 0 },
+        { "matrix": [0, 1], "x": 1, "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, "y": 0 },
+        { "matrix": [0, 7], "x": 7, "y": 0 },
+        { "matrix": [0, 8], "x": 8, "y": 0 },
+        { "matrix": [0, 9], "x": 9, "y": 0 },
+        { "matrix": [0, 10], "x": 10, "y": 0 },
+        { "matrix": [0, 11], "x": 11, "y": 0 },
+        { "matrix": [1, 0], "x": 0, "y": 1 },
+        { "matrix": [1, 1], "x": 1, "y": 1 },
+        { "matrix": [1, 2], "x": 2, "y": 1 },
+        { "matrix": [1, 3], "x": 3, "y": 1 },
+        { "matrix": [1, 4], "x": 4, "y": 1 },
+        { "matrix": [1, 5], "x": 5, "y": 1 },
+        { "matrix": [1, 6], "x": 6, "y": 1 },
+        { "matrix": [1, 7], "x": 7, "y": 1 },
+        { "matrix": [1, 8], "x": 8, "y": 1 },
+        { "matrix": [1, 9], "x": 9, "y": 1 },
+        { "matrix": [1, 10], "x": 10, "y": 1 },
+        { "matrix": [1, 11], "x": 11, "y": 1 },
+        { "matrix": [2, 0], "x": 0, "y": 2 },
+        { "matrix": [2, 1], "x": 1, "y": 2 },
+        { "matrix": [2, 2], "x": 2, "y": 2 },
+        { "matrix": [2, 3], "x": 3, "y": 2 },
+        { "matrix": [2, 4], "x": 4, "y": 2 },
+        { "matrix": [2, 5], "x": 5, "y": 2 },
+        { "matrix": [2, 6], "x": 6, "y": 2 },
+        { "matrix": [2, 7], "x": 7, "y": 2 },
+        { "matrix": [2, 8], "x": 8, "y": 2 },
+        { "matrix": [2, 9], "x": 9, "y": 2 },
+        { "matrix": [2, 10], "x": 10, "y": 2 },
+        { "matrix": [2, 11], "x": 11, "y": 2 },
+        { "matrix": [3, 0], "x": 0, "y": 3 },
+        { "matrix": [3, 1], "x": 1, "y": 3 },
+        { "matrix": [3, 2], "x": 2, "y": 3 },
+        { "matrix": [3, 3], "x": 3, "y": 3 },
+        { "matrix": [3, 4], "x": 4, "y": 3 },
+        { "matrix": [3, 5], "x": 5, "y": 3 },
+        { "matrix": [3, 6], "x": 6, "y": 3 },
+        { "matrix": [3, 7], "x": 7, "y": 3 },
+        { "matrix": [3, 8], "x": 8, "y": 3 },
+        { "matrix": [3, 9], "x": 9, "y": 3 },
+        { "matrix": [3, 10], "x": 10, "y": 3 },
+        { "matrix": [3, 11], "x": 11, "y": 3 }
+      ]
     }
+  }
 }
diff --git a/keyboards/boardsource/4x12/keymaps/default/keymap.c b/keyboards/boardsource/4x12/keymaps/default/keymap.c
index 17823f36c9..bb192c613d 100644
--- a/keyboards/boardsource/4x12/keymaps/default/keymap.c
+++ b/keyboards/boardsource/4x12/keymaps/default/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 @waffle87
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include QMK_KEYBOARD_H
 
 enum layers {
@@ -6,31 +8,26 @@ enum layers {
     _LOWER,
 };
 
-// Readability keycodes
 #define LOWER   MO(_LOWER)
 #define RAISE   MO(_RAISE)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
   [_MAIN] = LAYOUT_ortho_4x12(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
     KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
   ),
-
   [_RAISE] = LAYOUT_ortho_4x12(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
   ),
-
   [_LOWER] = LAYOUT_ortho_4x12(
- KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
- KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
- _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
   )
-
 };
diff --git a/keyboards/boardsource/4x12/keymaps/via/keymap.c b/keyboards/boardsource/4x12/keymaps/via/keymap.c
index 17823f36c9..b6e26fbeca 100644
--- a/keyboards/boardsource/4x12/keymaps/via/keymap.c
+++ b/keyboards/boardsource/4x12/keymaps/via/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2022 @gwillad
+// SPDX-License-Identifier: GPL-2.0-or-later
 #include QMK_KEYBOARD_H
 
 enum layers {
@@ -6,31 +8,32 @@ enum layers {
     _LOWER,
 };
 
-// Readability keycodes
 #define LOWER   MO(_LOWER)
 #define RAISE   MO(_RAISE)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
   [_MAIN] = LAYOUT_ortho_4x12(
     KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
     KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
     KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
     KC_PIPE, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
   ),
-
   [_RAISE] = LAYOUT_ortho_4x12(
-  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-  QK_BOOT,   _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+    QK_BOOT,   _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
   ),
-
   [_LOWER] = LAYOUT_ortho_4x12(
- KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
- KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
- _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+  ),
+  [4] = LAYOUT_ortho_4x12(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
   )
-
 };
diff --git a/keyboards/boardsource/4x12/keymaps/via/readme.md b/keyboards/boardsource/4x12/keymaps/via/readme.md
deleted file mode 100644
index 534633d45e..0000000000
--- a/keyboards/boardsource/4x12/keymaps/via/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# The via keymap for boardsource 4x12 ortholinear keybaoard
-
-This folder contains the [VIA](https://caniusevia.com/) configuration for the boardsource 4x12 ortholinear keybaoard
-
-Maintained by: [gwillad](https://github.com/gwillad)
diff --git a/keyboards/boardsource/4x12/rules.mk b/keyboards/boardsource/4x12/rules.mk
index 061f93abf6..6e7633bfe0 100644
--- a/keyboards/boardsource/4x12/rules.mk
+++ b/keyboards/boardsource/4x12/rules.mk
@@ -1,24 +1 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# 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 = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
-NKRO_ENABLE = no            # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-AUDIO_ENABLE = no           # Audio output
-
-LAYOUTS = ortho_4x12
-
-# Disable unsupported hardware
-RGBLIGHT_SUPPORTED = no
-AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no
+# This file intentionally left blank