crkbd - added the rp2040 revision

jankuzniak · Feb 6, 2024 · 2e72356 · 2e72356
1 parent 6818ea0
commit 2e72356
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 59 deletions.
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json
@@ -8,9 +8,6 @@
         "pid": "0x0001",
         "device_version": "0.0.1"
     },
-    "rgb_matrix": {
-        "driver": "ws2812"
-    },
     "features": {
         "bootmagic": true,
         "extrakey": true,
@@ -23,13 +20,14 @@
         "lto": true
     },
     "matrix_pins": {
-        "cols": [ "F4", "F5", "F6", "F7", "B1", "B3" ],
-        "rows": [ "D4", "C6", "D7", "E6" ]
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20"],
+        "rows": [ "GP4", "GP5", "GP6", "GP7" ]
     },
     "diode_direction": "COL2ROW",
     "split": {
         "enabled": true
     },
-    "processor": "atmega32u4",
     "community_layouts": [ "split_3x5_3", "split_3x6_3" ]
+    "processor": "RP2040",
+    "bootloader": "rp2040"
 }
diff --git a/keyboards/crkbd/keymaps/default/config.h b/keyboards/crkbd/keymaps/default/config.h
@@ -22,6 +22,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#define USE_MATRIX_I2C
 
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 250U
+
 /* Select hand configuration */
 
 #define MASTER_LEFT

diff --git a/keyboards/crkbd/rev2/info.json b/keyboards/crkbd/rev2/info.json
@@ -1,12 +1,34 @@
 {
-    "processor": "RP2040",
-    "bootloader": "rp2040",
-    "features": {
-        "rgblight": true
+    "keyboard_name": "Corne",
+    "manufacturer": "foostan",
+    "url": "",
+    "maintainer": "qmk",
+    "usb": {
+        "vid": "0x4653",
+        "pid": "0x0001",
+        "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["GP29", "GP28", "GP27", "GP26", "GP22", "GP20"],
+        "rows": [ "GP4", "GP5", "GP6", "GP7" ]
+    },
+    "diode_direction": "COL2ROW",
     "split": {
         "soft_serial_pin": "GP1"
     },
+
+    "processor": "RP2040",
+    "bootloader": "rp2040",
+
+    "features": {
+        "rgblight": true,
+        "bootmagic": false,
+        "extrakey": true,
+        "lto": false,
+        "mousekey": false,
+        "nkro": false,
+        "oled": true
+    },
     "rgblight": {
         "led_count": 54,
         "split_count": [27, 27]
@@ -15,6 +37,7 @@
         "pin": "GP0"
     },
     "rgb_matrix": {
+        "driver": "ws2812",
         "layout": [
             {"x": 85, "y": 16, "flags": 2},
             {"x": 50, "y": 13, "flags": 2},
@@ -72,58 +95,10 @@
             {"matrix": [6, 0], "x": 224, "y": 41, "flags": 1}
         ]
     },
-    "development_board": "promicro",
     "layout_aliases": {
         "LAYOUT": "LAYOUT_split_3x6_3"
     },
     "layouts": {
-        "LAYOUT_split_3x5_3": {
-            "layout": [
-                {"matrix": [0, 1], "x": 0, "y": 0.3},
-                {"matrix": [0, 2], "x": 1, "y": 0.1},
-                {"matrix": [0, 3], "x": 2, "y": 0},
-                {"matrix": [0, 4], "x": 3, "y": 0.1},
-                {"matrix": [0, 5], "x": 4, "y": 0.2},
-
-                {"matrix": [4, 5], "x": 8, "y": 0.2},
-                {"matrix": [4, 4], "x": 9, "y": 0.1},
-                {"matrix": [4, 3], "x": 10, "y": 0},
-                {"matrix": [4, 2], "x": 11, "y": 0.1},
-                {"matrix": [4, 1], "x": 12, "y": 0.3},
-
-                {"matrix": [1, 1], "x": 0, "y": 1.3},
-                {"matrix": [1, 2], "x": 1, "y": 1.1},
-                {"matrix": [1, 3], "x": 2, "y": 1},
-                {"matrix": [1, 4], "x": 3, "y": 1.1},
-                {"matrix": [1, 5], "x": 4, "y": 1.2},
-
-                {"matrix": [5, 5], "x": 8, "y": 1.2},
-                {"matrix": [5, 4], "x": 9, "y": 1.1},
-                {"matrix": [5, 3], "x": 10, "y": 1},
-                {"matrix": [5, 2], "x": 11, "y": 1.1},
-                {"matrix": [5, 1], "x": 12, "y": 1.3},
-
-                {"matrix": [2, 1], "x": 0, "y": 2.3},
-                {"matrix": [2, 2], "x": 1, "y": 2.1},
-                {"matrix": [2, 3], "x": 2, "y": 2},
-                {"matrix": [2, 4], "x": 3, "y": 2.1},
-                {"matrix": [2, 5], "x": 4, "y": 2.2},
-
-                {"matrix": [6, 5], "x": 8, "y": 2.2},
-                {"matrix": [6, 4], "x": 9, "y": 2.1},
-                {"matrix": [6, 3], "x": 10, "y": 2},
-                {"matrix": [6, 2], "x": 11, "y": 2.1},
-                {"matrix": [6, 1], "x": 12, "y": 2.3},
-
-                {"matrix": [3, 3], "x": 3, "y": 3.7},
-                {"matrix": [3, 4], "x": 4, "y": 3.7},
-                {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
-
-                {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
-                {"matrix": [7, 4], "x": 8, "y": 3.7},
-                {"matrix": [7, 3], "x": 9, "y": 3.7}
-            ]
-        },
         "LAYOUT_split_3x6_3": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0.3},

diff --git a/keyboards/crkbd/rules.mk b/keyboards/crkbd/rules.mk
@@ -2,7 +2,7 @@
 #   change yes to no to disable
 #
 
-DEFAULT_FOLDER = crkbd/rev1
+DEFAULT_FOLDER = crkbd/rev2
 
 RGBLIGHT_SUPPORTED = yes
 RGB_MATRIX_SUPPORTED = yes