add dp3000 rev2 featuring rgblight (qmk#22084)

mechlovin · Oct 25, 2023 · e160477 · e160477
1 parent b651c3b
commit e160477
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 60 deletions.
diff --git a/keyboards/dp3000/info.json b/keyboards/dp3000/info.json
@@ -1,6 +1,5 @@
 {
     "manufacturer": "depermana12",
-    "keyboard_name": "dp3000",
     "maintainer": "depermana12",
     "diode_direction": "COL2ROW",
     "development_board": "promicro",
@@ -10,7 +9,6 @@
         "console": false,
         "extrakey": true,
         "encoder": true,
-        "rgb_matrix": true,
         "oled": true,
         "mousekey": false,
         "nkro": false
@@ -20,64 +18,17 @@
     },
     "url": "https://github.com/depermana12",
     "usb": {
-        "device_version": "1.0.1",
-        "vid": "0x4450",
-        "pid": "0x6470"
+        "vid": "0x4450"
     },
     "encoder": {
         "rotary": [
-            { "pin_a": "B2", "pin_b": "B1"},
-            { "pin_a": "F4", "pin_b": "F5"}
+            { "pin_a": "B2", "pin_b": "B1" },
+            { "pin_a": "F4", "pin_b": "F5" }
         ]
     },
-    "ws2812": {
-        "pin": "B5"
-    },
-    "rgb_matrix":{
-        "driver":"ws2812",
-        "max_brightness": 180,
-        "animations": {
-            "alphas_mods": true,
-			"gradient_up_down": true,
-			"gradient_left_right": true,
-			"breathing": true,
-            "band_sat": true,
-			"band_val": true,
-            "band_pinwheel_sat": true,
-            "band_pinwheel_val": true,
-            "band_spiral_sat": true,
-            "band_spiral_val": true,
-            "cycle_all": true,
-            "cycle_left_right": true,
-            "cycle_up_down": true,
-            "rainbow_moving_chevron":true,
-            "cycle_pinwheel": true,
-            "cycle_spiral": true,
-			"raindrops": true,
-			"hue_breathing": true,
-            "hue_pendulum": true,
-            "hue_wave": true,
-            "typing_heatmap": true,
-            "solid_reactive_simple": true,
-			"solid_reactive": true,
-			"solid_reactive_multinexus": true,
-            "splash": true,
-            "solid_splash": true
-        },
-		"layout":[
-            { "matrix": [1, 0], "x":  0, "y": 32, "flags":4 },
-            { "matrix": [1, 1], "x": 25, "y": 32, "flags":4 },
-            { "matrix": [1, 2], "x": 37, "y": 32, "flags":4 },
-            { "matrix": [1, 3], "x": 75, "y": 32, "flags":4 },
-            { "matrix": [2, 0], "x": 75, "y": 16, "flags":4 },
-            { "matrix": [2, 1], "x": 37, "y": 16, "flags":4 },
-            { "matrix": [2, 2], "x": 25, "y": 16, "flags":4 },
-            { "matrix": [2, 3], "x":  0, "y": 16, "flags":4 }
-         ]
-    },
     "matrix_pins": {
-         "cols": ["D4", "D7", "B4", "C6"],
-         "rows": ["F6", "F7", "B3"]
+         "cols": [ "D4", "D7", "B4", "C6" ],
+         "rows": [ "F6", "F7", "B3" ]
     },
     "layouts": {
         "LAYOUT": {

diff --git a/keyboards/dp3000/readme.md b/keyboards/dp3000/readme.md
@@ -3,25 +3,28 @@
 ![dp3000 macropad](https://i.imgur.com/uBHS8EYh.jpg)
 
 dp3000 is a simple yet elegant macropad, 2x4 (8 keys), dual encoder, embedded with an Atmel 32u4 chip, powered by QMK.
-
+* Rev. 1 Support RGB matrix
+* Rev. 2 Support RGB light (underglow)
 * Keyboard Maintainer: [Deddia Permana](https://github.com/depermana12)
-* Hardware Supported: DP3000 PCB, ATmega32u4
+* Hardware Supported: DP3000 PCB rev1 and rev2, ATmega32u4
 * Hardware Availability: [tokopedia.com/gundamtricks](https://www.tokopedia.com/gundamtricks)
 
 Make example for this keyboard (after setting up your build environment):
 
-    make dp3000:default
+    make dp3000/rev1:default
+    make dp3000/rev2:default
 
 Flashing example for this keyboard:
 
-    make dp3000:default:flash
+    make dp3000/rev1:default:flash
+    make dp3000/rev2: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
 
 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
+* Bootmagic reset: Hold down the key at (0,0) in the matrix (left rotary encoder push switch) and plug in the keyboard
 * Physical reset button: Briefly press reset button twice, located in front of the first rotary encoder (left rotary encoder)
 * Keycode in layout: Press the key mapped to QK_BOOT if it is available
diff --git a/keyboards/dp3000/rev1/info.json b/keyboards/dp3000/rev1/info.json
@@ -0,0 +1,59 @@
+{
+    "keyboard_name": "dp3000",
+    "features": {
+        "rgb_matrix": true
+    },
+    "usb": {
+        "device_version": "1.0.1",
+        "pid": "0x6470"
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_sat": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "band_val": true,
+            "breathing": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "cycle_up_down": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "rainbow_moving_chevron": true,
+            "raindrops": true,
+            "solid_color": true,
+            "solid_reactive": true,
+            "solid_reactive_multinexus": true,
+            "solid_reactive_simple": true,
+            "solid_splash": true,
+            "splash": true,
+            "typing_heatmap": true
+        },
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [1, 0], "x": 0, "y": 32, "flags": 4},
+            {"matrix": [1, 1], "x": 25, "y": 32, "flags": 4},
+            {"matrix": [1, 2], "x": 37, "y": 32, "flags": 4},
+            {"matrix": [1, 3], "x": 75, "y": 32, "flags": 4},
+            {"matrix": [2, 0], "x": 75, "y": 16, "flags": 4},
+            {"matrix": [2, 1], "x": 37, "y": 16, "flags": 4},
+            {"matrix": [2, 2], "x": 25, "y": 16, "flags": 4},
+            {"matrix": [2, 3], "x": 0, "y": 16, "flags": 4}
+        ],
+        "max_brightness": 180,
+        "sat_steps": 8,
+        "speed_steps": 10,
+        "val_steps": 8
+    },
+    "ws2812": {
+        "pin": "B5"
+    }
+}
diff --git a/keyboards/dp3000/rev1/rules.mk b/keyboards/dp3000/rev1/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/dp3000/rev2/info.json b/keyboards/dp3000/rev2/info.json
@@ -0,0 +1,31 @@
+{
+    "keyboard_name": "dp3000 rev2",
+    "features": {
+        "rgblight": true
+    },
+    "usb": {
+        "device_version": "2.0.0",
+        "pid": "0x3132"
+    },
+    "rgblight": {
+        "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
+        },
+        "led_count": 4,
+        "max_brightness": 180,
+        "saturation_steps": 8,
+        "sleep": true
+    },
+    "ws2812": {
+        "pin": "B6"
+    }
+}
diff --git a/keyboards/dp3000/rev2/rules.mk b/keyboards/dp3000/rev2/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/dp3000/rules.mk b/keyboards/dp3000/rules.mk
@@ -1 +1 @@
-# This file intentionally left blank
+DEFAULT_FOLDER = dp3000/rev1
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		# This file intentionally left blank
		DEFAULT_FOLDER = dp3000/rev1