summaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/dilemma/3x5_2
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bastardkb/dilemma/3x5_2')
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/config.h3
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/info.json7
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk7
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/info.json1
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h2
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/config.h3
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/info.json7
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk7
8 files changed, 14 insertions, 23 deletions
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
index 8420898f4e..3a5898c546 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
@@ -27,9 +27,6 @@
#define SPLIT_HAND_PIN GP29
#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
/* CRC. */
#define CRC8_USE_TABLE
#define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
index 59f3b0d071..e4f48e6c7e 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
@@ -1,3 +1,8 @@
{
- "keyboard_name": "Dilemma (3x5+2) Assembled"
+ "keyboard_name": "Dilemma (3x5+2) Assembled",
+ "split": {
+ "soft_serial_pin": "GP1"
+ },
+ "processor": "RP2040",
+ "bootloader": "rp2040"
}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
index df2f94792d..5db74a9d84 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
# Build Options
# change yes to no to disable
#
@@ -28,7 +22,6 @@ POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI.
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_2
# RP2040-specific options
PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json
index bbbecd7efa..a758541149 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/info.json
@@ -3,6 +3,7 @@
"device_version": "1.0.0",
"pid": "0x1835"
},
+ "community_layouts": ["split_3x5_2"],
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
index cbe8e7bba7..2390d10ca5 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
@@ -41,7 +41,7 @@
*
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-force-hold
*/
-#define TAPPING_FORCE_HOLD
+#define QUICK_TAP_TERM 0
/*
* Tap-or-Hold decision modes.
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
index 4ac28ed1f9..67e9646845 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
@@ -33,9 +33,6 @@
// left one, uncomment the following line.
//#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-/* serial.c configuration (for split keyboard). */
-#define SOFT_SERIAL_PIN GP1
-
/* CRC. */
#define CRC8_USE_TABLE
#define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
index 38ce4738f9..aec0957ed6 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
@@ -1,3 +1,8 @@
{
- "keyboard_name": "Dilemma (3x5+2) Splinky"
+ "keyboard_name": "Dilemma (3x5+2) Splinky",
+ "split": {
+ "soft_serial_pin": "GP1"
+ },
+ "processor": "RP2040",
+ "bootloader": "rp2040"
}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
index 292b71fe8b..1e33cc1086 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
@@ -1,9 +1,3 @@
-# MCU name
-MCU = RP2040
-
-# Bootloader selection
-BOOTLOADER = rp2040
-
# Build Options
# change yes to no to disable
#
@@ -28,7 +22,6 @@ POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C.
SPLIT_KEYBOARD = yes
-LAYOUTS = split_3x5_2
# RP2040-specific options
PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS.