From ebeac4b4663ecaf2af5f22626f927cdc7d5fdca9 Mon Sep 17 00:00:00 2001 From: casuanoob Date: Mon, 3 Apr 2023 04:07:32 +1000 Subject: [PATCH 1/6] Update Dilemma v2 PID and RGB configs --- keyboards/bastardkb/dilemma/3x5_3/3x5_3.c | 69 ++++++++++----------- keyboards/bastardkb/dilemma/3x5_3/config.h | 4 ++ keyboards/bastardkb/dilemma/3x5_3/info.json | 2 +- 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c index 6ab8f1d2c225..8fcac602f8b9 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c +++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c @@ -22,14 +22,15 @@ /** * LEDs index. * + * 0 - 17 Underglow 36 - 53 Underglow * ╭────────────────────╮ ╭────────────────────╮ - * 2 3 8 9 12 30 27 26 21 20 + * 22 21 20 19 18 54 55 56 57 58 * ├────────────────────┤ ├────────────────────┤ - * 1 4 7 10 13 31 28 25 22 19 + * 23 24 25 26 27 63 62 61 60 59 * ├────────────────────┤ ├────────────────────┤ - * 0 5 6 11 14 32 29 24 23 18 + * 32 31 30 29 28 64 65 66 67 68 * ╰────────────────────╯ ╰────────────────────╯ - * 15 16 17 35 34 33 + * 33 34 35 71 70 69 * ╰────────────╯ ╰────────────╯ */ // clang-format off @@ -37,45 +38,39 @@ led_config_t g_led_config = { { /* Key Matrix to LED index. */ // Left split. - { 2, 3, 8, 9, 12 }, // Top row - { 1, 4, 7, 10, 13 }, // Middle row - { 0, 5, 6, 11, 14 }, // Bottom row - { 17, NO_LED, 15, 16, NO_LED }, // Thumb cluster + { 22, 21, 20, 19, 18 }, // Top row + { 23, 24, 25, 26, 27 }, // Middle row + { 32, 31, 30, 29, 28 }, // Bottom row + { 34, 35, 33, NO_LED, NO_LED }, // Thumb cluster // Right split. - { 20, 21, 26, 27, 30 }, // Top row - { 19, 22, 25, 28, 31 }, // Middle row - { 18, 23, 24, 29, 32 }, // Bottom row - { 35, NO_LED, 33, 34, NO_LED }, // Thumb cluster + { 58, 57, 56, 55, 54 }, // Top row + { 59, 60, 61, 62, 63 }, // Middle row + { 68, 67, 66, 65, 64 }, // Bottom row + { 70, 71, 69, NO_LED, NO_LED }, // Thumb cluster }, { /* LED index to physical position. */ // Left split underglow. - /* index=0 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, // col 1 (left most) - /* index=3 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, // col 2 - /* index=6 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, - /* index=9 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, - /* index=12 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, - /* index=15 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, // Thumb cluster + /* index=0 */ { 82, 0 }, { 60, 0 }, { 22, 0 }, { 15, 0 }, // Top 4 + /* index=4 */ { 0, 25 }, { 0, 40 }, { 0, 55 }, // Pinky edge 3 + /* index=7 */ { 15, 45 }, { 30, 45 }, { 35, 60 }, { 55, 62 }, // Bottom 8 + /* index=11 */ { 72, 64 }, { 90, 64 }, { 98, 47 }, { 107, 40 }, + /* index=15 */ { 110, 33 }, { 110, 19 }, { 110, 5 }, // Inner edge 3 // Left split per-key. - /* index=18 */ { 0, 42 }, { 0, 21 }, { 0, 0 }, // col 1 (left most) - /* index=21 */ { 18, 0 }, { 18, 21 }, { 18, 42 }, // col 2 - /* index=24 */ { 36, 42 }, { 36, 21 }, { 36, 0 }, - /* index=27 */ { 54, 0 }, { 54, 21 }, { 54, 42 }, - /* index=30 */ { 72, 0 }, { 72, 21 }, { 72, 42 }, - /* index=33 */ { 72, 64 }, { 90, 64 }, { 108, 64 }, // Thumb cluster - // Right split per-key. - /* index=36 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, // col 10 (right most) - /* index=39 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, // col 9 - /* index=42 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, - /* index=45 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, - /* index=48 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, - /* index=51 */ { 0, 0 }, { 0, 0 }, { 0, 0 }, // Thumb cluster + /* index=18 */ { 73, 11 }, { 56, 9 }, { 39, 5 }, { 22, 10 }, { 5, 15 }, // row 1 (left most) 90, 107 + /* index=23 */ { 5, 30 }, { 22, 25 }, { 39, 20 }, { 56, 24 }, { 73, 26 }, // row 2 (middle) + /* index=28 */ { 73, 41 }, { 56, 39 }, { 39, 35 }, { 22, 25 }, { 5, 45 }, // row 3 (left most) + /* index=33 */ { 45, 51 }, { 64, 53 }, { 81, 60 }, // Thumb cluster // Right split underglow. - /* index=54 */ { 224, 42 }, { 224, 21 }, { 224, 0 }, // col 10 (right most) - /* index=57 */ { 206, 0 }, { 206, 21 }, { 206, 42 }, // col 9 - /* index=60 */ { 188, 42 }, { 188, 21 }, { 188, 0 }, - /* index=63 */ { 170, 0 }, { 170, 21 }, { 170, 42 }, - /* index=66 */ { 152, 0 }, { 152, 21 }, { 152, 42 }, - /* index=69 */ { 152, 64 }, { 134, 64 }, { 116, 64 }, // Thumb cluster + /* index=36 */ { 142, 0 }, { 164, 0 }, { 202, 0 }, { 209, 0 }, // Top 4 + /* index=40 */ { 224, 25 }, { 224, 40 }, { 224, 55 }, // Pinky edge 3 + /* index=43 */ { 209, 45 }, { 194, 45 }, { 189, 60 }, { 169, 62 }, // Bottom 8 + /* index=47 */ { 152, 64 }, { 134, 64 }, { 126, 47 }, { 117, 40 }, + /* index=51 */ { 114, 33 }, { 114, 19 }, { 114, 5 }, // Inner edge 3 + // Right split per-key. + /* index=54 */ { 151, 11 }, { 168, 9 }, { 185, 5 }, { 202, 10 }, { 219, 15 }, // row 1 (right most) 117 134 + /* index=59 */ { 219, 30 }, { 202, 25 }, { 185, 20 }, { 168, 24 }, { 151, 26 }, // row 2 (middle) + /* index=64 */ { 151, 41 }, { 168, 39 }, { 185, 35 }, { 202, 25 }, { 219, 45 }, // row 3 (right most) + /* index=69 */ { 179, 51 }, { 160, 53 }, { 143, 60 }, // Thumb cluster }, { /* LED index to flag. */ // Left split underglow. diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h index 2761a9109446..6198c945a2a6 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/config.h @@ -68,6 +68,7 @@ # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 # define RGB_DISABLE_WHEN_USB_SUSPENDED # define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS // Startup values. # define RGB_MATRIX_DEFAULT_HUE 0 @@ -110,6 +111,9 @@ # define ENABLE_RGB_MATRIX_HUE_BREATHING # define ENABLE_RGB_MATRIX_HUE_PENDULUM # define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_RAIN # define ENABLE_RGB_MATRIX_TYPING_HEATMAP # define ENABLE_RGB_MATRIX_DIGITAL_RAIN # define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE diff --git a/keyboards/bastardkb/dilemma/3x5_3/info.json b/keyboards/bastardkb/dilemma/3x5_3/info.json index a4fe5925875e..ddca7776a786 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/info.json +++ b/keyboards/bastardkb/dilemma/3x5_3/info.json @@ -2,7 +2,7 @@ "keyboard_name": "Dilemma (3x5+3) Assembled", "usb": { "device_version": "2.0.0", - "pid": "0x1835" + "pid": "0x1836" }, "split": { "soft_serial_pin": "GP1" From 94446511efd259fdd45fbb59e5dc949fc327602a Mon Sep 17 00:00:00 2001 From: casuanoob Date: Tue, 4 Apr 2023 21:43:33 +1000 Subject: [PATCH 2/6] add encoder support to Dilemma 3x5_3 --- keyboards/bastardkb/dilemma/3x5_3/3x5_3.c | 26 ++++++++++++++++++++++ keyboards/bastardkb/dilemma/3x5_3/config.h | 8 +++++++ keyboards/bastardkb/dilemma/3x5_3/rules.mk | 8 ++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c index 8fcac602f8b9..1dac7e97765d 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c +++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c @@ -104,3 +104,29 @@ led_config_t g_led_config = { { } }; #endif // clang-format on + +#ifdef ENCODER_ENABLE +bool encoder_update_kb(uint8_t index, bool clockwise) { + if (!encoder_update_user(index, clockwise)) { + return false; + } + // 0 is left-half encoder, + // 1 is right-half encoder + if (index == 0) { + // Volume control + if (clockwise) { + tap_code(KC_MS_WH_DOWN); + } else { + tap_code(KC_MS_WH_UP); + } + } else if (index == 1) { + // Page up/Page down + if (clockwise) { + tap_code(KC_VOLU); + } else { + tap_code(KC_VOLD); + } + } + return true; +} +#endif \ No newline at end of file diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h index 6198c945a2a6..f5d99d23f5c7 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/config.h @@ -38,6 +38,10 @@ #define CRC8_USE_TABLE #define CRC8_OPTIMIZE_SPEED +/* Encoders. */ +#define ENCODERS_PAD_A { GP25 } +#define ENCODERS_PAD_B { GP24 } + /* Cirque trackpad over SPI. */ #define SPI_SCK_PIN GP22 #define SPI_MOSI_PIN GP23 @@ -55,6 +59,10 @@ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17 +/* Bootmagic. */ +#define BOOTMAGIC_LITE_ROW_RIGHT 4 +#define BOOTMAGIC_LITE_COLUMN_RIGHT 0 + /* RGB settings. */ #define RGBLED_NUM 72 #define RGBLED_SPLIT \ diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk index 5ab695a6c249..3bfb269d33ee 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk @@ -6,10 +6,14 @@ 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 +NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output +MAGIC_ENABLE = yes # Magic keycodes +TRI_LAYER_ENABLE = yes # Tri Layers +CAPS_WORD_ENABLE = yes # Caps Word +ENCODER_ENABLE = yes # Enable encoder support AUDIO_SUPPORTED = no # Audio is not supported RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default @@ -25,5 +29,7 @@ POINTING_DEVICE_DRIVER = cirque_pinnacle_spi SPLIT_KEYBOARD = yes +DEBOUNCE_TYPE = asym_eager_defer_pk + # RP2040-specific options PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. From 68c5a519d394ac196d904664d753cc9cf3dbe065 Mon Sep 17 00:00:00 2001 From: casuanoob Date: Tue, 4 Apr 2023 21:51:37 +1000 Subject: [PATCH 3/6] port Via keymap to Dilemma 3x5_3 Copied from 3x5_2 via keymap. Added support for ENCODER_MAP feature for use with Via --- .../dilemma/3x5_3/keymaps/via/config.h | 43 ++++ .../dilemma/3x5_3/keymaps/via/keymap.c | 240 ++++++++++++++++++ .../dilemma/3x5_3/keymaps/via/readme.md | 67 +++++ .../dilemma/3x5_3/keymaps/via/rules.mk | 3 + 4 files changed, 353 insertions(+) create mode 100644 keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h create mode 100644 keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c create mode 100644 keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md create mode 100644 keyboards/bastardkb/dilemma/3x5_3/keymaps/via/rules.mk diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h new file mode 100644 index 000000000000..5bfac4b6c59d --- /dev/null +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h @@ -0,0 +1,43 @@ +/** + * Copyright 2021 Charly Delay (@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 . + */ +#pragma once + +#ifdef VIA_ENABLE +/* VIA configuration. */ +# 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 +// Automatically enable the pointer layer when moving the trackball. See also: +// - `DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS` +// - `DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD` +// #define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE +#endif // POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c new file mode 100644 index 000000000000..44b87727b9d1 --- /dev/null +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c @@ -0,0 +1,240 @@ +/** + * Copyright 2022 Charly Delay (@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 . + */ +#include QMK_KEYBOARD_H + +#ifdef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE +# include "timer.h" +#endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE + +enum dilemma_keymap_layers { + LAYER_BASE = 0, + LAYER_FUNCTION, + LAYER_NAVIGATION, + LAYER_POINTER, + LAYER_NUMERAL, + LAYER_SYMBOLS +}; + +// Automatically enable sniping-mode on the pointer layer. +//#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_POINTER + +#ifdef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE +static uint16_t auto_pointer_layer_timer = 0; + +# ifndef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS +# define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000 +# endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS + +# ifndef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD +# define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8 +# endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD +#endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE + +#define SPC_NAV LT(LAYER_NAVIGATION, KC_SPC) +#define TAB_FUN LT(LAYER_FUNCTION, KC_TAB) +#define ENT_SYM LT(LAYER_SYMBOLS, KC_ENT) +#define BSP_NUM LT(LAYER_NUMERAL, KC_BSPC) +#define _L_PTR(KC) LT(LAYER_POINTER, KC) + +#ifndef POINTING_DEVICE_ENABLE +# define DRGSCRL KC_NO +# define DPI_MOD KC_NO +# define S_D_MOD KC_NO +# define SNIPING KC_NO +#endif // !POINTING_DEVICE_ENABLE + +// clang-format off +/** \brief QWERTY layout (3 rows, 10 columns). */ +#define LAYOUT_LAYER_BASE \ + KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ + KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ + KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ + KC_A, TAB_FUN, SPC_NAV, ENT_SYM, BSP_NUM, KC_B + +/** Convenience row shorthands. */ +#define _______________DEAD_HALF_ROW_______________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX +#define ______________HOME_ROW_GACS_L______________ KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX +#define ______________HOME_ROW_GACS_R______________ XXXXXXX, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI + +/* + * Layers used on the Dilemma. + * + * These layers started off heavily inspired by the Miryoku layout, but trimmed + * down and tailored for a stock experience that is meant to be fundation for + * further personalization. + * + * See https://github.com/manna-harbour/miryoku for the original layout. + */ + +/** + * \brief Function layer. + * + * Secondary right-hand layer has function keys mirroring the numerals on the + * primary layer with extras on the pinkie column, plus system keys on the inner + * column. App is on the tertiary thumb key and other thumb keys are duplicated + * from the base layer to enable auto-repeat. + */ +#define LAYOUT_LAYER_FUNCTION \ + _______________DEAD_HALF_ROW_______________, KC_PSCR, KC_F7, KC_F8, KC_F9, KC_F12, \ + ______________HOME_ROW_GACS_L______________, KC_SCRL, KC_F4, KC_F5, KC_F6, KC_F11, \ + _______________DEAD_HALF_ROW_______________, KC_PAUS, KC_F1, KC_F2, KC_F3, KC_F10, \ + XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX + +/** \brief Mouse emulation and pointer functions. */ +#define LAYOUT_LAYER_POINTER \ + QK_BOOT, EE_CLR, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, EE_CLR, QK_BOOT, \ + ______________HOME_ROW_GACS_L______________, ______________HOME_ROW_GACS_R______________, \ + _______, DRGSCRL, SNIPING, KC_BTN3, XXXXXXX, XXXXXXX, KC_BTN3, SNIPING, DRGSCRL, _______, \ + KC_BTN3, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, KC_BTN3 + +/** + * \brief Navigation layer. + * + * Primary right-hand layer (left home thumb) is navigation and editing. Cursor + * keys are on the home position, line and page movement below, clipboard above, + * caps lock and insert on the inner column. Thumb keys are duplicated from the + * base layer to avoid having to layer change mid edit and to enable auto-repeat. + */ +#define LAYOUT_LAYER_NAVIGATION \ + _______________DEAD_HALF_ROW_______________, _______________DEAD_HALF_ROW_______________, \ + ______________HOME_ROW_GACS_L______________, KC_CAPS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, \ + _______________DEAD_HALF_ROW_______________, KC_INS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, \ + XXXXXXX, XXXXXXX, _______, KC_ENT, KC_BSPC, KC_DEL + +/** + * \brief Numeral layout. + * + * Primary left-hand layer (right home thumb) is numerals and symbols. Numerals + * are in the standard numpad locations with symbols in the remaining positions. + * `KC_DOT` is duplicated from the base layer. + */ +#define LAYOUT_LAYER_NUMERAL \ + KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, _______________DEAD_HALF_ROW_______________, \ + KC_SCLN, KC_4, KC_5, KC_6, KC_EQL, ______________HOME_ROW_GACS_R______________, \ + KC_DOT, KC_1, KC_2, KC_3, KC_BSLS, _______________DEAD_HALF_ROW_______________, \ + KC_DOT, KC_MINS, KC_0, XXXXXXX, _______, XXXXXXX + +/** + * \brief Symbols layer. + * + * Secondary left-hand layer has shifted symbols in the same locations to reduce + * chording when using mods with shifted symbols. `KC_LPRN` is duplicated next to + * `KC_RPRN`. + */ +#define LAYOUT_LAYER_SYMBOLS \ + KC_LCBR, KC_AMPR, KC_ASTR, KC_LPRN, KC_RCBR, _______________DEAD_HALF_ROW_______________, \ + KC_COLN, KC_DLR, KC_PERC, KC_CIRC, KC_PLUS, ______________HOME_ROW_GACS_R______________, \ + KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_PIPE, _______________DEAD_HALF_ROW_______________, \ + KC_LPRN, KC_GRV, KC_UNDS, _______, XXXXXXX, XXXXXXX + +/** + * \brief Add Home Row mod to a layout. + * + * Expects a 10-key per row layout. Adds support for GACS (Gui, Alt, Ctl, Shift) + * home row. The layout passed in parameter must contain at least 20 keycodes. + * + * This is meant to be used with `LAYER_ALPHAS_QWERTY` defined above, eg.: + * + * HOME_ROW_MOD_GACS(LAYER_ALPHAS_QWERTY) + */ +#define _HOME_ROW_MOD_GACS( \ + L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \ + L10, L11, L12, L13, L14, R15, R16, R17, R18, R19, \ + ...) \ + L00, L01, L02, L03, L04, \ + R05, R06, R07, R08, R09, \ + LGUI_T(L10), LALT_T(L11), LCTL_T(L12), LSFT_T(L13), L14, \ + R15, RSFT_T(R16), RCTL_T(R17), LALT_T(R18), RGUI_T(R19), \ + __VA_ARGS__ +#define HOME_ROW_MOD_GACS(...) _HOME_ROW_MOD_GACS(__VA_ARGS__) + +/** + * \brief Add pointer layer keys to a layout. + * + * Expects a 10-key per row layout. The layout passed in parameter must contain + * at least 30 keycodes. + * + * This is meant to be used with `LAYER_ALPHAS_QWERTY` defined above, eg.: + * + * POINTER_MOD(LAYER_ALPHAS_QWERTY) + */ +#define _POINTER_MOD( \ + L00, L01, L02, L03, L04, R05, R06, R07, R08, R09, \ + L10, L11, L12, L13, L14, R15, R16, R17, R18, R19, \ + L20, L21, L22, L23, L24, R25, R26, R27, R28, R29, \ + ...) \ + L00, L01, L02, L03, L04, \ + R05, R06, R07, R08, R09, \ + L10, L11, L12, L13, L14, \ + R15, R16, R17, R18, R19, \ + _L_PTR(L20), L21, L22, L23, L24, \ + R25, R26, R27, R28, _L_PTR(R29), \ + __VA_ARGS__ +#define POINTER_MOD(...) _POINTER_MOD(__VA_ARGS__) + +#define LAYOUT_wrapper(...) LAYOUT_split_3x5_3(__VA_ARGS__) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [LAYER_BASE] = LAYOUT_wrapper( + POINTER_MOD(HOME_ROW_MOD_GACS(LAYOUT_LAYER_BASE)) + ), + [LAYER_FUNCTION] = LAYOUT_wrapper(LAYOUT_LAYER_FUNCTION), + [LAYER_NAVIGATION] = LAYOUT_wrapper(LAYOUT_LAYER_NAVIGATION), + [LAYER_NUMERAL] = LAYOUT_wrapper(LAYOUT_LAYER_NUMERAL), + [LAYER_POINTER] = LAYOUT_wrapper(LAYOUT_LAYER_POINTER), + [LAYER_SYMBOLS] = LAYOUT_wrapper(LAYOUT_LAYER_SYMBOLS), +}; +// clang-format on + +#ifdef POINTING_DEVICE_ENABLE +# ifdef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE +report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) { + if (abs(mouse_report.x) > DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD || abs(mouse_report.y) > DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD) { + if (auto_pointer_layer_timer == 0) { + layer_on(LAYER_POINTER); + } + auto_pointer_layer_timer = timer_read(); + } + return mouse_report; +} + +void matrix_scan_user(void) { + if (auto_pointer_layer_timer != 0 && TIMER_DIFF_16(timer_read(), auto_pointer_layer_timer) >= DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) { + auto_pointer_layer_timer = 0; + layer_off(LAYER_POINTER); + } +} +# endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE + +# ifdef DILEMMA_AUTO_SNIPING_ON_LAYER +layer_state_t layer_state_set_user(layer_state_t state) { + dilemma_set_pointer_sniping_enabled(layer_state_cmp(state, DILEMMA_AUTO_SNIPING_ON_LAYER)); + return state; +} +# endif // DILEMMA_AUTO_SNIPING_ON_LAYER +#endif // POINTING_DEVICE_ENABLE + +#if defined(ENCODER_MAP_ENABLE) +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + [LAYER_BASE] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [LAYER_FUNCTION] = { ENCODER_CCW_CW(KC_UP, KC_DOWN), ENCODER_CCW_CW(KC_LEFT, KC_RGHT) }, + [LAYER_NAVIGATION] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, + [LAYER_POINTER] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, + [LAYER_NUMERAL] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, + [LAYER_SYMBOLS] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, +}; +#endif \ No newline at end of file diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md new file mode 100644 index 000000000000..df40677f4df3 --- /dev/null +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md @@ -0,0 +1,67 @@ +# Dilemma `via` keymap + +The Dilemma `via` keymap is based on a QWERTY layout with [home row mods](https://precondition.github.io/home-row-mods) and [Miryoku-inspired layers](https://github.com/manna-harbour/miryoku), and some features and changes specific to the Dilemma. + +This layout also supports VIA. + +## Customizing the keymap + +### Dynamic DPI scaling + +Use the following keycodes to change the default DPI: + +- `POINTER_DEFAULT_DPI_FORWARD`: increases the DPI; decreases when shifted; +- `POINTER_DEFAULT_DPI_REVERSE`: decreases the DPI; increases when shifted. + +There's a maximum of 16 possible values for the sniping mode DPI. See the [Dilemma documentation](../../README.md) for more information. + +Use the following keycodes to change the sniping mode DPI: + +- `POINTER_SNIPING_DPI_FORWARD`: increases the DPI; decreases when shifted; +- `POINTER_SNIPING_DPI_REVERSE`: decreases the DPI; increases when shifted. + +There's a maximum of 4 possible values for the sniping mode DPI. See the [Dilemma documentation](../../README.md) for more information. + +### Drag-scroll + +Use the `DRAGSCROLL_MODE` keycode to enable drag-scroll on hold. Use the `DRAGSCROLL_TOGGLE` keycode to enable/disable drag-scroll on key press. + +### Circular scroll + +By default, the firmware is configured to enable the circular scroll feature on Cirque trackpad. + +To disable this, add the following to your keymap: + +```c +#undef POINTING_DEVICE_GESTURES_SCROLL_ENABLE +``` + +### Sniping + +Use the `SNIPING_MODE` keycode to enable sniping mode on hold. Use the `SNIPING_TOGGLE` keycode to enable/disable sniping mode on key press. + +Change the value of `DILEMMA_AUTO_SNIPING_ON_LAYER` to automatically enable sniping mode on layer change. By default, sniping mode is enabled on the pointer layer: + +```c +#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_POINTER +``` + +### Auto pointer layer + +The pointer layer can be automatically enabled when moving the trackball. To enable or disable this behavior, add or remove the following define: + +```c +#define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE +``` + +By default, the layer is turned off 1 second after the last registered trackball movement: + +```c +#define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000 +``` + +The trigger sensibility can also be tuned. The lower the value, the more sensible the trigger: + +```c +#define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8 +``` diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/rules.mk new file mode 100644 index 000000000000..15a5eaf11a11 --- /dev/null +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/rules.mk @@ -0,0 +1,3 @@ +VIA_ENABLE = yes + +ENCODER_MAP_ENABLE = yes \ No newline at end of file From 1edca7bb062af8032ad2fa816691544a63569004 Mon Sep 17 00:00:00 2001 From: casuanoob Date: Tue, 4 Apr 2023 22:32:31 +1000 Subject: [PATCH 4/6] Add QMK Auto Mouse Layer to Dilemma 3x5_3 via Remove old auto pointer layer code and fix comment typo --- keyboards/bastardkb/dilemma/3x5_3/3x5_3.c | 4 +- .../dilemma/3x5_3/keymaps/via/config.h | 7 ++-- .../dilemma/3x5_3/keymaps/via/keymap.c | 41 ++++--------------- 3 files changed, 13 insertions(+), 39 deletions(-) diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c index 1dac7e97765d..c59e69affbb0 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c +++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c @@ -113,14 +113,14 @@ bool encoder_update_kb(uint8_t index, bool clockwise) { // 0 is left-half encoder, // 1 is right-half encoder if (index == 0) { - // Volume control + // Mouse Scroll if (clockwise) { tap_code(KC_MS_WH_DOWN); } else { tap_code(KC_MS_WH_UP); } } else if (index == 1) { - // Page up/Page down + // Volume control if (clockwise) { tap_code(KC_VOLU); } else { diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h index 5bfac4b6c59d..c1264a8c16a9 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h @@ -36,8 +36,7 @@ /* Charybdis-specific features. */ #ifdef POINTING_DEVICE_ENABLE -// Automatically enable the pointer layer when moving the trackball. See also: -// - `DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS` -// - `DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD` -// #define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE +// Automatically enable the pointer layer when moving the trackpad. +#define POINTING_DEVICE_AUTO_MOUSE_ENABLE +#define AUTO_MOUSE_DEFAULT_LAYER 3 #endif // POINTING_DEVICE_ENABLE diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c index 44b87727b9d1..003c596d1600 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c @@ -32,18 +32,6 @@ enum dilemma_keymap_layers { // Automatically enable sniping-mode on the pointer layer. //#define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_POINTER -#ifdef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE -static uint16_t auto_pointer_layer_timer = 0; - -# ifndef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS -# define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000 -# endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS - -# ifndef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD -# define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8 -# endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD -#endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE - #define SPC_NAV LT(LAYER_NAVIGATION, KC_SPC) #define TAB_FUN LT(LAYER_FUNCTION, KC_TAB) #define ENT_SYM LT(LAYER_SYMBOLS, KC_ENT) @@ -201,32 +189,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // clang-format on #ifdef POINTING_DEVICE_ENABLE -# ifdef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE -report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) { - if (abs(mouse_report.x) > DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD || abs(mouse_report.y) > DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD) { - if (auto_pointer_layer_timer == 0) { - layer_on(LAYER_POINTER); - } - auto_pointer_layer_timer = timer_read(); - } - return mouse_report; -} - -void matrix_scan_user(void) { - if (auto_pointer_layer_timer != 0 && TIMER_DIFF_16(timer_read(), auto_pointer_layer_timer) >= DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) { - auto_pointer_layer_timer = 0; - layer_off(LAYER_POINTER); - } -} -# endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE - # ifdef DILEMMA_AUTO_SNIPING_ON_LAYER layer_state_t layer_state_set_user(layer_state_t state) { dilemma_set_pointer_sniping_enabled(layer_state_cmp(state, DILEMMA_AUTO_SNIPING_ON_LAYER)); return state; } -# endif // DILEMMA_AUTO_SNIPING_ON_LAYER -#endif // POINTING_DEVICE_ENABLE +# endif // DILEMMA_AUTO_SNIPING_ON_LAYER + +# ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE +void pointing_device_init_user(void) { + set_auto_mouse_enable(true); // always required before the auto mouse feature will work +} +# endif //POINTING_DEVICE_AUTO_MOUSE_ENABLE +#endif // POINTING_DEVICE_ENABLE #if defined(ENCODER_MAP_ENABLE) const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { From 9db44666a3a06443b5893e6d692d13155491f9ca Mon Sep 17 00:00:00 2001 From: casuanoob Date: Tue, 4 Apr 2023 22:49:56 +1000 Subject: [PATCH 5/6] disable Auto mouse layer for now --- keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h index c1264a8c16a9..bf756b4447b6 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h @@ -37,6 +37,6 @@ #ifdef POINTING_DEVICE_ENABLE // Automatically enable the pointer layer when moving the trackpad. -#define POINTING_DEVICE_AUTO_MOUSE_ENABLE -#define AUTO_MOUSE_DEFAULT_LAYER 3 +//#define POINTING_DEVICE_AUTO_MOUSE_ENABLE +//#define AUTO_MOUSE_DEFAULT_LAYER 3 #endif // POINTING_DEVICE_ENABLE From 03dd992079764385a598dec24191c967ce8c73dd Mon Sep 17 00:00:00 2001 From: casuanoob Date: Thu, 6 Apr 2023 00:47:24 +1000 Subject: [PATCH 6/6] make suggested changes remove test keycodes from base layer --- keyboards/bastardkb/dilemma/3x5_3/3x5_3.c | 1 + keyboards/bastardkb/dilemma/3x5_3/config.h | 1 + .../dilemma/3x5_3/keymaps/via/config.h | 11 ++-------- .../dilemma/3x5_3/keymaps/via/keymap.c | 15 +++---------- .../dilemma/3x5_3/keymaps/via/readme.md | 22 +------------------ keyboards/bastardkb/dilemma/3x5_3/rules.mk | 2 -- keyboards/bastardkb/dilemma/dilemma.c | 1 + 7 files changed, 9 insertions(+), 44 deletions(-) diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c index c59e69affbb0..5dd136ed92fb 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c +++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c @@ -2,6 +2,7 @@ * Copyright 2020 Christopher Courtney (@drashna) * Copyright 2021 Quentin LEBASTARD * Copyright 2022 Charly Delay (@0xcharly) + * Copyright 2023 casuanoob (@casuanoob) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Publicw License as published by diff --git a/keyboards/bastardkb/dilemma/3x5_3/config.h b/keyboards/bastardkb/dilemma/3x5_3/config.h index f5d99d23f5c7..66c2fc03de44 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/config.h @@ -1,5 +1,6 @@ /** * Copyright 2022 Charly Delay (@0xcharly) + * Copyright 2023 casuanoob (@casuanoob) * * 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 diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h index bf756b4447b6..2701732e415f 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/config.h @@ -1,5 +1,6 @@ /** * Copyright 2021 Charly Delay (@0xcharly) + * Copyright 2023 casuanoob (@casuanoob) * * 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 @@ -31,12 +32,4 @@ * 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 -// Automatically enable the pointer layer when moving the trackpad. -//#define POINTING_DEVICE_AUTO_MOUSE_ENABLE -//#define AUTO_MOUSE_DEFAULT_LAYER 3 -#endif // POINTING_DEVICE_ENABLE +#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c index 003c596d1600..5388a9271ab3 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/keymap.c @@ -1,5 +1,6 @@ /** * Copyright 2022 Charly Delay (@0xcharly) + * Copyright 2023 casuanoob (@casuanoob) * * 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 @@ -16,10 +17,6 @@ */ #include QMK_KEYBOARD_H -#ifdef DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE -# include "timer.h" -#endif // DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE - enum dilemma_keymap_layers { LAYER_BASE = 0, LAYER_FUNCTION, @@ -51,7 +48,7 @@ enum dilemma_keymap_layers { KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, \ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, \ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ - KC_A, TAB_FUN, SPC_NAV, ENT_SYM, BSP_NUM, KC_B + CW_TOGG, TAB_FUN, SPC_NAV, ENT_SYM, BSP_NUM, KC_MUTE /** Convenience row shorthands. */ #define _______________DEAD_HALF_ROW_______________ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX @@ -195,12 +192,6 @@ layer_state_t layer_state_set_user(layer_state_t state) { return state; } # endif // DILEMMA_AUTO_SNIPING_ON_LAYER - -# ifdef POINTING_DEVICE_AUTO_MOUSE_ENABLE -void pointing_device_init_user(void) { - set_auto_mouse_enable(true); // always required before the auto mouse feature will work -} -# endif //POINTING_DEVICE_AUTO_MOUSE_ENABLE #endif // POINTING_DEVICE_ENABLE #if defined(ENCODER_MAP_ENABLE) @@ -210,6 +201,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [LAYER_NAVIGATION] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [LAYER_POINTER] = { ENCODER_CCW_CW(RGB_HUD, RGB_HUI), ENCODER_CCW_CW(RGB_SAD, RGB_SAI) }, [LAYER_NUMERAL] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI), ENCODER_CCW_CW(RGB_SPD, RGB_SPI) }, - [LAYER_SYMBOLS] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, + [LAYER_SYMBOLS] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD), ENCODER_CCW_CW(KC_RGHT, KC_LEFT) }, }; #endif \ No newline at end of file diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md index df40677f4df3..4552f0948dc2 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md +++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/via/readme.md @@ -44,24 +44,4 @@ Change the value of `DILEMMA_AUTO_SNIPING_ON_LAYER` to automatically enable snip ```c #define DILEMMA_AUTO_SNIPING_ON_LAYER LAYER_POINTER -``` - -### Auto pointer layer - -The pointer layer can be automatically enabled when moving the trackball. To enable or disable this behavior, add or remove the following define: - -```c -#define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_ENABLE -``` - -By default, the layer is turned off 1 second after the last registered trackball movement: - -```c -#define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000 -``` - -The trigger sensibility can also be tuned. The lower the value, the more sensible the trigger: - -```c -#define DILEMMA_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8 -``` +``` \ No newline at end of file diff --git a/keyboards/bastardkb/dilemma/3x5_3/rules.mk b/keyboards/bastardkb/dilemma/3x5_3/rules.mk index 3bfb269d33ee..da072b861311 100644 --- a/keyboards/bastardkb/dilemma/3x5_3/rules.mk +++ b/keyboards/bastardkb/dilemma/3x5_3/rules.mk @@ -29,7 +29,5 @@ POINTING_DEVICE_DRIVER = cirque_pinnacle_spi SPLIT_KEYBOARD = yes -DEBOUNCE_TYPE = asym_eager_defer_pk - # RP2040-specific options PICO_INTRINSICS_ENABLED = no # ATM Unsupported by ChibiOS. diff --git a/keyboards/bastardkb/dilemma/dilemma.c b/keyboards/bastardkb/dilemma/dilemma.c index 5452f9e7f6a7..bbaf5cdefa02 100644 --- a/keyboards/bastardkb/dilemma/dilemma.c +++ b/keyboards/bastardkb/dilemma/dilemma.c @@ -2,6 +2,7 @@ * Copyright 2020 Christopher Courtney (@drashna) * Copyright 2021 Quentin LEBASTARD * Copyright 2022 Charly Delay (@0xcharly) + * Copyright 2023 casuanoob (@casuanoob) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Publicw License as published by