From aac4cd69b1d334be05a6631aa597e98ae1ba8f04 Mon Sep 17 00:00:00 2001
From: nachie <me@nachie.com>
Date: Sat, 7 Sep 2024 13:21:05 -0700
Subject: [PATCH] Fix layout in evelyn info/keyboard json (#783)

Co-authored-by: Nachiket Kulkarni <nachiket_kulkarni@apple.com>
---
 keyboards/nachie/evelyn/info.json             | 78 +++++++++---------
 keyboards/nachie/evelyn/keyboard.json         | 80 +++++++++----------
 .../nachie/evelyn/keymaps/vial/vial.json      | 62 +++++---------
 keyboards/nachie/evelyn/readme.md             | 14 ++--
 4 files changed, 106 insertions(+), 128 deletions(-)

diff --git a/keyboards/nachie/evelyn/info.json b/keyboards/nachie/evelyn/info.json
index 7b0c80d08e..919c6a7a91 100644
--- a/keyboards/nachie/evelyn/info.json
+++ b/keyboards/nachie/evelyn/info.json
@@ -1,5 +1,5 @@
 {
-  "manufacturer": "nachie",
+  "manufacturer": "Nachie",
   "keyboard_name": "Syndrome",
   "maintainer": "nachie",
   "board": "GENERIC_RP_RP2040",
@@ -43,44 +43,44 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"y": 0.0, "x": 0.29, "matrix": [0, 0], "label": "0,0"},
-        {"y": 0.0, "x": 10.190000000000001, "matrix": [1, 4], "label": "1,4"},
-        {"y": 0.0, "x": 11.190000000000001, "matrix": [0, 5], "label": "0,5"},
-        {"y": 0.99, "x": 0.15, "matrix": [2, 0], "w": 1.25, "label": "2,0"},
-        {"y": 0.99, "x": 10.58, "matrix": [2, 5], "w": 1.75, "label": "2,5"},
-        {"y": 1.99, "x": 0.0, "matrix": [4, 0], "w": 1.75, "label": "4,0"},
-        {"y": 2.99, "x": 0.09000000000000001, "matrix": [6, 0], "w": 1.25, "label": "6,0"},
-        {"y": 6.23, "x": 3.97, "matrix": [5, 4], "w": 1.25, "label": "5,4"},
-        {"y": 6.23, "x": 5.220000000000001, "matrix": [4, 5], "label": "4,5"},
-        {"y": 7.23, "x": 4.87, "matrix": [6, 5], "w": 1.25, "label": "6,5"},
-        {"y": 8.23, "x": 1.43, "matrix": [1, 0], "label": "1,0"},
-        {"y": 8.23, "x": 2.43, "matrix": [0, 1], "label": "0,1"},
-        {"y": 8.23, "x": 3.43, "matrix": [1, 1], "label": "1,1"},
-        {"y": 8.23, "x": 4.430000000000001, "matrix": [0, 2], "label": "0,2"},
-        {"y": 9.23, "x": 1.68, "matrix": [3, 0], "label": "3,0"},
-        {"y": 9.23, "x": 2.68, "matrix": [2, 1], "label": "2,1"},
-        {"y": 9.23, "x": 3.68, "matrix": [3, 1], "label": "3,1"},
-        {"y": 9.23, "x": 4.680000000000001, "matrix": [2, 2], "label": "2,2"},
-        {"y": 10.23, "x": 2.18, "matrix": [5, 0], "label": "5,0"},
-        {"y": 10.23, "x": 3.18, "matrix": [4, 1], "label": "4,1"},
-        {"y": 10.23, "x": 4.180000000000001, "matrix": [5, 1], "label": "5,1"},
-        {"y": 10.23, "x": 5.180000000000001, "matrix": [4, 2], "label": "4,2"},
-        {"y": 11.23, "x": 2.93, "matrix": [6, 1], "label": "6,1"},
-        {"y": 11.23, "x": 3.93, "matrix": [6, 2], "w": 2.25, "label": "6,2"},
-        {"y": 9.89, "x": 5.930000000000001, "matrix": [1, 2], "label": "1,2"},
-        {"y": 9.89, "x": 6.930000000000001, "matrix": [0, 3], "label": "0,3"},
-        {"y": 9.89, "x": 7.930000000000001, "matrix": [1, 3], "label": "1,3"},
-        {"y": 9.89, "x": 8.93, "matrix": [0, 4], "label": "0,4"},
-        {"y": 10.89, "x": 6.180000000000001, "matrix": [3, 2], "label": "3,2"},
-        {"y": 10.89, "x": 7.180000000000001, "matrix": [2, 3], "label": "2,3"},
-        {"y": 10.89, "x": 8.18, "matrix": [3, 3], "label": "3,3"},
-        {"y": 10.89, "x": 9.18, "matrix": [2, 4], "label": "2,4"},
-        {"y": 11.89, "x": 5.680000000000001, "matrix": [5, 2], "label": "5,2"},
-        {"y": 11.89, "x": 6.680000000000001, "matrix": [4, 3], "label": "4,3"},
-        {"y": 11.89, "x": 7.680000000000001, "matrix": [5, 3], "label": "5,3"},
-        {"y": 11.89, "x": 8.68, "matrix": [4, 4], "label": "4,4"},
-        {"y": 12.89, "x": 5.680000000000001, "matrix": [6, 3], "w": 2, "label": "6,3"},
-        {"y": 12.89, "x": 7.680000000000001, "matrix": [6, 4], "label": "6,4"}
+        {"y": 0, "x": 0, "matrix": [0, 0], "label": "0,0"},
+        {"y": 0, "x": 1, "matrix": [1, 0], "label": "1,0"},
+        {"y": 0, "x": 2, "matrix": [0, 1], "label": "0,1"},
+        {"y": 0, "x": 3, "matrix": [1, 1], "label": "1,1"},
+        {"y": 0, "x": 4, "matrix": [0, 2], "label": "0,2"},
+        {"y": 0, "x": 6.25, "matrix": [1, 2], "label": "1,2"},
+        {"y": 0, "x": 7.25, "matrix": [0, 3], "label": "0,3"},
+        {"y": 0, "x": 8.25, "matrix": [1, 3], "label": "1,3"},
+        {"y": 0, "x": 9.25, "matrix": [0, 4], "label": "0,4"},
+        {"y": 0, "x": 10.25, "matrix": [1, 4], "label": "1,4"},
+        {"y": 0, "x": 11.25, "matrix": [0, 5], "label": "0,5"},
+        {"y": 1, "x": 0, "matrix": [2, 0], "w": 1.25, "label": "2,0"},
+        {"y": 1, "x": 1.25, "matrix": [3, 0], "label": "3,0"},
+        {"y": 1, "x": 2.25, "matrix": [2, 1], "label": "2,1"},
+        {"y": 1, "x": 3.25, "matrix": [3, 1], "label": "3,1"},
+        {"y": 1, "x": 4.25, "matrix": [2, 2], "label": "2,2"},
+        {"y": 1, "x": 6.5, "matrix": [3, 2], "label": "3,2"},
+        {"y": 1, "x": 7.5, "matrix": [2, 3], "label": "2,3"},
+        {"y": 1, "x": 8.5, "matrix": [3, 3], "label": "3,3"},
+        {"y": 1, "x": 9.5, "matrix": [2, 4], "label": "2,4"},
+        {"y": 1, "x": 10.5, "matrix": [2, 5], "w": 1.75, "label": "2,5"},
+        {"y": 2, "x": 0, "matrix": [4, 0], "w": 1.75, "label": "4,0"},
+        {"y": 2, "x": 1.75, "matrix": [5, 0], "label": "5,0"},
+        {"y": 2, "x": 2.75, "matrix": [4, 1], "label": "4,1"},
+        {"y": 2, "x": 3.75, "matrix": [5, 1], "label": "5,1"},
+        {"y": 2, "x": 4.75, "matrix": [4, 2], "label": "4,2"},
+        {"y": 2, "x": 6, "matrix": [5, 2], "label": "5,2"},
+        {"y": 2, "x": 7, "matrix": [4, 3], "label": "4,3"},
+        {"y": 2, "x": 8, "matrix": [5, 3], "label": "5,3"},
+        {"y": 2, "x": 9, "matrix": [4, 4], "label": "4,4"},
+        {"y": 3, "x": 0, "matrix": [6, 0], "w": 1.25, "label": "6,0"},
+        {"y": 3, "x": 2.5, "matrix": [6, 1], "label": "6,1"},
+        {"y": 3, "x": 3.5, "matrix": [6, 2], "w": 2.25, "label": "6,2"},
+        {"y": 3, "x": 6, "matrix": [6, 3], "w": 2, "label": "6,3"},
+        {"y": 3, "x": 8, "matrix": [6, 4], "label": "6,4"},
+        {"y": 6, "x": 3.75, "matrix": [5, 4], "w": 1.25, "label": "5,4"},
+        {"y": 6, "x": 5, "matrix": [4, 5], "label": "4,5"},
+        {"y": 7, "x": 4.75, "matrix": [6, 5], "w": 1.25, "label": "6,5"}
       ]
     }
   }
diff --git a/keyboards/nachie/evelyn/keyboard.json b/keyboards/nachie/evelyn/keyboard.json
index 61d598a52b..8df38e45d0 100644
--- a/keyboards/nachie/evelyn/keyboard.json
+++ b/keyboards/nachie/evelyn/keyboard.json
@@ -1,6 +1,6 @@
 {
-  "manufacturer": "nachie",
-  "keyboard_name": "Syndrome",
+  "manufacturer": "Nachie",
+  "keyboard_name": "Evelyn",
   "maintainer": "nachie",
   "board": "GENERIC_RP_RP2040",
   "bootloader": "rp2040",
@@ -43,44 +43,44 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"y": 0.0, "x": 0.29, "matrix": [0, 0], "label": "0,0"},
-        {"y": 0.0, "x": 10.190000000000001, "matrix": [1, 4], "label": "1,4"},
-        {"y": 0.0, "x": 11.190000000000001, "matrix": [0, 5], "label": "0,5"},
-        {"y": 0.99, "x": 0.15, "matrix": [2, 0], "w": 1.25, "label": "2,0"},
-        {"y": 0.99, "x": 10.58, "matrix": [2, 5], "w": 1.75, "label": "2,5"},
-        {"y": 1.99, "x": 0.0, "matrix": [4, 0], "w": 1.75, "label": "4,0"},
-        {"y": 2.99, "x": 0.09000000000000001, "matrix": [6, 0], "w": 1.25, "label": "6,0"},
-        {"y": 6.23, "x": 3.97, "matrix": [5, 4], "w": 1.25, "label": "5,4"},
-        {"y": 6.23, "x": 5.220000000000001, "matrix": [4, 5], "label": "4,5"},
-        {"y": 7.23, "x": 4.87, "matrix": [6, 5], "w": 1.25, "label": "6,5"},
-        {"y": 8.23, "x": 1.43, "matrix": [1, 0], "label": "1,0"},
-        {"y": 8.23, "x": 2.43, "matrix": [0, 1], "label": "0,1"},
-        {"y": 8.23, "x": 3.43, "matrix": [1, 1], "label": "1,1"},
-        {"y": 8.23, "x": 4.430000000000001, "matrix": [0, 2], "label": "0,2"},
-        {"y": 9.23, "x": 1.68, "matrix": [3, 0], "label": "3,0"},
-        {"y": 9.23, "x": 2.68, "matrix": [2, 1], "label": "2,1"},
-        {"y": 9.23, "x": 3.68, "matrix": [3, 1], "label": "3,1"},
-        {"y": 9.23, "x": 4.680000000000001, "matrix": [2, 2], "label": "2,2"},
-        {"y": 10.23, "x": 2.18, "matrix": [5, 0], "label": "5,0"},
-        {"y": 10.23, "x": 3.18, "matrix": [4, 1], "label": "4,1"},
-        {"y": 10.23, "x": 4.180000000000001, "matrix": [5, 1], "label": "5,1"},
-        {"y": 10.23, "x": 5.180000000000001, "matrix": [4, 2], "label": "4,2"},
-        {"y": 11.23, "x": 2.93, "matrix": [6, 1], "label": "6,1"},
-        {"y": 11.23, "x": 3.93, "matrix": [6, 2], "w": 2.25, "label": "6,2"},
-        {"y": 9.89, "x": 5.930000000000001, "matrix": [1, 2], "label": "1,2"},
-        {"y": 9.89, "x": 6.930000000000001, "matrix": [0, 3], "label": "0,3"},
-        {"y": 9.89, "x": 7.930000000000001, "matrix": [1, 3], "label": "1,3"},
-        {"y": 9.89, "x": 8.93, "matrix": [0, 4], "label": "0,4"},
-        {"y": 10.89, "x": 6.180000000000001, "matrix": [3, 2], "label": "3,2"},
-        {"y": 10.89, "x": 7.180000000000001, "matrix": [2, 3], "label": "2,3"},
-        {"y": 10.89, "x": 8.18, "matrix": [3, 3], "label": "3,3"},
-        {"y": 10.89, "x": 9.18, "matrix": [2, 4], "label": "2,4"},
-        {"y": 11.89, "x": 5.680000000000001, "matrix": [5, 2], "label": "5,2"},
-        {"y": 11.89, "x": 6.680000000000001, "matrix": [4, 3], "label": "4,3"},
-        {"y": 11.89, "x": 7.680000000000001, "matrix": [5, 3], "label": "5,3"},
-        {"y": 11.89, "x": 8.68, "matrix": [4, 4], "label": "4,4"},
-        {"y": 12.89, "x": 5.680000000000001, "matrix": [6, 3], "w": 2, "label": "6,3"},
-        {"y": 12.89, "x": 7.680000000000001, "matrix": [6, 4], "label": "6,4"}
+        {"y": 0, "x": 0, "matrix": [0, 0], "label": "0,0"},
+        {"y": 0, "x": 1, "matrix": [1, 0], "label": "1,0"},
+        {"y": 0, "x": 2, "matrix": [0, 1], "label": "0,1"},
+        {"y": 0, "x": 3, "matrix": [1, 1], "label": "1,1"},
+        {"y": 0, "x": 4, "matrix": [0, 2], "label": "0,2"},
+        {"y": 0, "x": 6.25, "matrix": [1, 2], "label": "1,2"},
+        {"y": 0, "x": 7.25, "matrix": [0, 3], "label": "0,3"},
+        {"y": 0, "x": 8.25, "matrix": [1, 3], "label": "1,3"},
+        {"y": 0, "x": 9.25, "matrix": [0, 4], "label": "0,4"},
+        {"y": 0, "x": 10.25, "matrix": [1, 4], "label": "1,4"},
+        {"y": 0, "x": 11.25, "matrix": [0, 5], "label": "0,5"},
+        {"y": 1, "x": 0, "matrix": [2, 0], "w": 1.25, "label": "2,0"},
+        {"y": 1, "x": 1.25, "matrix": [3, 0], "label": "3,0"},
+        {"y": 1, "x": 2.25, "matrix": [2, 1], "label": "2,1"},
+        {"y": 1, "x": 3.25, "matrix": [3, 1], "label": "3,1"},
+        {"y": 1, "x": 4.25, "matrix": [2, 2], "label": "2,2"},
+        {"y": 1, "x": 6.5, "matrix": [3, 2], "label": "3,2"},
+        {"y": 1, "x": 7.5, "matrix": [2, 3], "label": "2,3"},
+        {"y": 1, "x": 8.5, "matrix": [3, 3], "label": "3,3"},
+        {"y": 1, "x": 9.5, "matrix": [2, 4], "label": "2,4"},
+        {"y": 1, "x": 10.5, "matrix": [2, 5], "w": 1.75, "label": "2,5"},
+        {"y": 2, "x": 0, "matrix": [4, 0], "w": 1.75, "label": "4,0"},
+        {"y": 2, "x": 1.75, "matrix": [5, 0], "label": "5,0"},
+        {"y": 2, "x": 2.75, "matrix": [4, 1], "label": "4,1"},
+        {"y": 2, "x": 3.75, "matrix": [5, 1], "label": "5,1"},
+        {"y": 2, "x": 4.75, "matrix": [4, 2], "label": "4,2"},
+        {"y": 2, "x": 6, "matrix": [5, 2], "label": "5,2"},
+        {"y": 2, "x": 7, "matrix": [4, 3], "label": "4,3"},
+        {"y": 2, "x": 8, "matrix": [5, 3], "label": "5,3"},
+        {"y": 2, "x": 9, "matrix": [4, 4], "label": "4,4"},
+        {"y": 3, "x": 0, "matrix": [6, 0], "w": 1.25, "label": "6,0"},
+        {"y": 3, "x": 2.5, "matrix": [6, 1], "label": "6,1"},
+        {"y": 3, "x": 3.5, "matrix": [6, 2], "w": 2.25, "label": "6,2"},
+        {"y": 3, "x": 6, "matrix": [6, 3], "w": 2, "label": "6,3"},
+        {"y": 3, "x": 8, "matrix": [6, 4], "label": "6,4"},
+        {"y": 6, "x": 3.75, "matrix": [5, 4], "w": 1.25, "label": "5,4"},
+        {"y": 6, "x": 5, "matrix": [4, 5], "label": "4,5"},
+        {"y": 7, "x": 4.75, "matrix": [6, 5], "w": 1.25, "label": "6,5"}
       ]
     }
   }
diff --git a/keyboards/nachie/evelyn/keymaps/vial/vial.json b/keyboards/nachie/evelyn/keymaps/vial/vial.json
index 4597db1978..34376bd1ac 100644
--- a/keyboards/nachie/evelyn/keymaps/vial/vial.json
+++ b/keyboards/nachie/evelyn/keymaps/vial/vial.json
@@ -1,5 +1,5 @@
 {
-  "name": "Syndrome",
+  "name": "Evelyn",
   "vendorId": "0x4B43",
   "productId": "0x6F75",
   "matrix": { "rows": 7, "cols": 6 },
@@ -16,15 +16,7 @@
     "keymap": [
       [
         {
-          "y": 0.16,
-          "x": 12.25
-        },
-        "1,0\n\n\n\n\n\n\n\n\ne",
-        "1,1\n\n\n\n\n\n\n\n\ne"
-      ],
-      [
-        {
-          "y": -0.9199999999999999,
+          "y": 0.24,
           "x": 0.3,
           "c": "#ffffff",
           "t": "#2e2525"
@@ -59,7 +51,7 @@
       [
         {
           "y": -0.9899999999999998,
-          "x": 12.73,
+          "x": 10.23,
           "w": 2.25
         },
         "5,4\n\n\n0,1"
@@ -72,28 +64,11 @@
         },
         "6,0"
       ],
-      [
-        {
-          "y": 0.6799999999999997,
-          "x": 3.5,
-          "c": "#cccccc",
-          "t": "#000000"
-        },
-        "2,0\n\n\n\n\n\n\n\n\ne",
-        "2,1\n\n\n\n\n\n\n\n\ne",
-        {
-          "x": 0.75
-        },
-        "3,0\n\n\n\n\n\n\n\n\ne",
-        "3,1\n\n\n\n\n\n\n\n\ne"
-      ],
       [
         {
           "rx": 6.25,
           "y": 2.24,
           "x": 3.9800000000000004,
-          "c": "#ffffff",
-          "t": "#2e2525",
           "w": 1.25
         },
         "5,4\n\n\n0,0",
@@ -141,19 +116,20 @@
         },
         "6,1\n\n\n1,0",
         {
-          "w": 2.25
-        },
-        "6,2\n\n\n1,0"
-      ],
-      [
-        {
-          "x": 2.94,
+          "x": -1,
           "t": "#000000",
           "w": 1.5
         },
         "6,1\n\n\n1,1",
         {
-          "x": 8.881784197001252e-16,
+          "x": -0.49999999999999956,
+          "t": "#2e2525",
+          "w": 2.25
+        },
+        "6,2\n\n\n1,0",
+        {
+          "x": -1.7499999999999991,
+          "t": "#000000",
           "w": 1.75
         },
         "6,2\n\n\n1,1"
@@ -161,7 +137,7 @@
       [
         {
           "r": -8,
-          "y": -3.34,
+          "y": -2.34,
           "x": 5.9399999999999995,
           "t": "#2e2525"
         },
@@ -194,11 +170,8 @@
           "w": 2
         },
         "6,3\n\n\n2,0",
-        "6,4\n\n\n2,0"
-      ],
-      [
         {
-          "x": 5.69,
+          "x": -2,
           "t": "#000000",
           "w": 1.75
         },
@@ -206,7 +179,12 @@
         {
           "w": 1.25
         },
-        "6,4\n\n\n2,1"
+        "6,4\n\n\n2,1",
+        {
+          "x": -1.0000000000000009,
+          "t": "#2e2525"
+        },
+        "6,4\n\n\n2,0"
       ]
     ]
   }
diff --git a/keyboards/nachie/evelyn/readme.md b/keyboards/nachie/evelyn/readme.md
index 2259be9671..1ba064a734 100644
--- a/keyboards/nachie/evelyn/readme.md
+++ b/keyboards/nachie/evelyn/readme.md
@@ -1,23 +1,23 @@
-# Båge
+# Evelyn
 
-Firmware for the Båge
+Firmware for the Evelyn pcb
 
 * Keyboard Maintainer: [nachie](https://github.com/nachie)
 * Hardware Supported: Båge
-* Hardware Availability: [nachie](https://littlecraftery.com/products/Båge)
+* Hardware Availability: [nachie](https://littlecraftery.com/products/evelyn)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make nachie/syndrome:default
+    make nachie/evelyn:default
 
 Or to make and flash:
 
-    make nachie/syndrome:default:flash
+    make nachie/evelyn:default:flash
 
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 
 ## Bootloader
 
-* **Bootmagic reset**: Hold down ESC key (top left) and plug in the keyboard
-* **Physical reset button**: Briefly press the button labeled "SW_RST1" on the back of the PCB
+* **Bootmagic reset**: Hold down Q key (top left) and plug in the keyboard
+* **Physical reset button**: Press and hold reset, press and hold boot, let go off reset while holding boot