From 7661fa1611d6a374f4e75e69705ae7b6a80ea7ee Mon Sep 17 00:00:00 2001
From: casuanoob <gms.rulz@hotmail.com>
Date: Thu, 14 Sep 2023 18:11:31 +1000
Subject: [PATCH] 3x5_3 explicitly set some defaults

some things were only working because "processor: RP2040" defaults to
GENERIC_PROMICRO_RP2040.
explicitly set "board": "GENERIC_RP_RP2040" instead.
correctly enable SPI0 and SPID0 instead of SPI1
---
 keyboards/bastardkb/dilemma/3x5_3/config.h  | 2 ++
 keyboards/bastardkb/dilemma/3x5_3/info.json | 7 ++++---
 keyboards/bastardkb/dilemma/3x5_3/mcuconf.h | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index 924b37c217c..305d2e280ae 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -30,6 +30,7 @@
 #define CRC8_OPTIMIZE_SPEED
 
 /* Cirque trackpad over SPI. */
+#define SPI_DRIVER SPID0
 #define SPI_SCK_PIN GP22
 #define SPI_MOSI_PIN GP23
 #define SPI_MISO_PIN GP20
@@ -40,6 +41,7 @@
 /* Reset. */
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
+#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
 
 /* RGB matrix support. */
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index 2f3f21fa048..4638735cd6e 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -6,6 +6,7 @@
     },
     "processor": "RP2040",
     "bootloader": "rp2040",
+    "board": "GENERIC_RP_RP2040",
     "matrix_pins": {
         "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
         "rows": ["GP4", "GP5", "GP27", "GP26"]
@@ -16,7 +17,7 @@
         "soft_serial_pin": "GP1",
         "bootmagic": {
             "matrix": [4, 0]
-        },
+        }
     },
     "encoder": {
         "enabled" : true,
@@ -32,7 +33,7 @@
         "rgb_matrix": true
     },
     "caps_word": {
-        "enabled": true,
+        "enabled": true
     },
     "ws2812": {
         "pin": "GP10",
@@ -41,7 +42,7 @@
     "rgb_matrix": {
         "driver": "ws2812",
         "split_count": [36, 36],
-        "max_brightness": 128,
+        "max_brightness": 176,
         "layout": [
             {"x": 82, "y": 0, "flags": 2},
             {"x": 60, "y": 0, "flags": 2},
diff --git a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
index 81821c159dc..52b726a56d5 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/mcuconf.h
@@ -19,5 +19,5 @@
 
 #include_next <mcuconf.h>
 
-#undef RP_SPI_USE_SPI1
-#define RP_SPI_USE_SPI1 TRUE
+#undef RP_SPI_USE_SPI0
+#define RP_SPI_USE_SPI0 TRUE