From 1ec73e9651bb3eca2aaed5172f8611964854db9b Mon Sep 17 00:00:00 2001
From: era <73109780+eerraa@users.noreply.github.com>
Date: Mon, 24 Jul 2023 16:19:37 +0900
Subject: [PATCH] [Keyboard] Update ERA65 PCB (#21592)

---
 keyboards/era/era65/config.h  |  2 --
 keyboards/era/era65/info.json | 50 ++++++++++++++++++++---------------
 2 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/keyboards/era/era65/config.h b/keyboards/era/era65/config.h
index 41dbe2178a..bd42a703f8 100644
--- a/keyboards/era/era65/config.h
+++ b/keyboards/era/era65/config.h
@@ -19,8 +19,6 @@
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 
-#define DYNAMIC_KEYMAP_LAYER_COUNT 6
-
 #define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
 
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET // Activates the double-tap behavior
diff --git a/keyboards/era/era65/info.json b/keyboards/era/era65/info.json
index 5c545a6fa8..d5fd612767 100644
--- a/keyboards/era/era65/info.json
+++ b/keyboards/era/era65/info.json
@@ -2,16 +2,30 @@
     "manufacturer": "ERA",
     "keyboard_name": "ERA65 1.0.4",
     "maintainer": "eerraa",
+    "backlight": {
+        "breathing": true,
+        "levels": 15,
+        "pin": "GP0"
+    },
     "bootloader": "rp2040",
+    "build": {
+        "debounce_type": "sym_defer_pk"
+    },
     "diode_direction": "COL2ROW",
+    "dynamic_keymap": {
+        "layer_count": 6
+    },
     "features": {
+        "backlight": true,
         "bootmagic": true,
         "command": false,
         "console": false,
         "extrakey": true,
         "mousekey": true,
-        "nkro": true,
-        "backlight": true
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "GP12"
     },
     "matrix_pins": {
         "cols": ["GP29", "GP28", "GP27", "GP26", "GP25", "GP24", "GP21", "GP20", "GP19", "GP18", "GP17", "GP16", "GP22", "GP23", "GP3"],
@@ -24,14 +38,6 @@
         "pid": "0x0001",
         "vid": "0x4552"
     },
-    "backlight": {
-        "breathing": true,
-        "levels": 15,
-        "pin": "GP0"
-    },
-    "indicators": {
-        "caps_lock": "GP12"
-    },
     "layouts": {
         "LAYOUT_65_combo": {
             "layout": [
@@ -48,9 +54,9 @@
                 {"matrix": [0, 10], "x": 10, "y": 0},
                 {"matrix": [0, 11], "x": 11, "y": 0},
                 {"matrix": [0, 12], "x": 12, "y": 0},
-                {"matrix": [0, 13], "w": 2, "x": 13, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
                 {"matrix": [0, 14], "x": 15.5, "y": 0},
-                {"matrix": [1, 0], "w": 1.5, "x": 0, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
                 {"matrix": [1, 1], "x": 1.5, "y": 1},
                 {"matrix": [1, 2], "x": 2.5, "y": 1},
                 {"matrix": [1, 3], "x": 3.5, "y": 1},
@@ -63,9 +69,9 @@
                 {"matrix": [1, 10], "x": 10.5, "y": 1},
                 {"matrix": [1, 11], "x": 11.5, "y": 1},
                 {"matrix": [1, 12], "x": 12.5, "y": 1},
-                {"matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
                 {"matrix": [1, 14], "x": 15.5, "y": 1},
-                {"matrix": [2, 0], "w": 1.75, "x": 0, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
                 {"matrix": [2, 1], "x": 1.75, "y": 2},
                 {"matrix": [2, 2], "x": 2.75, "y": 2},
                 {"matrix": [2, 3], "x": 3.75, "y": 2},
@@ -78,9 +84,9 @@
                 {"matrix": [2, 10], "x": 10.75, "y": 2},
                 {"matrix": [2, 11], "x": 11.75, "y": 2},
                 {"matrix": [2, 12], "x": 12.75, "y": 2},
-                {"matrix": [2, 13], "w": 1.25, "x": 13.75, "y": 2},
+                {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25},
                 {"matrix": [2, 14], "x": 15.5, "y": 2},
-                {"matrix": [3, 0], "w": 1.25, "x": 0, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
                 {"matrix": [3, 1], "x": 1.25, "y": 3},
                 {"matrix": [3, 2], "x": 2.25, "y": 3},
                 {"matrix": [3, 3], "x": 3.25, "y": 3},
@@ -92,13 +98,13 @@
                 {"matrix": [3, 9], "x": 9.25, "y": 3},
                 {"matrix": [3, 10], "x": 10.25, "y": 3},
                 {"matrix": [3, 11], "x": 11.25, "y": 3},
-                {"matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3},
+                {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
                 {"matrix": [3, 13], "x": 14.25, "y": 3.25},
                 {"matrix": [3, 14], "x": 15.5, "y": 3},
-                {"matrix": [4, 0], "w": 1.25, "x": 0, "y": 4},
-                {"matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4},
-                {"matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4},
-                {"matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
                 {"matrix": [4, 9], "x": 10, "y": 4},
                 {"matrix": [4, 10], "x": 11, "y": 4},
                 {"matrix": [4, 11], "x": 12, "y": 4},
@@ -108,4 +114,4 @@
             ]
         }
     }
-}
+}
\ No newline at end of file