summaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/dilemma
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bastardkb/dilemma')
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/3x5_2.h37
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/config.h6
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/info.json5
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/info.json75
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h14
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h12
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/config.h6
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/info.json5
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/3x5_3.c2
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/3x5_3.h39
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/config.h6
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/info.json87
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h12
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/rules.mk1
-rw-r--r--keyboards/bastardkb/dilemma/config.h3
-rw-r--r--keyboards/bastardkb/dilemma/dilemma.h10
16 files changed, 103 insertions, 217 deletions
diff --git a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h b/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
deleted file mode 100644
index 7deb32d917..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/3x5_2.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// clang-format off
-#define LAYOUT_split_3x5_2( \
- k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
- k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
- k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
- k30, k32, k72, k70 \
-) \
-{ \
- { k00, k01, k02, k03, k04 }, \
- { k10, k11, k12, k13, k14 }, \
- { k20, k21, k22, k23, k24 }, \
- { k30, KC_NO, k32, KC_NO, KC_NO }, \
- { k40, k41, k42, k43, k44 }, \
- { k50, k51, k52, k53, k54 }, \
- { k60, k61, k62, k63, k64 }, \
- { k70, KC_NO, k72, KC_NO, KC_NO }, \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
index 3a5898c546..4366a8a3e9 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP4, GP5, GP28, GP26 }
-#define MATRIX_COL_PINS \
- { GP8, GP9, GP7, GP6, GP27 }
-
/* Handedness. */
#define SPLIT_HAND_PIN GP29
#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
index e4f48e6c7e..796d22dc71 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
@@ -1,5 +1,10 @@
{
"keyboard_name": "Dilemma (3x5+2) Assembled",
+ "matrix_pins": {
+ "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
+ "rows": ["GP4", "GP5", "GP28", "GP26"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "GP1"
},
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json
index a758541149..bfd12e81d0 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/info.json
@@ -7,40 +7,47 @@
"layouts": {
"LAYOUT_split_3x5_2": {
"layout": [
- { "label": "L00", "x": 0, "y": 0 },
- { "label": "L01", "x": 1, "y": 0 },
- { "label": "L02", "x": 2, "y": 0 },
- { "label": "L03", "x": 3, "y": 0 },
- { "label": "L04", "x": 4, "y": 0 },
- { "label": "R00", "x": 11, "y": 0 },
- { "label": "R01", "x": 12, "y": 0 },
- { "label": "R02", "x": 13, "y": 0 },
- { "label": "R03", "x": 14, "y": 0 },
- { "label": "R04", "x": 15, "y": 0 },
- { "label": "L10", "x": 0, "y": 1 },
- { "label": "L11", "x": 1, "y": 1 },
- { "label": "L12", "x": 2, "y": 1 },
- { "label": "L13", "x": 3, "y": 1 },
- { "label": "L14", "x": 4, "y": 1 },
- { "label": "R10", "x": 11, "y": 1 },
- { "label": "R11", "x": 12, "y": 1 },
- { "label": "R12", "x": 13, "y": 1 },
- { "label": "R13", "x": 14, "y": 1 },
- { "label": "R14", "x": 15, "y": 1 },
- { "label": "L20", "x": 0, "y": 2 },
- { "label": "L21", "x": 1, "y": 2 },
- { "label": "L22", "x": 2, "y": 2 },
- { "label": "L23", "x": 3, "y": 2 },
- { "label": "L24", "x": 4, "y": 2 },
- { "label": "R20", "x": 11, "y": 2 },
- { "label": "R21", "x": 12, "y": 2 },
- { "label": "R22", "x": 13, "y": 2 },
- { "label": "R23", "x": 14, "y": 2 },
- { "label": "R24", "x": 15, "y": 2 },
- { "label": "L30", "x": 4, "y": 3 },
- { "label": "L32", "x": 5, "y": 3 },
- { "label": "R32", "x": 10, "y": 3 },
- { "label": "R30", "x": 11, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0},
+ {"matrix": [4, 1], "x": 14, "y": 0},
+ {"matrix": [4, 0], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+
+ {"matrix": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1},
+ {"matrix": [5, 1], "x": 14, "y": 1},
+ {"matrix": [5, 0], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2},
+ {"matrix": [6, 1], "x": 14, "y": 2},
+ {"matrix": [6, 0], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 4, "y": 3},
+ {"matrix": [3, 2], "x": 5, "y": 3},
+
+ {"matrix": [7, 2], "x": 10, "y": 3},
+ {"matrix": [7, 0], "x": 11, "y": 3}
]
}
}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
index 2390d10ca5..8d8baa5c32 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
@@ -65,20 +65,6 @@
*/
#define PERMISSIVE_HOLD
-/**
- * Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
/** Dilemma-specific features. */
#ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
index 5bfac4b6c5..f92ea9a4c9 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
@@ -21,18 +21,6 @@
# define DYNAMIC_KEYMAP_LAYER_COUNT 6
#endif // VIA_ENABLE
-/**
- * \brief Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
/* Charybdis-specific features. */
#ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
index 67e9646845..fd7bb0f107 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP4, GP5, GP28, GP26 }
-#define MATRIX_COL_PINS \
- { GP8, GP9, GP7, GP6, GP27 }
-
/* Handedness. */
#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
index aec0957ed6..7796a7c311 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
@@ -1,5 +1,10 @@
{
"keyboard_name": "Dilemma (3x5+2) Splinky",
+ "matrix_pins": {
+ "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
+ "rows": ["GP4", "GP5", "GP28", "GP26"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "GP1"
},
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
index 0b6c657fda..b9787f473e 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "3x5_3.h"
+#include "quantum.h"
/**
* LEDs index.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
deleted file mode 100644
index 566d5b81d2..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <charly@codesink.dev> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "dilemma.h"
-
-// clang-format off
-#define LAYOUT_split_3x5_3( \
- k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \
- k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \
- k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \
- k32, k30, k31, k71, k70, k72 \
-) \
-{ \
- { k00, k01, k02, k03, k04 }, \
- { k10, k11, k12, k13, k14 }, \
- { k20, k21, k22, k23, k24 }, \
- { k30, k31, k32, KC_NO, KC_NO }, \
- { k40, k41, k42, k43, k44 }, \
- { k50, k51, k52, k53, k54 }, \
- { k60, k61, k62, k63, k64 }, \
- { k70, k71, k72, KC_NO, KC_NO }, \
-}
-// clang-format on
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h
index a30b98a10a..250732dc7a 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/config.h
@@ -17,12 +17,6 @@
#pragma once
-/* Key matrix configuration. */
-#define MATRIX_ROW_PINS \
- { GP4, GP5, GP27, GP26 }
-#define MATRIX_COL_PINS \
- { GP8, GP9, GP7, GP6, GP28 }
-
/* Handedness. */
#define SPLIT_HAND_PIN GP29
#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json
index a4fe592587..d9f0f15f2c 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/info.json
@@ -4,51 +4,66 @@
"device_version": "2.0.0",
"pid": "0x1835"
},
+ "matrix_pins": {
+ "cols": ["GP8", "GP9", "GP7", "GP6", "GP28"],
+ "rows": ["GP4", "GP5", "GP27", "GP26"]
+ },
+ "diode_direction": "ROW2COL",
"split": {
"soft_serial_pin": "GP1"
},
+ "ws2812": {
+ "driver": "vendor"
+ },
"processor": "RP2040",
"bootloader": "rp2040",
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
"layout": [
- { "label": "L00", "x": 0, "y": 0 },
- { "label": "L01", "x": 1, "y": 0 },
- { "label": "L02", "x": 2, "y": 0 },
- { "label": "L03", "x": 3, "y": 0 },
- { "label": "L04", "x": 4, "y": 0 },
- { "label": "R00", "x": 11, "y": 0 },
- { "label": "R01", "x": 12, "y": 0 },
- { "label": "R02", "x": 13, "y": 0 },
- { "label": "R03", "x": 14, "y": 0 },
- { "label": "R04", "x": 15, "y": 0 },
- { "label": "L10", "x": 0, "y": 1 },
- { "label": "L11", "x": 1, "y": 1 },
- { "label": "L12", "x": 2, "y": 1 },
- { "label": "L13", "x": 3, "y": 1 },
- { "label": "L14", "x": 4, "y": 1 },
- { "label": "R10", "x": 11, "y": 1 },
- { "label": "R11", "x": 12, "y": 1 },
- { "label": "R12", "x": 13, "y": 1 },
- { "label": "R13", "x": 14, "y": 1 },
- { "label": "R14", "x": 15, "y": 1 },
- { "label": "L20", "x": 0, "y": 2 },
- { "label": "L21", "x": 1, "y": 2 },
- { "label": "L22", "x": 2, "y": 2 },
- { "label": "L23", "x": 3, "y": 2 },
- { "label": "L24", "x": 4, "y": 2 },
- { "label": "R20", "x": 11, "y": 2 },
- { "label": "R21", "x": 12, "y": 2 },
- { "label": "R22", "x": 13, "y": 2 },
- { "label": "R23", "x": 14, "y": 2 },
- { "label": "R24", "x": 15, "y": 2 },
- { "label": "L32", "x": 4, "y": 3 },
- { "label": "L33", "x": 5, "y": 3 },
- { "label": "L34", "x": 6, "y": 3 },
- { "label": "R32", "x": 11, "y": 3 },
- { "label": "R33", "x": 10, "y": 3 },
- { "label": "R34", "x": 9, "y": 3 }
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+
+ {"matrix": [4, 4], "x": 11, "y": 0},
+ {"matrix": [4, 3], "x": 12, "y": 0},
+ {"matrix": [4, 2], "x": 13, "y": 0},
+ {"matrix": [4, 1], "x": 14, "y": 0},
+ {"matrix": [4, 0], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+
+ {"matrix": [5, 4], "x": 11, "y": 1},
+ {"matrix": [5, 3], "x": 12, "y": 1},
+ {"matrix": [5, 2], "x": 13, "y": 1},
+ {"matrix": [5, 1], "x": 14, "y": 1},
+ {"matrix": [5, 0], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+
+ {"matrix": [6, 4], "x": 11, "y": 2},
+ {"matrix": [6, 3], "x": 12, "y": 2},
+ {"matrix": [6, 2], "x": 13, "y": 2},
+ {"matrix": [6, 1], "x": 14, "y": 2},
+ {"matrix": [6, 0], "x": 15, "y": 2},
+
+ {"matrix": [3, 2], "x": 4, "y": 3},
+ {"matrix": [3, 0], "x": 5, "y": 3},
+ {"matrix": [3, 1], "x": 6, "y": 3},
+
+ {"matrix": [7, 1], "x": 11, "y": 3},
+ {"matrix": [7, 0], "x": 10, "y": 3},
+ {"matrix": [7, 2], "x": 9, "y": 3}
]
}
}
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
index fce6c3a1f6..cfdafc4a51 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
@@ -59,18 +59,6 @@
*/
#define PERMISSIVE_HOLD
-/**
- * Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
/** Dilemma-specific features. */
#ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
index 5ab695a6c2..b6f1398421 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
@@ -18,7 +18,6 @@ RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality
RGB_MATRIX_DRIVER = WS2812
SERIAL_DRIVER = vendor
-WS2812_DRIVER = vendor
POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
diff --git a/keyboards/bastardkb/dilemma/config.h b/keyboards/bastardkb/dilemma/config.h
index 3ea785525c..d282c635ea 100644
--- a/keyboards/bastardkb/dilemma/config.h
+++ b/keyboards/bastardkb/dilemma/config.h
@@ -18,9 +18,6 @@
#pragma once
-
-#define DIODE_DIRECTION ROW2COL
-
/* Pointing device configuration. */
// Enable use of pointing device on slave split.
diff --git a/keyboards/bastardkb/dilemma/dilemma.h b/keyboards/bastardkb/dilemma/dilemma.h
index f2c0784533..eefdd5babf 100644
--- a/keyboards/bastardkb/dilemma/dilemma.h
+++ b/keyboards/bastardkb/dilemma/dilemma.h
@@ -17,16 +17,6 @@
#pragma once
-// clang-format off
-#if defined(KEYBOARD_bastardkb_dilemma_3x5_2_splinky) || defined (KEYBOARD_bastardkb_dilemma_3x5_2_assembled)
-# include "3x5_2.h"
-#elif defined(KEYBOARD_bastardkb_dilemma_3x5_3)
-# include "3x5_3.h"
-#else
-# error "Unsuported format"
-#endif
-// clang-format on
-
#include "quantum.h"
#ifdef POINTING_DEVICE_ENABLE