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

4 files changed, 82 insertions, 83 deletions

diff --git a/keyboards/bastardkb/tbk/config.h b/keyboards/bastardkb/tbk/config.h
index b6bb634121..213cfebf89 100644
--- a/keyboards/bastardkb/tbk/config.h
+++ b/keyboards/bastardkb/tbk/config.h
@@ -16,7 +16,6 @@
  */
 
 #pragma once
-#include "config_common.h"
 
 #define MATRIX_ROWS 10
 #define MATRIX_COLS 6
diff --git a/keyboards/bastardkb/tbk/info.json b/keyboards/bastardkb/tbk/info.json
index d25ccd5cf6..9529c1305b 100644
--- a/keyboards/bastardkb/tbk/info.json
+++ b/keyboards/bastardkb/tbk/info.json
@@ -2,70 +2,70 @@
     "keyboard_name": "The Bastard Keyboard",
     "url": "https://bastardkb.com/",
     "usb": {
-        "pid": "0x1828",
-        "device_version": "0.0.1"
+        "device_version": "0.0.1",
+        "pid": "0x1828"
     },
     "layouts": {
         "LAYOUT_split_4x6_5": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"R05", "x":16, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"R15", "x":16, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"R25", "x":16, "y":2},
-                {"label":"L30", "x":0, "y":3},
-                {"label":"L31", "x":1, "y":3},
-                {"label":"L32", "x":2, "y":3},
-                {"label":"L33", "x":3, "y":3},
-                {"label":"L34", "x":4, "y":3},
-                {"label":"L35", "x":5, "y":3},
-                {"label":"R30", "x":11, "y":3},
-                {"label":"R31", "x":12, "y":3},
-                {"label":"R32", "x":13, "y":3},
-                {"label":"R33", "x":14, "y":3},
-                {"label":"R34", "x":15, "y":3},
-                {"label":"R35", "x":16, "y":3},
-                {"label":"L43", "x":5, "y":4},
-                {"label":"L44", "x":6, "y":4},
-                {"label":"L45", "x":7, "y":4},
-                {"label":"R40", "x":9, "y":4},
-                {"label":"R41", "x":10, "y":4},
-                {"label":"R40", "x":11, "y":4},
-                {"label":"L52", "x":6, "y":5},
-                {"label":"L53", "x":7, "y":5},
-                {"label":"R52", "x":9, "y":5},
-                {"label":"R53", "x":10, "y":5}
+                { "label": "L00", "x": 0, "y": 0 },
+                { "label": "L01", "x": 1, "y": 0 },
+                { "label": "L02", "x": 2, "y": 0 },
+                { "label": "L03", "x": 3, "y": 0 },
+                { "label": "L04", "x": 4, "y": 0 },
+                { "label": "L05", "x": 5, "y": 0 },
+                { "label": "R00", "x": 11, "y": 0 },
+                { "label": "R01", "x": 12, "y": 0 },
+                { "label": "R02", "x": 13, "y": 0 },
+                { "label": "R03", "x": 14, "y": 0 },
+                { "label": "R04", "x": 15, "y": 0 },
+                { "label": "R05", "x": 16, "y": 0 },
+                { "label": "L10", "x": 0, "y": 1 },
+                { "label": "L11", "x": 1, "y": 1 },
+                { "label": "L12", "x": 2, "y": 1 },
+                { "label": "L13", "x": 3, "y": 1 },
+                { "label": "L14", "x": 4, "y": 1 },
+                { "label": "L15", "x": 5, "y": 1 },
+                { "label": "R10", "x": 11, "y": 1 },
+                { "label": "R11", "x": 12, "y": 1 },
+                { "label": "R12", "x": 13, "y": 1 },
+                { "label": "R13", "x": 14, "y": 1 },
+                { "label": "R14", "x": 15, "y": 1 },
+                { "label": "R15", "x": 16, "y": 1 },
+                { "label": "L20", "x": 0, "y": 2 },
+                { "label": "L21", "x": 1, "y": 2 },
+                { "label": "L22", "x": 2, "y": 2 },
+                { "label": "L23", "x": 3, "y": 2 },
+                { "label": "L24", "x": 4, "y": 2 },
+                { "label": "L25", "x": 5, "y": 2 },
+                { "label": "R20", "x": 11, "y": 2 },
+                { "label": "R21", "x": 12, "y": 2 },
+                { "label": "R22", "x": 13, "y": 2 },
+                { "label": "R23", "x": 14, "y": 2 },
+                { "label": "R24", "x": 15, "y": 2 },
+                { "label": "R25", "x": 16, "y": 2 },
+                { "label": "L30", "x": 0, "y": 3 },
+                { "label": "L31", "x": 1, "y": 3 },
+                { "label": "L32", "x": 2, "y": 3 },
+                { "label": "L33", "x": 3, "y": 3 },
+                { "label": "L34", "x": 4, "y": 3 },
+                { "label": "L35", "x": 5, "y": 3 },
+                { "label": "R30", "x": 11, "y": 3 },
+                { "label": "R31", "x": 12, "y": 3 },
+                { "label": "R32", "x": 13, "y": 3 },
+                { "label": "R33", "x": 14, "y": 3 },
+                { "label": "R34", "x": 15, "y": 3 },
+                { "label": "R35", "x": 16, "y": 3 },
+                { "label": "L43", "x": 5, "y": 4 },
+                { "label": "L44", "x": 6, "y": 4 },
+                { "label": "L45", "x": 7, "y": 4 },
+                { "label": "R40", "x": 9, "y": 4 },
+                { "label": "R41", "x": 10, "y": 4 },
+                { "label": "R40", "x": 11, "y": 4 },
+                { "label": "L52", "x": 6, "y": 5 },
+                { "label": "L53", "x": 7, "y": 5 },
+                { "label": "R52", "x": 9, "y": 5 },
+                { "label": "R53", "x": 10, "y": 5 }
             ]
         }
     }
diff --git a/keyboards/bastardkb/tbk/tbk.c b/keyboards/bastardkb/tbk/tbk.c
index dabfcf35c7..4cebec2a54 100644
--- a/keyboards/bastardkb/tbk/tbk.c
+++ b/keyboards/bastardkb/tbk/tbk.c
@@ -1,4 +1,4 @@
-/* 
+/**
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/keyboards/bastardkb/tbk/tbk.h b/keyboards/bastardkb/tbk/tbk.h
index 196982952f..3f9cd9915d 100644
--- a/keyboards/bastardkb/tbk/tbk.h
+++ b/keyboards/bastardkb/tbk/tbk.h
@@ -1,4 +1,4 @@
-/* 
+/**
  * Copyright 2021 Quentin LEBASTARD <qlebastard@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -17,26 +17,26 @@
 
 
 #pragma once
-#include "quantum.h"
 
-// SWITCHED 91 and 95 - check on left ?
+// clang-format off
 #define LAYOUT_split_4x6_5( \
-	k00, k01, k02, k03, k04, k05,			k55, k54, k53, k52, k51, k50, \
-	k10, k11, k12, k13, k14, k15,			k65, k64, k63, k62, k61, k60, \
-	k20, k21, k22, k23, k24, k25,			k75, k74, k73, k72, k71, k70, \
-	k30, k31, k32, k33, k34, k35,			k85, k84, k83, k82, k81, k80, \
-		       k43, k44, k41,		        k91, k94, k93, \
-		            k45, k42,                   k92, k95 \
-)\
-{\
-	{ k00, k01, k02, k03, k04, k05 }, \
-	{ k10, k11, k12, k13, k14, k15 }, \
-	{ k20, k21, k22, k23, k24, k25 }, \
-	{ k30, k31, k32, k33, k34, k35 }, \
-	{ KC_NO, k41, k42, k43, k44, k45 }, \
-	{ k50, k51, k52, k53, k54, k55 }, \
-	{ k60, k61, k62, k63, k64, k65 }, \
-	{ k70, k71, k72, k73, k74, k75 }, \
-	{ k80, k81, k82, k83, k84, k85 }, \
-	{ KC_NO, k91, k92, k93, k94, k95 }, \
+    k00, k01, k02, k03, k04, k05,            k55, k54, k53, k52, k51, k50, \
+    k10, k11, k12, k13, k14, k15,            k65, k64, k63, k62, k61, k60, \
+    k20, k21, k22, k23, k24, k25,            k75, k74, k73, k72, k71, k70, \
+    k30, k31, k32, k33, k34, k35,            k85, k84, k83, k82, k81, k80, \
+                   k43, k44, k41,            k91, k94, k93, \
+                        k45, k42,            k92, k95 \
+) \
+{ \
+    {   k00, k01, k02, k03, k04, k05 }, \
+    {   k10, k11, k12, k13, k14, k15 }, \
+    {   k20, k21, k22, k23, k24, k25 }, \
+    {   k30, k31, k32, k33, k34, k35 }, \
+    { KC_NO, k41, k42, k43, k44, k45 }, \
+    {   k50, k51, k52, k53, k54, k55 }, \
+    {   k60, k61, k62, k63, k64, k65 }, \
+    {   k70, k71, k72, k73, k74, k75 }, \
+    {   k80, k81, k82, k83, k84, k85 }, \
+    { KC_NO, k91, k92, k93, k94, k95 }, \
 }
+// clang-format on