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

1 files changed, 69 insertions, 74 deletions

diff --git a/keyboards/quark/quark.h b/keyboards/quark/quark.h
index a81b062d01..e1af96eb76 100644
--- a/keyboards/quark/quark.h
+++ b/keyboards/quark/quark.h
@@ -14,93 +14,88 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #pragma once
 
 #include "quantum.h"
 
-#define LAYOUT_5x12_2x225( \
-  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
-  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
-  k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, \
-  k400, k401,       k402, k403,             k404, k405,       k406, k407  \
-) \
-{ \
-  { k000, k001, k002,  k003, k004, k005,  k006,  k007, k008, k009,  k010, k011 }, \
-  { k100, k101, k102,  k103, k104, k105,  k106,  k107, k108, k109,  k110, k111 }, \
-  { k200, k201, k202,  k203, k204, k205,  k206,  k207, k208, k209,  k210, k211 }, \
-  { k300, k301, k302,  k303, k304, k305,  k306,  k307, k308, k309,  k310, k311 }, \
-  { k400, k401, KC_NO, k402, k403, KC_NO, KC_NO, k404, k405, KC_NO, k406, k407 } \
+#define XXX KC_NO
+
+#define LAYOUT_ortho_5x12_2x225u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
+    k40, k41,      k43, k44,           k47, k48,      k4A, k4B \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
+    { k40, k41, XXX, k43, k44, XXX, XXX, k47, k48, XXX, k4A, k4B } \
 }
 
-#define LAYOUT_5x12_2x3( \
-  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
-  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
-  k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, \
-  k400, k401,             k402,             k403,             k404, k405 \
-) \
-{ \
-  { k000, k001, k002,  k003,  k004, k005,  k006,  k007, k008,  k009,  k010, k011 }, \
-  { k100, k101, k102,  k103,  k104, k105,  k106,  k107, k108,  k109,  k110, k111 }, \
-  { k200, k201, k202,  k203,  k204, k205,  k206,  k207, k208,  k209,  k210, k211 }, \
-  { k300, k301, k302,  k303,  k304, k305,  k306,  k307, k308,  k309,  k310, k311 }, \
-  { k400, k401, KC_NO, KC_NO, k402, KC_NO, KC_NO, k403, KC_NO, KC_NO, k404, k405 } \
+#define LAYOUT_ortho_5x12_2x3u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \
+    k40, k41,      k43,                     k48,      k4A, k4B \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
+    { k40, k41, XXX, XXX, k43, XXX, XXX, k48, XXX, XXX, k4A, k4B } \
 }
 
 #define LAYOUT_ortho_4x12( \
-  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
-  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
-  k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 \
-) \
-{ \
-  { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
-  { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \
-  { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \
-  { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 }, \
-  {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B }, \
+    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
 }
 
-#define LAYOUT_4x12_MIT( \
-  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
-  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
-  k300, k301, k302, k303, k304, k305,       k306, k307, k308, k309, k310 \
-) \
-{ \
-  { k000, k001, k002, k003, k004, k005, k006,  k007, k008, k009, k010, k011 }, \
-  { k100, k101, k102, k103, k104, k105, k106,  k107, k108, k109, k110, k111 }, \
-  { k200, k201, k202, k203, k204, k205, k206,  k207, k208, k209, k210, k211 }, \
-  { k300, k301, k302, k303, k304, k305, KC_NO, k306, k307, k308, k309, k310 }, \
-  {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
+#define LAYOUT_planck_mit( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
+    k30, k31, k32, k33, k34,    k35,   k36, k37, k38, k39, k3A \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
+    { k30, k31, k32, k33, k34, k35, XXX, k36, k37, k38, k39, k3A }, \
+    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
 }
 
-#define LAYOUT_4x12_2x225( \
-  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
-  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
-  k300, k301,       k302, k303,             k304, k305,       k306, k307 \
-) \
-{ \
-  { k000, k001, k002,  k003, k004, k005,  k006,  k007, k008, k009,  k010, k011 }, \
-  { k100, k101, k102,  k103, k104, k105,  k106,  k107, k108, k109,  k110, k111 }, \
-  { k200, k201, k202,  k203, k204, k205,  k206,  k207, k208, k209,  k210, k211 }, \
-  { k300, k301, KC_NO, k302, k303, KC_NO, KC_NO, k304, k305, KC_NO, k306, k307 }, \
-  {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
+#define LAYOUT_ortho_4x12_2x225u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
+    k30, k31,      k33, k34,           k37, k38,      k3A, k3B \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
+    { k30, k31, XXX, k33, k34, XXX, XXX, k37, k38, XXX, k3A, k3B }, \
+    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
 }
 
-#define LAYOUT_4x12_2x3( \
-  k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
-  k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
-  k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
-  k300, k301, k302,       k303,             k304,       k305, k306, k307 \
-) \
-{ \
-  { k000, k001, k002, k003,  k004, k005,  k006,  k007, k008,  k009, k010, k011 }, \
-  { k100, k101, k102, k103,  k104, k105,  k106,  k107, k108,  k109, k110, k111 }, \
-  { k200, k201, k202, k203,  k204, k205,  k206,  k207, k208,  k209, k210, k211 }, \
-  { k300, k301, k302, KC_NO, k303, KC_NO, KC_NO, k304, KC_NO, k305, k306, k307 }, \
-  {KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \
+#define LAYOUT_ortho_4x12_2x3u( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \
+    k30, k31, k32,      k34,           k37,      k39, k3A, k3B \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \
+    { k30, k31, k32, XXX, k34, XXX, XXX, k37, XXX, k39, k3A, k3B }, \
+    { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \
 }