diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-02-28 11:22:29 +1100 |
| commit | bacec14073b2e897d5a52caf12de5a6a1f7b4078 (patch) | |
| tree | d4e3e57aac1a829a191831efd2e62c8a43217885 /keyboards/bastardkb/dilemma/3x5_3 | |
| parent | d70e9b8659a7fbbd7069fd542bd07e67e04327a1 (diff) | |
| parent | b865b9e1706ad28ae4882bd2e0331e98808295fa (diff) | |
Merge remote-tracking branch 'upstream/develop'
Diffstat (limited to 'keyboards/bastardkb/dilemma/3x5_3')
5 files changed, 8 insertions, 12 deletions
diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h index 985d622fb6..a30b98a10a 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/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 - /* RGB settings. */ #define RGB_DI_PIN GP0 // Per-key. // #define RGB_DI_PIN GP10 // Underglow. diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index 777367903d..a4fe592587 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json @@ -4,6 +4,12 @@ "device_version": "2.0.0", "pid": "0x1835" }, + "split": { + "soft_serial_pin": "GP1" + }, + "processor": "RP2040", + "bootloader": "rp2040", + "community_layouts": ["split_3x5_3"], "layouts": { "LAYOUT_split_3x5_3": { "layout": [ diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h index 139b1f06ea..fce6c3a1f6 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h @@ -37,7 +37,7 @@ * Enable rapid switch from tap to hold. Disable auto-repeat when pressing key * twice, except for one-shot keys. */ -#define TAPPING_FORCE_HOLD +#define QUICK_TAP_TERM 0 /* * Tap-or-Hold decision modes. diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c index 461976b276..30fef9bbeb 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/default/keymap.c @@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯ - KC_A, NAV, CAPSWRD, KC_SPC, SYM, KC_A + KC_A, NAV, CW_TOGG, KC_SPC, SYM, KC_A // ╰───────────────────────────╯ ╰──────────────────────────╯ ), diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk index 73ee4ab1e0..5ab695a6c2 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = RP2040 - -# Bootloader selection -BOOTLOADER = rp2040 - # Build Options # change yes to no to disable # @@ -30,7 +24,6 @@ POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = cirque_pinnacle_spi SPLIT_KEYBOARD = yes -LAYOUTS = split_3x5_3 # RP2040-specific options PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. |