From 30c0036db116dabed9d0a93b913918f38c615f13 Mon Sep 17 00:00:00 2001
From: Pham Duc Minh <95753855+Deemen17@users.noreply.github.com>
Date: Mon, 7 Apr 2025 00:53:13 +0700
Subject: [PATCH] Refactor Deemen17 Works DE60 (#25088)

---
 data/mappings/keyboard_aliases.hjson            |  3 +++
 keyboards/deemen17/{de60fs => de60/r1}/config.h |  0
 .../deemen17/{de60fs => de60/r1}/keyboard.json  |  4 ++--
 .../r1}/keymaps/default/keymap.c                |  0
 .../deemen17/{de60fs => de60/r1}/readme.md      |  8 ++++----
 keyboards/deemen17/de60/readme.md               | 17 +++++++++++++++++
 6 files changed, 26 insertions(+), 6 deletions(-)
 rename keyboards/deemen17/{de60fs => de60/r1}/config.h (100%)
 rename keyboards/deemen17/{de60fs => de60/r1}/keyboard.json (99%)
 rename keyboards/deemen17/{de60fs => de60/r1}/keymaps/default/keymap.c (100%)
 rename keyboards/deemen17/{de60fs => de60/r1}/readme.md (89%)
 create mode 100644 keyboards/deemen17/de60/readme.md

diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 4d8be703c34..0a640fd3e0a 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -146,6 +146,9 @@
     "daisy": {
         "target": "ktec/daisy"
     },
+    "deemen17/de60": {
+        "target": "deemen17/de60/r1"
+    },
     "dp3000": {
         "target": "dp3000/rev1"
     },
diff --git a/keyboards/deemen17/de60fs/config.h b/keyboards/deemen17/de60/r1/config.h
similarity index 100%
rename from keyboards/deemen17/de60fs/config.h
rename to keyboards/deemen17/de60/r1/config.h
diff --git a/keyboards/deemen17/de60fs/keyboard.json b/keyboards/deemen17/de60/r1/keyboard.json
similarity index 99%
rename from keyboards/deemen17/de60fs/keyboard.json
rename to keyboards/deemen17/de60/r1/keyboard.json
index 573c012baaf..62de2691ce0 100644
--- a/keyboards/deemen17/de60fs/keyboard.json
+++ b/keyboards/deemen17/de60/r1/keyboard.json
@@ -1,6 +1,6 @@
 {
-    "manufacturer": "Deemen17",
-    "keyboard_name": "De60fs",
+    "manufacturer": "Deemen17 Works",
+    "keyboard_name": "DE60 R1",
     "maintainer": "Deemen17",
     "bootloader": "rp2040",
     "build": {
diff --git a/keyboards/deemen17/de60fs/keymaps/default/keymap.c b/keyboards/deemen17/de60/r1/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/deemen17/de60fs/keymaps/default/keymap.c
rename to keyboards/deemen17/de60/r1/keymaps/default/keymap.c
diff --git a/keyboards/deemen17/de60fs/readme.md b/keyboards/deemen17/de60/r1/readme.md
similarity index 89%
rename from keyboards/deemen17/de60fs/readme.md
rename to keyboards/deemen17/de60/r1/readme.md
index e5135691a85..e71a2fc4123 100644
--- a/keyboards/deemen17/de60fs/readme.md
+++ b/keyboards/deemen17/de60/r1/readme.md
@@ -1,6 +1,6 @@
-# De60fs
+# DE60 Round 1
 
-![De60fs](https://i.imgur.com/7hpYaoXh.jpg)
+![DE60 R1](https://i.imgur.com/7hpYaoXh.jpg)
 
 A GH60 form factor PCB for 60% keyboards. Uses a Left USB Type C connector or 5 JST SH positions for daughter board.
 
@@ -10,11 +10,11 @@ A GH60 form factor PCB for 60% keyboards. Uses a Left USB Type C connector or 5
 
 Make example for this keyboard (after setting up your build environment):
 
-    make deemen17/de60fs:default
+    make deemen17/de60/r1:default
 
 Flashing example for this keyboard:
 
-    make deemen17/de60fs:default:flash
+    make deemen17/de60/r1: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/deemen17/de60/readme.md b/keyboards/deemen17/de60/readme.md
new file mode 100644
index 00000000000..c5ea64a6a60
--- /dev/null
+++ b/keyboards/deemen17/de60/readme.md
@@ -0,0 +1,17 @@
+# DE60
+
+Deemen17 Works's 60% PCB Platform, which works as the base for our 60%-layout PCB designs.
+
+* Keyboard Maintainer: [Deemen17](https://github.com/Deemen17)
+* Hardware Supported: DE60 PCBs
+* Hardware Availability: [Deemen17 Facebook Page](https://www.facebook.com/deemen17/), [Deemen17 Works Instagram](https://www.instagram.com/deemen17.works)
+
+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
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (ESC/Escape) and plug in the keyboard
+* **Physical reset button**: Double tap the button RESET on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file