[Keyboard] WhiteFox vanilla layout (#8043)

* Add the Whitefox vanilla layout

Initial commit for whitefox vanilla keymap

Fix the mapped layout to match vanilla

Cleanup vanilla default

Rework the info file

Remove vanilla keymap as we don't really need this

diff --git a/keyboards/whitefox/info.json b/keyboards/whitefox/info.json
index 5efe291..fc2ffea 100644 (file)
--- a/keyboards/whitefox/info.json
+++ b/keyboards/whitefox/info.json
@@ -14,6 +14,78 @@
 
       "LAYOUT_aria": {
         "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
-      }
+      },
+    "LAYOUT_vanilla": {
+      "layout": [
+        {"label": "~","x": 0,"y": 0},
+        {"label": "!","x": 1,"y": 0},
+        {"label": "@","x": 2,"y": 0},
+        {"label": "#","x": 3,"y": 0},
+        {"label": "$","x": 4,"y": 0},
+        {"label": "%","x": 5,"y": 0},
+        {"label": "^","x": 6,"y": 0},
+        {"label": "&","x": 7,"y": 0},
+        {"label": "*","x": 8,"y": 0},
+        {"label": "(","x": 9,"y": 0},
+        {"label": ")","x": 10,"y": 0},
+        {"label": "_","x": 11,"y": 0},
+        {"label": "+","x": 12,"y": 0},
+        {"label": "Backspace","x": 13,"y": 0,"w": 2},
+        {"x": 15,"y": 0},
+        {"label": "Tab","x": 0,"y": 1,"w": 1.5},
+        {"label": "Q","x": 1.5,"y": 1},
+        {"label": "W","x": 2.5,"y": 1},
+        {"label": "E","x": 3.5,"y": 1},
+        {"label": "R","x": 4.5,"y": 1},
+        {"label": "T","x": 5.5,"y": 1},
+        {"label": "Y","x": 6.5,"y": 1},
+        {"label": "U","x": 7.5,"y": 1},
+        {"label": "I","x": 8.5,"y": 1},
+        {"label": "O","x": 9.5,"y": 1},
+        {"label": "P","x": 10.5,"y": 1},
+        {"label": "{","x": 11.5,"y": 1},
+        {"label": "}","x": 12.5,"y": 1},
+        {"label": "|","x": 13.5,"y": 1,"w": 1.5},
+        {"x": 15,"y": 1},
+        {"label": "Caps Lock","x": 0,"y": 2,"w": 1.75},
+        {"label": "A","x": 1.75,"y": 2},
+        {"label": "S","x": 2.75,"y": 2},
+        {"label": "D","x": 3.75,"y": 2},
+        {"label": "F","x": 4.75,"y": 2},
+        {"label": "G","x": 5.75,"y": 2},
+        {"label": "H","x": 6.75,"y": 2},
+        {"label": "J","x": 7.75,"y": 2},
+        {"label": "K","x": 8.75,"y": 2},
+        {"label": "L","x": 9.75,"y": 2},
+        {"label": ":","x": 10.75,"y": 2},
+        {"label": "\"","x": 11.75,"y": 2},
+        {"label": "Enter","x": 12.75,"y": 2,"w": 2.25},
+        {"x": 15,"y": 2},
+        {"label": "Shift","x": 0,"y": 3,"w": 2.25},
+        {"label": "Z","x": 2.25,"y": 3},
+        {"label": "X","x": 3.25,"y": 3},
+        {"label": "C","x": 4.25,"y": 3},
+        {"label": "V","x": 5.25,"y": 3},
+        {"label": "B","x": 6.25,"y": 3},
+        {"label": "N","x": 7.25,"y": 3},
+        {"label": "M","x": 8.25,"y": 3},
+        {"label": "<","x": 9.25,"y": 3},
+        {"label": ">","x": 10.25,"y": 3},
+        {"label": "?","x": 11.25,"y": 3},
+        {"label": "Shift","x": 12.25,"y": 3,"w": 1.75},
+        {"x": 14,"y": 3},
+        {"x": 15,"y": 3},
+        {"label": "Ctrl","x": 0,"y": 4,"w": 1.25},
+        {"label": "Win","x": 1.25,"y": 4,"w": 1.25},
+        {"label": "Alt","x": 2.5,"y": 4,"w": 1.25},
+        {"x": 3.75,"y": 4,"w": 6.25},
+        {"label": "Alt","x": 10,"y": 4,"w": 1},
+        {"label": "Win","x": 11,"y": 4,"w": 1},
+        {"label": "Ctrl","x": 12,"y": 4,"w": 1},
+        {"x": 13,"y": 4},
+        {"x": 14,"y": 4},
+        {"x": 15,"y": 4}
+      ]
+    }
   }
 }

diff --git a/keyboards/whitefox/whitefox.h b/keyboards/whitefox/whitefox.h
index 7791dac..0c19e2d 100644 (file)
--- a/keyboards/whitefox/whitefox.h
+++ b/keyboards/whitefox/whitefox.h
@@ -134,4 +134,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { K80, K81,   K82, K83, K84,   K85,   K86, KC_NO }  \
 }
 
+/* Vanilla WhiteFox
+ * ,---------------------------------------------------------------.
+ * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| Backsp|  `|
+ * |---------------------------------------------------------------|
+ * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \|Del|
+ * |---------------------------------------------------------------|
+ * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter   |PgU|
+ * |---------------------------------------------------------------|
+ * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Up |PgD|
+ * |---------------------------------------------------------------|
+ * |Ctrl|GUI |Alt |         Space          |Alt|GUI|Ctl|Lef|Dow|Rig|
+ * `---------------------------------------------------------------'
+ */
+
+#define LAYOUT_vanilla( \
+    K00, K10, K20, K30, K40, K50, K60, K70, K80, K01, K11, K21, K31, K51,      K61, \
+    K71, K81, K02, K12, K22, K32, K42, K52, K62, K72, K82, K03, K13, K23,      K33, \
+    K43, K53, K63, K73, K83, K04, K14, K24, K34, K44, K54, K64,      K84,      K05, \
+    K15,      K35, K45, K55, K65, K75, K85, K06, K16, K26, K36, K46,      K56, K66, \
+    K76, K86, K07,                K17,           K27, K37, K47,      K57, K67, K77  \
+) { \
+    { K00, K01,   K02, K03, K04,   K05,   K06, K07   }, \
+    { K10, K11,   K12, K13, K14,   K15,   K16, K17   }, \
+    { K20, K21,   K22, K23, K24,   KC_NO, K26, K27   }, \
+    { K30, K31,   K32, K33, K34,   K35,   K36, K37   }, \
+    { K40, KC_NO, K42, K43, K44,   K45,   K46, K47   }, \
+    { K50, K51,   K52, K53, K54,   K55,   K56, K57   }, \
+    { K60, K61,   K62, K63, K64,   K65,   K66, K67   }, \
+    { K70, K71,   K72, K73, KC_NO, K75,   K76, K77   }, \
+    { K80, K81,   K82, K83, K84,   K85,   K86, KC_NO }  \
+}
+
 #endif