From dd5ead676b1169a15eb48d8ed2ce1df23287e3d2 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Tue, 13 Jul 2021 21:28:56 -0700
Subject: Traveller handwired layout macro refactor (#13539)

---
 keyboards/handwired/traveller/info.json | 90 +++++++++++++++++----------------
 1 file changed, 46 insertions(+), 44 deletions(-)

(limited to 'keyboards/handwired/traveller/info.json')

diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json
index 019250eb61..4de448d229 100644
--- a/keyboards/handwired/traveller/info.json
+++ b/keyboards/handwired/traveller/info.json
@@ -2,66 +2,68 @@
     "keyboard_name": "Traveller",
     "url": "",
     "maintainer": "qmk",
-    "width": 13,
-    "height": 4,
+    "width": 15,
+    "height": 5.2,
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0},
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
+                {"x": 0, "y": 1.2},
+                {"x": 1, "y": 0.8},
+                {"x": 2, "y": 0.4},
                 {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"x": 4, "y": 0.4},
+                {"x": 5, "y": 0.8},
 
-                {"x": 7, "y": 0},
-                {"x": 8, "y": 0},
-                {"x": 9, "y": 0},
-                {"x": 10, "y": 0},
+                {"x": 9, "y": 0.8},
+                {"x": 10, "y": 0.4},
                 {"x": 11, "y": 0},
-                {"x": 12, "y": 0},
+                {"x": 12, "y": 0.4},
+                {"x": 13, "y": 0.8},
+                {"x": 14, "y": 1.2},
 
-                {"x": 0, "y": 1},
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
+                {"x": 0, "y": 2.2},
+                {"x": 1, "y": 1.8},
+                {"x": 2, "y": 1.4},
                 {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
+                {"x": 4, "y": 1.4},
+                {"x": 5, "y": 1.8},
 
-                {"x": 7, "y": 1},
-                {"x": 8, "y": 1},
-                {"x": 9, "y": 1},
-                {"x": 10, "y": 1},
+                {"x": 9, "y": 1.8},
+                {"x": 10, "y": 1.4},
                 {"x": 11, "y": 1},
-                {"x": 12, "y": 1},
+                {"x": 12, "y": 1.4},
+                {"x": 13, "y": 1.8},
+                {"x": 14, "y": 2.2},
 
-                {"x": 0, "y": 2},
-                {"x": 1, "y": 2},
-                {"x": 2, "y": 2},
+                {"x": 0, "y": 3.2},
+                {"x": 1, "y": 2.8},
+                {"x": 2, "y": 2.4},
                 {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
-                {"x": 6, "y": 2},
-                {"x": 7, "y": 2},
-                {"x": 8, "y": 2},
-                {"x": 9, "y": 2},
-                {"x": 10, "y": 2},
+                {"x": 4, "y": 2.4},
+                {"x": 5, "y": 2.8},
+
+                {"x": 9, "y": 2.8},
+                {"x": 10, "y": 2.4},
                 {"x": 11, "y": 2},
-                {"x": 12, "y": 2},
+                {"x": 12, "y": 2.4},
+                {"x": 13, "y": 2.8},
+                {"x": 14, "y": 3.2},
 
-                {"x": 0, "y": 3},
-                {"x": 1, "y": 3},
-                {"x": 2, "y": 3},
+                {"x": 0, "y": 4.2},
+                {"x": 1, "y": 3.8},
+                {"x": 2, "y": 3.4},
                 {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
-                {"x": 6, "y": 3},
-                {"x": 7, "y": 3},
-                {"x": 8, "y": 3},
-                {"x": 9, "y": 3},
-                {"x": 10, "y": 3},
+                {"x": 4, "y": 3.4},
+                {"x": 5, "y": 3.8},
+                {"x": 6, "y": 3.05, "h": 1.5},
+
+                {"x": 8, "y": 3.05, "h": 1.5},
+                {"x": 9, "y": 3.8},
+                {"x": 10, "y": 3.4},
                 {"x": 11, "y": 3},
-                {"x": 12, "y": 3}
+                {"x": 12, "y": 3.4},
+                {"x": 13, "y": 3.8},
+                {"x": 14, "y": 4.2}
             ]
         }
     }
-- 
cgit v1.2.3