From 68a27b8e9298773712b41424e6c8a97a56a923e1 Mon Sep 17 00:00:00 2001
From: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date: Wed, 29 Mar 2023 16:16:20 -0400
Subject: [PATCH] [jacky_studio/piggy60] move AVR PCB under rev1 (#20253)

---
 data/mappings/keyboard_aliases.hjson          |  3 ++
 keyboards/jacky_studio/piggy60/info.json      | 54 +------------------
 keyboards/jacky_studio/piggy60/readme.md      |  4 +-
 .../piggy60/{ => rev1}/hotswap/info.json      |  0
 .../piggy60/{ => rev1}/hotswap/rules.mk       |  0
 keyboards/jacky_studio/piggy60/rev1/info.json | 45 ++++++++++++++++
 keyboards/jacky_studio/piggy60/rev1/rules.mk  |  1 +
 .../piggy60/{ => rev1}/solder/info.json       |  0
 .../piggy60/{ => rev1}/solder/rules.mk        |  0
 keyboards/jacky_studio/piggy60/rules.mk       |  2 +-
 10 files changed, 54 insertions(+), 55 deletions(-)
 rename keyboards/jacky_studio/piggy60/{ => rev1}/hotswap/info.json (100%)
 rename keyboards/jacky_studio/piggy60/{ => rev1}/hotswap/rules.mk (100%)
 create mode 100644 keyboards/jacky_studio/piggy60/rev1/info.json
 create mode 100644 keyboards/jacky_studio/piggy60/rev1/rules.mk
 rename keyboards/jacky_studio/piggy60/{ => rev1}/solder/info.json (100%)
 rename keyboards/jacky_studio/piggy60/{ => rev1}/solder/rules.mk (100%)

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 5fe31c4fb1..e26f38010a 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -248,6 +248,9 @@
     "idobo": {
         "target": "idobao/id75"
     },
+    "jacky_studio/piggy60": {
+        "target": "jacky_studio/piggy60/rev1"
+    },
     "jj40": {
         "target": "kprepublic/jj40"
     },
diff --git a/keyboards/jacky_studio/piggy60/info.json b/keyboards/jacky_studio/piggy60/info.json
index a3c7f5eb41..a77368e94d 100644
--- a/keyboards/jacky_studio/piggy60/info.json
+++ b/keyboards/jacky_studio/piggy60/info.json
@@ -1,60 +1,10 @@
 {
     "manufacturer": "Jacky",
-    "keyboard_name": "Piggy60",
     "maintainer": "qmk",
-    "bootloader": "atmel-dfu",
-    "build": {
-        "lto": true
-    },
-    "features": {
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "caps_word": true,
-        "debug": false,
-        "extrakey": true,
-        "mousekey": true,
-        "rgblight": true,
-        "nkro": true
-    },
-     "matrix_pins": {
-        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"],
-        "rows": ["D0", "D1", "D2", "D3", "D5"]
-    },
-    "processor": "atmega32u4",
-    "url": "https://www.notion.so/Piggy-60-Everything-You-Should-Know-7308d056551d4edabdbcc95748e9dabc",
     "usb": {
-        "device_version": "1.0.0",
-        "vid": "0xA13B",
-        "pid": "0x1001"
-    },
-    "indicators": {
-        "caps_lock": "F4",
-        "on_state": 0
-    },
-    "rgblight": {
-        "led_count": 14,
-        "pin": "E2",
-        "animations": {
-            "alternating": true,
-            "breathing": true,
-            "christmas": true,
-            "knight": true,
-            "rainbow_mood": true,
-            "rainbow_swirl": true,
-            "rgb_test": true,
-            "snake": true,
-            "static_gradient": true,
-            "twinkle": true
-        },
-        "sleep": true,
-        "max_brightness": 255
-    },
-    "tapping": {
-        "tap_keycode_delay": 10,
-        "tap_capslock_delay": 10,
-        "term": 170
+        "vid": "0xA13B"
     },
+    "url": "https://www.notion.so/Piggy-60-Everything-You-Should-Know-7308d056551d4edabdbcc95748e9dabc",
     "layouts": {
         "LAYOUT_all": {
             "layout": [
diff --git a/keyboards/jacky_studio/piggy60/readme.md b/keyboards/jacky_studio/piggy60/readme.md
index bae776deba..f4a998402f 100644
--- a/keyboards/jacky_studio/piggy60/readme.md
+++ b/keyboards/jacky_studio/piggy60/readme.md
@@ -11,11 +11,11 @@ A gasket-mounted 60% in the style of the S7 Elephant.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make jacky_studio/piggy60:default
+    make jacky_studio/piggy60/rev1:default
 
 Flashing example for this keyboard:
 
-    make jacky_studio/piggy60:default:flash
+    make jacky_studio/piggy60/rev1: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).
 
diff --git a/keyboards/jacky_studio/piggy60/hotswap/info.json b/keyboards/jacky_studio/piggy60/rev1/hotswap/info.json
similarity index 100%
rename from keyboards/jacky_studio/piggy60/hotswap/info.json
rename to keyboards/jacky_studio/piggy60/rev1/hotswap/info.json
diff --git a/keyboards/jacky_studio/piggy60/hotswap/rules.mk b/keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk
similarity index 100%
rename from keyboards/jacky_studio/piggy60/hotswap/rules.mk
rename to keyboards/jacky_studio/piggy60/rev1/hotswap/rules.mk
diff --git a/keyboards/jacky_studio/piggy60/rev1/info.json b/keyboards/jacky_studio/piggy60/rev1/info.json
new file mode 100644
index 0000000000..de22bead9e
--- /dev/null
+++ b/keyboards/jacky_studio/piggy60/rev1/info.json
@@ -0,0 +1,45 @@
+{
+    "keyboard_name": "Piggy60 rev1",
+    "bootloader": "atmel-dfu",
+    "build": {
+        "lto": true
+    },
+     "matrix_pins": {
+        "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "F7", "B5", "B4", "D7", "D6", "B3", "B2"],
+        "rows": ["D0", "D1", "D2", "D3", "D5"]
+    },
+    "processor": "atmega32u4",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0x1001"
+    },
+    "features": {
+        "bootmagic": true,
+        "caps_word": true,
+        "extrakey": true,
+        "mousekey": true,
+        "rgblight": true,
+        "nkro": true
+    },
+    "indicators": {
+        "caps_lock": "F4",
+        "on_state": 0
+    },
+    "rgblight": {
+        "led_count": 14,
+        "pin": "E2",
+        "animations": {
+            "alternating": true,
+            "breathing": true,
+            "christmas": true,
+            "knight": true,
+            "rainbow_mood": true,
+            "rainbow_swirl": true,
+            "rgb_test": true,
+            "snake": true,
+            "static_gradient": true,
+            "twinkle": true
+        },
+        "sleep": true
+    }
+}
diff --git a/keyboards/jacky_studio/piggy60/rev1/rules.mk b/keyboards/jacky_studio/piggy60/rev1/rules.mk
new file mode 100644
index 0000000000..873e9334ed
--- /dev/null
+++ b/keyboards/jacky_studio/piggy60/rev1/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = jacky_studio/piggy60/rev1/solder
diff --git a/keyboards/jacky_studio/piggy60/solder/info.json b/keyboards/jacky_studio/piggy60/rev1/solder/info.json
similarity index 100%
rename from keyboards/jacky_studio/piggy60/solder/info.json
rename to keyboards/jacky_studio/piggy60/rev1/solder/info.json
diff --git a/keyboards/jacky_studio/piggy60/solder/rules.mk b/keyboards/jacky_studio/piggy60/rev1/solder/rules.mk
similarity index 100%
rename from keyboards/jacky_studio/piggy60/solder/rules.mk
rename to keyboards/jacky_studio/piggy60/rev1/solder/rules.mk
diff --git a/keyboards/jacky_studio/piggy60/rules.mk b/keyboards/jacky_studio/piggy60/rules.mk
index 530e6598df..873e9334ed 100644
--- a/keyboards/jacky_studio/piggy60/rules.mk
+++ b/keyboards/jacky_studio/piggy60/rules.mk
@@ -1 +1 @@
-DEFAULT_FOLDER = jacky_studio/piggy60/solder
+DEFAULT_FOLDER = jacky_studio/piggy60/rev1/solder