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

2 files changed, 66 insertions, 66 deletions

diff --git a/keyboards/linworks/fave104/fave104.h b/keyboards/linworks/fave104/fave104.h
index ae906fb108..bd30b1e0c4 100644
--- a/keyboards/linworks/fave104/fave104.h
+++ b/keyboards/linworks/fave104/fave104.h
@@ -42,21 +42,21 @@
 
 #define LAYOUT_fullsize_ansi( \
     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, \
+    K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K30,  K31,  K32,        K34,    K35,  K36,  K37,    K38,  K39,  K40,  K41, \
     K42,  K43,  K44,  K45,  K46,  K47,  K48,  K49,  K50,  K51,  K52,  K53,  K54,        K55,    K56,  K57,  K58,    K59,  K60,  K61,  K62, \
     K63,  K64,  K65,  K66,  K67,  K68,  K69,  K70,  K71,  K72,  K73,  K74,              K76,                        K77,  K78,  K79,  K80, \
-    K81,        K83,  K84,  K85,  K86,  K87,  K88,  K89,  K90,  K91,  K92,                            K95,          K96,  K97,  K98,  K99, \
+    K81,        K83,  K84,  K85,  K86,  K87,  K88,  K89,  K90,  K91,  K92,  K93,                      K95,          K96,  K97,  K98,  K99, \
     K100, K101, K102,                   K103,                   K104, K105, K106,       K107,   K108, K109, K110,   K111, K112, K113, K114 \
 ) { \
   { K00,    K01,   K03,   K05,   K07,   K09,  K11,    K12,   K14,   K16,  K18 }, \
   { KC_NO,  K02,   K04,   K06,   K08,   K10,  KC_NO,  K13,   K15,   K17,  K19 }, \
   { K20,    K22,   K24,   K26,   K28,   K30,  K32,    K34,   K36,   K38,  K40 }, \
-  { K21,    K23,   K25,   K27,   K29,   K31,  K33,    K35,   K37,   K39,  K41 }, \
+  { K21,    K23,   K25,   K27,   K29,   K31,  KC_NO,  K35,   K37,   K39,  K41 }, \
   { K42,    K44,   K46,   K48,   K50,   K52,  K54,    K55,   K57,   K59,  K61 }, \
   { K43,    K45,   K47,   K49,   K51,   K53,  KC_NO,  K56,   K58,   K60,  K62 }, \
   { K63,    K65,   K67,   K69,   K71,   K73,  KC_NO,  K76,   KC_NO, K77,  K79 }, \
   { K64,    K66,   K68,   K70,   K72,   K74,  KC_NO,  KC_NO, KC_NO, K78,  K80 }, \
-  { K81,    K83,   K85,   K87,   K89,   K91,  KC_NO,  KC_NO, K95,   K96,  K98 }, \
+  { K81,    K83,   K85,   K87,   K89,   K91,  K93,    KC_NO, K95,   K96,  K98 }, \
   { KC_NO,  K84,   K86,   K88,   K90,   K92,  KC_NO,  KC_NO, KC_NO, K97,  K99 }, \
   { K100,   K102,  KC_NO, K103,  KC_NO, K104, K106,   K107,  K109,  K111, K113}, \
   { K101,   KC_NO, KC_NO, KC_NO, KC_NO, K105, KC_NO,  K108,  K110,  K112, K114}  \
diff --git a/keyboards/linworks/fave104/info.json b/keyboards/linworks/fave104/info.json
index f30313f7a3..f675f8c51f 100644
--- a/keyboards/linworks/fave104/info.json
+++ b/keyboards/linworks/fave104/info.json
@@ -50,10 +50,10 @@
                 {"label":"Insert", "x":15.25, "y":1.25},
                 {"label":"Home", "x":16.25, "y":1.25},
                 {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
+                {"label":"Num Lock", "x":18.5, "y":1.25},
+                {"label":"/", "x":19.5, "y":1.25},
+                {"label":"*", "x":20.5, "y":1.25},
+                {"label":"-", "x":21.5, "y":1.25},
 
                 {"label":"Tab", "x":0, "y":2.25, "w":1.5},
                 {"label":"Q", "x":1.5, "y":2.25},
@@ -72,10 +72,10 @@
                 {"label":"Delete", "x":15.25, "y":2.25},
                 {"label":"End", "x":16.25, "y":2.25},
                 {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5},
+                {"label":"7", "x":18.5, "y":2.25},
+                {"label":"8", "x":19.5, "y":2.25},
+                {"label":"9", "x":20.5, "y":2.25},
+                {"label":"+", "x":21.5, "y":2.25},
 
                 {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
                 {"label":"A", "x":1.75, "y":3.25},
@@ -91,10 +91,10 @@
                 {"label":"\"", "x":11.75, "y":3.25},
                 {"x":12.75, "y":3.25},
                 {"label":"Enter", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-                {"label":"+", "x":21.5, "y":3.5},
+                {"label":"4", "x":18.5, "y":3.25},
+                {"label":"5", "x":19.5, "y":3.25},
+                {"label":"6", "x":20.5, "y":3.25},
+                {"label":"+", "x":21.5, "y":3.25},
 
                 {"label":"Shift", "x":0, "y":4.25, "w":1.25},
                 {"x":1.25, "y":4.25},
@@ -111,10 +111,10 @@
                 {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
                 {"x":14, "y":4.25},
                 {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"Enter", "x":21.5, "y":4.5},
+                {"label":"1", "x":18.5, "y":4.25},
+                {"label":"2", "x":19.5, "y":4.25},
+                {"label":"3", "x":20.5, "y":4.25},
+                {"label":"Enter", "x":21.5, "y":4.25},
 
                 {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
                 {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@@ -127,10 +127,10 @@
                 {"label":"\u2190", "x":15.25, "y":5.25},
                 {"label":"\u2193", "x":16.25, "y":5.25},
                 {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.5},
-                {"label":"0", "x":19.5, "y":5.5},
-                {"label":".", "x":20.5, "y":5.5},
-                {"label":"Enter", "x":21.5, "y":5.5}
+                {"label":"0", "x":18.5, "y":5.25},
+                {"label":"0", "x":19.5, "y":5.25},
+                {"label":".", "x":20.5, "y":5.25},
+                {"label":"Enter", "x":21.5, "y":5.25}
             ]
         },
 
@@ -170,14 +170,14 @@
                 {"label":")", "x":10, "y":1.25},
                 {"label":"_", "x":11, "y":1.25},
                 {"label":"+", "x":12, "y":1.25},
-                {"label":"Bksp", "x":14, "y":1.25, "w":2},
+                {"label":"Bksp", "x":13, "y":1.25, "w":2},
                 {"label":"Insert", "x":15.25, "y":1.25},
                 {"label":"Home", "x":16.25, "y":1.25},
                 {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
+                {"label":"Num Lock", "x":18.5, "y":1.25},
+                {"label":"/", "x":19.5, "y":1.25},
+                {"label":"*", "x":20.5, "y":1.25},
+                {"label":"-", "x":21.5, "y":1.25},
 
                 {"label":"Tab", "x":0, "y":2.25, "w":1.5},
                 {"label":"Q", "x":1.5, "y":2.25},
@@ -196,10 +196,10 @@
                 {"label":"Delete", "x":15.25, "y":2.25},
                 {"label":"End", "x":16.25, "y":2.25},
                 {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5},
+                {"label":"7", "x":18.5, "y":2.25},
+                {"label":"8", "x":19.5, "y":2.25},
+                {"label":"9", "x":20.5, "y":2.25},
+                {"label":"+", "x":21.5, "y":2.25},
 
                 {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
                 {"label":"A", "x":1.75, "y":3.25},
@@ -214,10 +214,10 @@
                 {"label":":", "x":10.75, "y":3.25},
                 {"label":"\"", "x":11.75, "y":3.25},
                 {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-                {"label":"+", "x":21.5, "y":3.5},
+                {"label":"4", "x":18.5, "y":3.25},
+                {"label":"5", "x":19.5, "y":3.25},
+                {"label":"6", "x":20.5, "y":3.25},
+                {"label":"+", "x":21.5, "y":3.25},
 
                 {"label":"Shift", "x":0, "y":4.25, "w":2.25},
                 {"label":"Z", "x":2.25, "y":4.25},
@@ -232,10 +232,10 @@
                 {"label":"?", "x":11.25, "y":4.25},
                 {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
                 {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"Enter", "x":21.5, "y":4.5},
+                {"label":"1", "x":18.5, "y":4.25},
+                {"label":"2", "x":19.5, "y":4.25},
+                {"label":"3", "x":20.5, "y":4.25},
+                {"label":"Enter", "x":21.5, "y":4.25},
 
                 {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
                 {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@@ -248,10 +248,10 @@
                 {"label":"\u2190", "x":15.25, "y":5.25},
                 {"label":"\u2193", "x":16.25, "y":5.25},
                 {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.5},
-                {"label":"0", "x":19.5, "y":5.5},
-                {"label":".", "x":20.5, "y":5.5},
-                {"label":"Enter", "x":21.5, "y":5.5}
+                {"label":"0", "x":18.5, "y":5.25},
+                {"label":"0", "x":19.5, "y":5.25},
+                {"label":".", "x":20.5, "y":5.25},
+                {"label":"Enter", "x":21.5, "y":5.25}
             ]
         },
 
@@ -296,10 +296,10 @@
                 {"label":"Insert", "x":15.25, "y":1.25},
                 {"label":"Home", "x":16.25, "y":1.25},
                 {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Num Lock", "x":18.5, "y":1.5},
-                {"label":"/", "x":19.5, "y":1.5},
-                {"label":"*", "x":20.5, "y":1.5},
-                {"label":"-", "x":21.5, "y":1.5},
+                {"label":"Num Lock", "x":18.5, "y":1.25},
+                {"label":"/", "x":19.5, "y":1.25},
+                {"label":"*", "x":20.5, "y":1.25},
+                {"label":"-", "x":21.5, "y":1.25},
 
                 {"label":"Tab", "x":0, "y":2.25, "w":1.5},
                 {"label":"Q", "x":1.5, "y":2.25},
@@ -317,10 +317,10 @@
                 {"label":"Delete", "x":15.25, "y":2.25},
                 {"label":"End", "x":16.25, "y":2.25},
                 {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"7", "x":18.5, "y":2.5},
-                {"label":"8", "x":19.5, "y":2.5},
-                {"label":"9", "x":20.5, "y":2.5},
-                {"label":"+", "x":21.5, "y":2.5},
+                {"label":"7", "x":18.5, "y":2.25},
+                {"label":"8", "x":19.5, "y":2.25},
+                {"label":"9", "x":20.5, "y":2.25},
+                {"label":"+", "x":21.5, "y":2.25},
 
                 {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
                 {"label":"A", "x":1.75, "y":3.25},
@@ -334,12 +334,12 @@
                 {"label":"L", "x":9.75, "y":3.25},
                 {"label":":", "x":10.75, "y":3.25},
                 {"label":"\"", "x":11.75, "y":3.25},
-                {"x":12.75, "y":3.25},
+                {"label":"#", "x":12.75, "y":3.25},
                 {"label":"Enter", "x": 13.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"4", "x":18.5, "y":3.5},
-                {"label":"5", "x":19.5, "y":3.5},
-                {"label":"6", "x":20.5, "y":3.5},
-                {"label":"+", "x":21.5, "y":3.5},
+                {"label":"4", "x":18.5, "y":3.25},
+                {"label":"5", "x":19.5, "y":3.25},
+                {"label":"6", "x":20.5, "y":3.25},
+                {"label":"+", "x":21.5, "y":3.25},
 
                 {"label":"Shift", "x":0, "y":4.25, "w":1.25},
                 {"x":1.25, "y":4.25},
@@ -356,10 +356,10 @@
                 {"label":"Shift", "x":12.25, "y":4.25, "w":1.75},
                 {"x":14, "y":4.25},
                 {"label":"\u2191", "x":16.25, "y":4.25},
-                {"label":"1", "x":18.5, "y":4.5},
-                {"label":"2", "x":19.5, "y":4.5},
-                {"label":"3", "x":20.5, "y":4.5},
-                {"label":"Enter", "x":21.5, "y":4.5},
+                {"label":"1", "x":18.5, "y":4.25},
+                {"label":"2", "x":19.5, "y":4.25},
+                {"label":"3", "x":20.5, "y":4.25},
+                {"label":"Enter", "x":21.5, "y":4.25},
 
                 {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
                 {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
@@ -372,10 +372,10 @@
                 {"label":"\u2190", "x":15.25, "y":5.25},
                 {"label":"\u2193", "x":16.25, "y":5.25},
                 {"label":"\u2192", "x":17.25, "y":5.25},
-                {"label":"0", "x":18.5, "y":5.5},
-                {"label":"0", "x":19.5, "y":5.5},
-                {"label":".", "x":20.5, "y":5.5},
-                {"label":"Enter", "x":21.5, "y":5.5}
+                {"label":"0", "x":18.5, "y":5.25},
+                {"label":"0", "x":19.5, "y":5.25},
+                {"label":".", "x":20.5, "y":5.25},
+                {"label":"Enter", "x":21.5, "y":5.25}
             ]
         }
     }