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

1 files changed, 48 insertions, 4 deletions

diff --git a/keyboards/linworks/fave87/fave87.h b/keyboards/linworks/fave87/fave87.h
index 400755774a..7c3490f457 100644
--- a/keyboards/linworks/fave87/fave87.h
+++ b/keyboards/linworks/fave87/fave87.h
@@ -42,6 +42,28 @@
 
 #define LAYOUT_tkl_ansi( \
     K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
+    K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,         K037,  K028,  K038, \
+    K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,  K056,         K057,  K048,  K058, \
+    K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,         K076,                             \
+    K080,         K081,  K091,  K082,  K092,  K083,  K093,  K084,  K094,  K085,  K095,         K086,                K088,        \
+    K100,  K110,  K101,                       K103,                       K105,  K115,  K106,  K116,         K117,  K108,  K118 \
+) { \
+  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
+  { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
+  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
+  { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
+  { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
+  { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058  }, \
+  { K060,  K061,  K062,  K063,  K064,  K065,  KC_NO, KC_NO, KC_NO }, \
+  { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
+  { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
+  { KC_NO, K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
+  { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
+  { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
+}
+
+#define LAYOUT_tkl_ansi_split_bs_rshift( \
+    K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
     K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,  K027,  K037,  K028,  K038, \
     K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,  K056,         K057,  K048,  K058, \
     K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,         K076,                             \
@@ -50,20 +72,42 @@
 ) { \
   { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
   { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028  }, \
+  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
   { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
   { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
   { K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058  }, \
   { K060,  K061,  K062,  K063,  K064,  K065,  KC_NO, KC_NO, KC_NO }, \
   { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
   { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { KC_NO, K091,  K092,  K093,  K094,  K095,  K096,  KC_NO, KC_NO }, \
+  { KC_NO, K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
   { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
   { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
 }
 
 #define LAYOUT_tkl_iso( \
     K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
+    K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,         K037,  K028,  K038, \
+    K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,                K057,  K048,  K058, \
+    K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,  K066,  K076,                             \
+    K080,  K090,  K081,  K091,  K082,  K092,  K083,  K093,  K084,  K094,  K085,  K095,         K086,                K088,        \
+    K100,  K110,  K101,                       K103,                       K105,  K115,  K106,  K116,         K117,  K108,  K118 \
+) { \
+  { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
+  { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
+  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
+  { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
+  { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
+  { K050,  K051,  K052,  K053,  K054,  K055,  KC_NO, K057,  K058  }, \
+  { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
+  { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
+  { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
+  { K090,  K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
+  { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
+  { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
+}
+
+#define LAYOUT_tkl_iso_split_bs_rshift( \
+    K000,         K001,  K011,  K002,  K012,  K003,  K013,  K004,  K014,  K005,  K015,  K006,  K016,         K017,  K008,  K018, \
     K020,  K030,  K021,  K031,  K022,  K032,  K023,  K033,  K024,  K034,  K025,  K035,  K026,  K036,  K027,  K037,  K028,  K038, \
     K040,  K050,  K041,  K051,  K042,  K052,  K043,  K053,  K044,  K054,  K045,  K055,  K046,                K057,  K048,  K058, \
     K060,  K070,  K061,  K071,  K062,  K072,  K063,  K073,  K064,  K074,  K065,  K075,  K066,  K076,                             \
@@ -72,14 +116,14 @@
 ) { \
   { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO, K008  }, \
   { KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018  }, \
-  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028  }, \
+  { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO, K028  }, \
   { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038  }, \
   { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048  }, \
   { K050,  K051,  K052,  K053,  K054,  K055,  KC_NO, K057,  K058  }, \
   { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
   { K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
   { K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088  }, \
-  { K090,  K091,  K092,  K093,  K094,  K095,  K096,  KC_NO, KC_NO }, \
+  { K090,  K091,  K092,  K093,  K094,  K095,  KC_NO, KC_NO, KC_NO }, \
   { K100,  K101,  KC_NO, K103,  KC_NO, K105,  K106,  KC_NO, K108  }, \
   { K110,  KC_NO, KC_NO, KC_NO, KC_NO, K115,  K116,  K117,  K118  }  \
 }