aboutsummaryrefslogtreecommitdiff
path: root/keyboards/bastardkb/dilemma
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/bastardkb/dilemma')
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json (renamed from keyboards/bastardkb/dilemma/3x5_2/assembled/info.json)7
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk17
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json (renamed from keyboards/bastardkb/dilemma/3x5_2/splinky/info.json)7
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk17
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/3x5_3.c2
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/keyboard.json (renamed from keyboards/bastardkb/dilemma/3x5_3/info.json)1
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/rules.mk1
-rw-r--r--keyboards/bastardkb/dilemma/4x6_4/4x6_4.c2
-rw-r--r--keyboards/bastardkb/dilemma/4x6_4/config.h3
-rw-r--r--keyboards/bastardkb/dilemma/4x6_4/keyboard.json (renamed from keyboards/bastardkb/dilemma/4x6_4/info.json)1
-rw-r--r--keyboards/bastardkb/dilemma/4x6_4/rules.mk1
11 files changed, 18 insertions, 41 deletions
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json
index 796d22dc71..ac52a86eb5 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json
@@ -1,11 +1,18 @@
{
"keyboard_name": "Dilemma (3x5+2) Assembled",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "pointing_device": true
+ },
"matrix_pins": {
"cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
"rows": ["GP4", "GP5", "GP28", "GP26"]
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"processor": "RP2040",
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
index b4722fc8e6..48216ee8b7 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
@@ -1,24 +1,7 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = no # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix functionality
SERIAL_DRIVER = vendor
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json
index 7796a7c311..3c4c559cb6 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json
@@ -1,11 +1,18 @@
{
"keyboard_name": "Dilemma (3x5+2) Splinky",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "pointing_device": true
+ },
"matrix_pins": {
"cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
"rows": ["GP4", "GP5", "GP28", "GP26"]
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "GP1"
},
"processor": "RP2040",
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
index 227d42fa24..942028da2c 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
@@ -1,24 +1,7 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = no # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default
-RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix functionality
SERIAL_DRIVER = vendor
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
index 0a5ba15181..3decc51e84 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "dilemma.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/keyboard.json
index 2da4f1785e..12e336f023 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_3/keyboard.json
@@ -38,6 +38,7 @@
"mousekey": true,
"nkro": true,
"rgb_matrix": true,
+ "pointing_device": true,
"caps_word": true,
"tri_layer": true
},
diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
index 4923c2c84a..6077600948 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk
@@ -1,4 +1,3 @@
SERIAL_DRIVER = vendor
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
diff --git a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
index c80ccbc8eb..49b24fbd04 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
+++ b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "dilemma.h"
#ifdef SWAP_HANDS_ENABLE
const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/bastardkb/dilemma/4x6_4/config.h b/keyboards/bastardkb/dilemma/4x6_4/config.h
index 549965444d..7276c6181f 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/config.h
+++ b/keyboards/bastardkb/dilemma/4x6_4/config.h
@@ -42,6 +42,3 @@
#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. */
-#define SPLIT_TRANSPORT_MIRROR \ No newline at end of file
diff --git a/keyboards/bastardkb/dilemma/4x6_4/info.json b/keyboards/bastardkb/dilemma/4x6_4/keyboard.json
index cc8c30b510..7e40208a5d 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/info.json
+++ b/keyboards/bastardkb/dilemma/4x6_4/keyboard.json
@@ -38,6 +38,7 @@
"mousekey": true,
"nkro": true,
"rgb_matrix": true,
+ "pointing_device": true,
"caps_word": true,
"tri_layer": true
},
diff --git a/keyboards/bastardkb/dilemma/4x6_4/rules.mk b/keyboards/bastardkb/dilemma/4x6_4/rules.mk
index 4923c2c84a..6077600948 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/rules.mk
+++ b/keyboards/bastardkb/dilemma/4x6_4/rules.mk
@@ -1,4 +1,3 @@
SERIAL_DRIVER = vendor
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi