From 4dcca8f3a5877407fcf73ce7572457f5f68f8d21 Mon Sep 17 00:00:00 2001
From: Micah <micahyy@qq.com>
Date: Mon, 23 Sep 2024 11:50:59 +0800
Subject: [PATCH] update DS17

---
 keyboards/czmao/ds17/keyboard.json | 24 +++++++++++-------------
 keyboards/czmao/ds17/readme.md     | 25 ++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/keyboards/czmao/ds17/keyboard.json b/keyboards/czmao/ds17/keyboard.json
index 88e505b9b3b..33844a9540a 100644
--- a/keyboards/czmao/ds17/keyboard.json
+++ b/keyboards/czmao/ds17/keyboard.json
@@ -1,14 +1,14 @@
 {
-    "keyboard_name": "mao_10_DS17_ST",
+    "keyboard_name": "mao_11_DS17R2_A14",
     "manufacturer": "CZMAO",
-    "url": "NONE",
+    "url": "https://github.com/micahyy/czmao/tree/main/ds17_solder",
     "maintainer": "MAOKB",
     "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
     "usb": {
-      "vid": "0x4E17",
-      "pid": "0x4E17",
+      "vid": "0x4A14",
+      "pid": "0x4A14",
       "device_version": "1.0.0"
     },
     "features": {
@@ -18,17 +18,13 @@
         "extrakey": true,
         "mousekey": true,
         "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false,
-        "encoder": false
+        "rgb_matrix": true
     },
     "dynamic_keymap": {
       "layer_count": 10
     },
     
-    "bootmagic": {
-      "matrix" : [0,0]
-    },
+
     
     
     "matrix_pins": {
@@ -119,19 +115,21 @@
           {"label":"P7","matrix": [ 1,0],"x":0,"y":1},
           {"label":"P8","matrix": [ 1,1],"x":1,"y":1},
           {"label":"P9","matrix": [ 1,2],"x":2,"y":1},
-          {"label":"PPLS","matrix": [ 1,3],"x":3,"y":1},
+
           
           {"label":"P4","matrix": [ 2,0],"x":2,"y":1},
           {"label":"P5","matrix": [ 2,1],"x":3,"y":1},
           {"label":"P6","matrix": [ 2,2],"x":4,"y":1},
+          {"label":"PPLS","matrix": [ 1,3],"x":3,"y":1,"h":2},
           
           {"label":"P1","matrix": [ 3,0],"x":0,"y":2},
           {"label":"P2","matrix": [ 3,1],"x":1,"y":2},
           {"label":"P3","matrix": [ 3,2],"x":2,"y":2},
-          {"label":"PENT","matrix": [ 3,3],"x":3,"y":2},
+
           
           {"label":"P0","matrix": [ 4,0],"x":0,"y":3},
-          {"label":"PDOT","matrix": [ 4,2],"x":1,"y":3}
+          {"label":"PDOT","matrix": [ 4,2],"x":1,"y":3},
+          {"label":"PENT","matrix": [ 3,3],"x":3,"y":2,"h":2}
           
           
           
diff --git a/keyboards/czmao/ds17/readme.md b/keyboards/czmao/ds17/readme.md
index 49ddb45220f..c563babeda4 100644
--- a/keyboards/czmao/ds17/readme.md
+++ b/keyboards/czmao/ds17/readme.md
@@ -1,7 +1,7 @@
 # mao ds 17
 
 
-3D  print case , taobao link below
+3D print case , taobao link below
 
 [link](https://item.taobao.com/item.htm?ft=t&id=819874589305&sku_properties=5919063:3266779;122216346:21959;122216808:10491261)
 
@@ -9,3 +9,26 @@
     make czmao/ds17:default
 
 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).
+
+
+
+
+* Keyboard Maintainer: [CZMAO](https://github.com/smollchungus)
+* Hardware Supported: *Project W PCB*
+* Hardware Availability: *CZMAO Keyboards*
+
+Make example for this keyboard (after setting up your build environment):
+
+    make czmao/ds17:default
+
+
+
+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 (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available