mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-09 00:54:17 -04:00
[keyboard] bastardkb: restructure folder hierarchy (#16778)
* bastardkb: restructure folder hierarchy ahead of supporting other adapters/mcus Upcoming support for the following (adapter, mcu) pairs will be submitted in follow-up PRs: - `v2/elitec` - `v2/stemcell` - `blackpill` This PR contains the following changes: - Move previous implementation to an inner `v1/elitec` folder - Move keyboard USB IDs and strings to data driven - Update headers to update maintainers list - Run `qmk format-c` * bastardkb/charybdis: remove broken acceleration implementation * bastardkb/charybdis: fix debug output * bastardkb: add support for BastardKb the `v2/elitec` (adapter, mcu) pair * bastardkb: add Blackpill support * bastardkb/charybdis/3x5: add `bstiq` keymap * bastardkb/charybdis: add fake LEDs to the configuration For the Charybdis 3x5 (respectively 4x6), the LED config now simulates 36 (respectively 58) LEDs instead of the actual 35 (respectively 56) to prevent confusion when testing LEDs during assembly when handedness is not set correctly. Those fake LEDs are bound to the physical bottom-left corner. * bastardkbk/charybdis/readme.md: update build commands Merge pull request #5 from Nathancooke7/update_charybdis_readme_v2_shield. * bastardkb/charybdis: fix Via keymap with blackpill * bastardkb/charybdis: add 3x6 configuration * bastardkb/charybdis: remove unnecessary files * bastardkb/charybdis: remove obsolete code * bastardkb/charybdis/3x6: add Via keymap * bastardkb: add support for Splinky (RP2040) board * bastardkb: initial configuration for the Splinky (SPI not working yet) * bastardkb/charybdis/3x5/v2/splinky: tentative change to enable trackball * bastardkb/charybdis/3x5/v2/splinky: fix SCK, MISO, MOSI pins * bastardkb/charybdis/3x5/v2/splinky: fix SCK, MISO, MOSI pins * bastardkb/charybdis/4x6/v2/splinky: add SPI configuration and enable trackball * bastardkb/charybdis/3x6: add splinky config * bastardkb/*/v2/splinky: update drivers to `vendor` * bastardkb/dilemma: add new board * bastardkb/charybdis: fix infinite loop in `layer_state_set_user(…)` in the `via` keymaps * bastardkb/dilemma: add `bstiq` keymap * bastardkb: specify blackpill boards * bastardkb/charybdis: fix blackpill-specific define syntax * bastardkb: remove `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` which are no longer valid options * bastardkb: fix `QK_BOOT` keycodes * bastardkb/dilemma: fix mouse direction on X axis * bastardkb/charybdis/3x6: adjust CS * bastardkb/dilemma: adjust trackpad configuration * charybdis: fix `PWM33XX_CS_PIN` defines This is a follow-up of https://github.com/qmk/qmk_firmware/pull/17613. * bastardkb: remove Vial mentions from `bstiq` keymaps * Cleanup unnecessary comments Co-authored-by: Nathan <nathan.cooke@compass.com> Co-authored-by: Charly Delay <0xcharly@codesink.dev>
This commit is contained in:
Charly Delay
GitHub
parent
6fa84e8aa9
commit
5b899ceb23
8 changed files with 330 additions and 52 deletions
|
|
@ -19,7 +19,7 @@
|
|||
#ifdef VIA_ENABLE
|
||||
/* VIA configuration. */
|
||||
# define DYNAMIC_KEYMAP_LAYER_COUNT 7
|
||||
#endif // VIA_ENABLE
|
||||
#endif // VIA_ENABLE
|
||||
|
||||
/* Disable unused features. */
|
||||
#define NO_ACTION_ONESHOT
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
|
||||
*/
|
||||
# define TAPPING_TERM 200
|
||||
#endif // TAPPING_TERM
|
||||
#endif // TAPPING_TERM
|
||||
|
||||
/**
|
||||
* \brief Enable rapid switch from tap to hold.
|
||||
|
|
@ -84,16 +84,11 @@
|
|||
/* Charybdis-specific features. */
|
||||
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
// Enable pointer acceleration, which increases the speed by ~2x for large
|
||||
// displacement, while maintaining 1x speed for slow movements. See also:
|
||||
// - `CHARYBDIS_POINTER_ACCELERATION_FACTOR`
|
||||
# define CHARYBDIS_POINTER_ACCELERATION_ENABLE
|
||||
|
||||
// Automatically enable the pointer layer when moving the trackball. See also:
|
||||
// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
|
||||
// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
|
||||
// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
|
||||
/* RGB Matrix. */
|
||||
|
||||
|
|
@ -115,4 +110,4 @@
|
|||
# define RGB_MATRIX_STARTUP_SAT 255
|
||||
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
# include "timer.h"
|
||||
#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
|
||||
enum charybdis_keymap_layers {
|
||||
LAYER_BASE = 0,
|
||||
|
|
@ -38,12 +38,12 @@ static uint16_t auto_pointer_layer_timer = 0;
|
|||
|
||||
# ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
|
||||
# define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
|
||||
|
||||
# ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
|
||||
# define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
|
||||
#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
|
||||
#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
|
||||
#define ESC_MED LT(LAYER_MEDIA, KC_ESC)
|
||||
#define SPC_NAV LT(LAYER_NAVIGATION, KC_SPC)
|
||||
|
|
@ -52,6 +52,13 @@ static uint16_t auto_pointer_layer_timer = 0;
|
|||
#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 \
|
||||
|
|
@ -98,14 +105,14 @@ static uint16_t auto_pointer_layer_timer = 0;
|
|||
#define LAYOUT_LAYER_MEDIA \
|
||||
XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, XXXXXXX,RGB_RMOD, RGB_TOG, RGB_MOD, XXXXXXX, \
|
||||
KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, KC_MPRV, KC_VOLD, KC_MUTE, KC_VOLU, KC_MNXT, \
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
_______, KC_MPLY, KC_MSTP, KC_MSTP, KC_MPLY
|
||||
|
||||
/** \brief Mouse emulation and pointer functions. */
|
||||
#define LAYOUT_LAYER_POINTER \
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, XXXXXXX, \
|
||||
______________HOME_ROW_GACS_L______________, ______________HOME_ROW_GACS_R______________, \
|
||||
_______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, \
|
||||
_______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, \
|
||||
KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1
|
||||
|
||||
/**
|
||||
|
|
@ -217,36 +224,35 @@ report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
|
|||
# ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_NONE);
|
||||
rgb_matrix_sethsv_noeeprom(HSV_GREEN);
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
auto_pointer_layer_timer = timer_read();
|
||||
}
|
||||
return mouse_report;
|
||||
}
|
||||
|
||||
void matrix_scan_kb(void) {
|
||||
void matrix_scan_user(void) {
|
||||
if (auto_pointer_layer_timer != 0 && TIMER_DIFF_16(timer_read(), auto_pointer_layer_timer) >= CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) {
|
||||
auto_pointer_layer_timer = 0;
|
||||
layer_off(LAYER_POINTER);
|
||||
# ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
matrix_scan_user();
|
||||
}
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
|
||||
# ifdef CHARYBDIS_AUTO_SNIPING_ON_LAYER
|
||||
layer_state_t layer_state_set_kb(layer_state_t state) {
|
||||
state = layer_state_set_user(state);
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
charybdis_set_pointer_sniping_enabled(layer_state_cmp(state, CHARYBDIS_AUTO_SNIPING_ON_LAYER));
|
||||
return state;
|
||||
}
|
||||
# endif // CHARYBDIS_AUTO_SNIPING_ON_LAYER
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
# endif // CHARYBDIS_AUTO_SNIPING_ON_LAYER
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
// Forward-declare this helper function since it is defined in rgb_matrix.c.
|
||||
// Forward-declare this helper function since it is defined in
|
||||
// rgb_matrix.c.
|
||||
void rgb_matrix_update_pwm_buffers(void);
|
||||
#endif
|
||||
|
||||
|
|
@ -255,9 +261,9 @@ void shutdown_user(void) {
|
|||
rgblight_enable_noeeprom();
|
||||
rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
|
||||
rgblight_setrgb_red();
|
||||
#endif // RGBLIGHT_ENABLE
|
||||
#endif // RGBLIGHT_ENABLE
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_set_color_all(RGB_RED);
|
||||
rgb_matrix_update_pwm_buffers();
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
|
|
|
|||
71
keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
Normal file
71
keyboards/bastardkb/charybdis/3x6/keymaps/via/config.h
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
/**
|
||||
* 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
|
||||
|
||||
#ifdef VIA_ENABLE
|
||||
/* VIA configuration. */
|
||||
# define DYNAMIC_KEYMAP_LAYER_COUNT 4
|
||||
#endif // VIA_ENABLE
|
||||
|
||||
/* Disable unused features. */
|
||||
#define NO_ACTION_ONESHOT
|
||||
|
||||
#ifndef TAPPING_TERM
|
||||
/**
|
||||
* \brief Configure the global tapping term (default: 200ms).
|
||||
*
|
||||
* If you have a lot of accidental mod activations, crank up the tapping term.
|
||||
*
|
||||
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
|
||||
*/
|
||||
# define TAPPING_TERM 200
|
||||
#endif // TAPPING_TERM
|
||||
|
||||
/* Charybdis-specific features. */
|
||||
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
// Automatically enable the pointer layer when moving the trackball. See also:
|
||||
// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
|
||||
// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
|
||||
// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
|
||||
/* RGB Matrix. */
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
// Disable control of RGB matrix by keycodes (must use firmware implementation
|
||||
// to control the feature).
|
||||
# define RGB_MATRIX_DISABLE_KEYCODES
|
||||
|
||||
// Limit maximum brightness to keep power consumption reasonable, and avoid
|
||||
// disconnects.
|
||||
# undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 64
|
||||
|
||||
// Rainbow swirl as startup mode.
|
||||
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
# define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
|
||||
|
||||
// Slow swirl at startup.
|
||||
# define RGB_MATRIX_STARTUP_SPD 32
|
||||
|
||||
// Startup values.
|
||||
# define RGB_MATRIX_STARTUP_HUE 0
|
||||
# define RGB_MATRIX_STARTUP_SAT 255
|
||||
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
148
keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
Normal file
148
keyboards/bastardkb/charybdis/3x6/keymaps/via/keymap.c
Normal file
|
|
@ -0,0 +1,148 @@
|
|||
/**
|
||||
* 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/>.
|
||||
*/
|
||||
#include QMK_KEYBOARD_H
|
||||
|
||||
enum charybdis_keymap_layers {
|
||||
LAYER_BASE = 0,
|
||||
LAYER_LOWER,
|
||||
LAYER_RAISE,
|
||||
LAYER_POINTER,
|
||||
};
|
||||
|
||||
/** \brief Automatically enable sniping-mode on the pointer layer. */
|
||||
#define CHARYBDIS_AUTO_SNIPING_ON_LAYER LAYER_POINTER
|
||||
|
||||
#ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
static uint16_t auto_pointer_layer_timer = 0;
|
||||
|
||||
# ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
|
||||
# define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
|
||||
|
||||
# ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
|
||||
# define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
|
||||
#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
|
||||
#define LOWER MO(LAYER_LOWER)
|
||||
#define RAISE MO(LAYER_RAISE)
|
||||
#define PT_Z LT(LAYER_POINTER, KC_Z)
|
||||
#define PT_SLSH LT(LAYER_POINTER, KC_SLSH)
|
||||
|
||||
// clang-format off
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[LAYER_BASE] = LAYOUT_charybdis_3x6(
|
||||
// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
|
||||
KC_LGUI, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_RGUI,
|
||||
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
|
||||
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_RCTL,
|
||||
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
|
||||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
|
||||
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
|
||||
KC_BSPC, KC_SPC, LOWER, RAISE, KC_ENT
|
||||
// ╰───────────────────────────╯ ╰──────────────────╯
|
||||
),
|
||||
|
||||
[LAYER_LOWER] = LAYOUT_charybdis_3x6(
|
||||
// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
|
||||
XXXXXXX, RGB_TOG, KC_MNXT, KC_MPLY, KC_MPRV, XXXXXXX, KC_LBRC, KC_7, KC_8, KC_9, KC_RBRC, XXXXXXX,
|
||||
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
|
||||
XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, KC_PPLS, KC_4, KC_5, KC_6, KC_PMNS, XXXXXXX,
|
||||
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, QK_BOOT, KC_PAST, KC_1, KC_2, KC_3, KC_PSLS, XXXXXXX,
|
||||
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
|
||||
XXXXXXX, XXXXXXX, _______, XXXXXXX, _______
|
||||
// ╰───────────────────────────╯ ╰──────────────────╯
|
||||
),
|
||||
|
||||
[LAYER_RAISE] = LAYOUT_charybdis_3x6(
|
||||
// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_MUTE, KC_VOLD, XXXXXXX, XXXXXXX,
|
||||
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
|
||||
XXXXXXX, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
|
||||
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
|
||||
XXXXXXX, KC_HOME, KC_PGUP, KC_PGDN, KC_END, XXXXXXX, QK_BOOT, EEP_RST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
|
||||
_______, _______, XXXXXXX, _______, XXXXXXX
|
||||
// ╰───────────────────────────╯ ╰──────────────────╯
|
||||
),
|
||||
|
||||
[LAYER_POINTER] = LAYOUT_charybdis_3x6(
|
||||
// ╭──────────────────────────────────────────────────────╮ ╭──────────────────────────────────────────────────────╮
|
||||
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, DPI_MOD, S_D_MOD, S_D_MOD, DPI_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
|
||||
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
|
||||
XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
|
||||
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
|
||||
XXXXXXX, _______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, XXXXXXX,
|
||||
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
|
||||
KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1
|
||||
// ╰───────────────────────────╯ ╰──────────────────╯
|
||||
),
|
||||
};
|
||||
// clang-format on
|
||||
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
# ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
|
||||
if (abs(mouse_report.x) > CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD || abs(mouse_report.y) > CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD) {
|
||||
if (auto_pointer_layer_timer == 0) {
|
||||
layer_on(LAYER_POINTER);
|
||||
# ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_NONE);
|
||||
rgb_matrix_sethsv_noeeprom(HSV_GREEN);
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
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) >= CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) {
|
||||
auto_pointer_layer_timer = 0;
|
||||
layer_off(LAYER_POINTER);
|
||||
# ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
}
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
|
||||
# ifdef CHARYBDIS_AUTO_SNIPING_ON_LAYER
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
charybdis_set_pointer_sniping_enabled(layer_state_cmp(state, CHARYBDIS_AUTO_SNIPING_ON_LAYER));
|
||||
return state;
|
||||
}
|
||||
# endif // CHARYBDIS_AUTO_SNIPING_ON_LAYER
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
// Forward-declare this helper function since it is defined in rgb_matrix.c.
|
||||
void rgb_matrix_update_pwm_buffers(void);
|
||||
#endif
|
||||
|
||||
void shutdown_user(void) {
|
||||
#ifdef RGBLIGHT_ENABLE
|
||||
rgblight_enable_noeeprom();
|
||||
rgblight_mode_noeeprom(1);
|
||||
rgblight_setrgb_red();
|
||||
#endif // RGBLIGHT_ENABLE
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_set_color_all(RGB_RED);
|
||||
rgb_matrix_update_pwm_buffers();
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
57
keyboards/bastardkb/charybdis/3x6/keymaps/via/readme.md
Normal file
57
keyboards/bastardkb/charybdis/3x6/keymaps/via/readme.md
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
# Charybdis Mini (3x6) `via` keymap
|
||||
|
||||
The Charydbis Mini (3x6) `via` keymap is inspired from the original [Dactyl Manuform](../../../../../handwired/dactyl_manuform) default keymap, with some features and changes specific to the Charybdis.
|
||||
|
||||
This layout supports RGB matrix. However, due to space constraints on the MCU, only a limited number of effect can be enabled at once. Look at the `config.h` file and enable your favorite effect.
|
||||
|
||||
## 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 [Charybdis 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 [Charybdis 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.
|
||||
|
||||
### 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 `CHARYBDIS_AUTO_SNIPING_ON_LAYER` to automatically enable sniping mode on layer change. By default, sniping mode is enabled on the pointer layer:
|
||||
|
||||
```c
|
||||
#define CHARYBDIS_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 CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
```
|
||||
|
||||
By default, the layer is turned off 1 second after the last registered trackball movement:
|
||||
|
||||
```c
|
||||
#define CHARYBDIS_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 CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
|
||||
```
|
||||
1
keyboards/bastardkb/charybdis/3x6/keymaps/via/rules.mk
Normal file
1
keyboards/bastardkb/charybdis/3x6/keymaps/via/rules.mk
Normal file
|
|
@ -0,0 +1 @@
|
|||
VIA_ENABLE = yes
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
#ifdef VIA_ENABLE
|
||||
/* VIA configuration. */
|
||||
# define DYNAMIC_KEYMAP_LAYER_COUNT 4
|
||||
#endif // VIA_ENABLE
|
||||
#endif // VIA_ENABLE
|
||||
|
||||
/* Disable unused features. */
|
||||
#define NO_ACTION_ONESHOT
|
||||
|
|
@ -33,21 +33,16 @@
|
|||
* See docs.qmk.fm/using-qmk/software-features/tap_hold#tapping-term
|
||||
*/
|
||||
# define TAPPING_TERM 200
|
||||
#endif // TAPPING_TERM
|
||||
#endif // TAPPING_TERM
|
||||
|
||||
/* Charybdis-specific features. */
|
||||
|
||||
#ifdef POINTING_DEVICE_ENABLE
|
||||
// Enable pointer acceleration, which increases the speed by ~2x for large
|
||||
// displacement, while maintaining 1x speed for slow movements.
|
||||
// - `CHARYBDIS_POINTER_ACCELERATION_FACTOR`
|
||||
# define CHARYBDIS_POINTER_ACCELERATION_ENABLE
|
||||
|
||||
// Automatically enable the pointer layer when moving the trackball. See also:
|
||||
// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS`
|
||||
// - `CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD`
|
||||
// #define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
|
||||
/* RGB Matrix. */
|
||||
|
||||
|
|
@ -69,4 +64,4 @@
|
|||
# define RGB_MATRIX_STARTUP_SAT 255
|
||||
# define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
|
||||
# define RGB_MATRIX_STARTUP_HSV RGB_MATRIX_STARTUP_HUE, RGB_MATRIX_STARTUP_SAT, RGB_MATRIX_STARTUP_VAL
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
#ifdef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
# include "timer.h"
|
||||
#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
|
||||
enum charybdis_keymap_layers {
|
||||
LAYER_BASE = 0,
|
||||
|
|
@ -35,18 +35,25 @@ static uint16_t auto_pointer_layer_timer = 0;
|
|||
|
||||
# ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
|
||||
# define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS 1000
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS
|
||||
|
||||
# ifndef CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
|
||||
# define CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD 8
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
|
||||
#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_THRESHOLD
|
||||
#endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
|
||||
#define LOWER MO(LAYER_LOWER)
|
||||
#define RAISE MO(LAYER_RAISE)
|
||||
#define PT_Z LT(LAYER_POINTER, KC_Z)
|
||||
#define PT_SLSH LT(LAYER_POINTER, KC_SLSH)
|
||||
|
||||
#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
|
||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[LAYER_BASE] = LAYOUT_charybdis_4x6(
|
||||
|
|
@ -102,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
|||
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
|
||||
XXXXXXX, KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_RSFT, KC_RCTL, KC_RALT, KC_RGUI, XXXXXXX,
|
||||
// ├──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────┤
|
||||
XXXXXXX, _______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, XXXXXXX,
|
||||
XXXXXXX, _______, DRGSCRL, SNIPING, EEP_RST, QK_BOOT, QK_BOOT, EEP_RST, SNIPING, DRGSCRL, _______, XXXXXXX,
|
||||
// ╰──────────────────────────────────────────────────────┤ ├──────────────────────────────────────────────────────╯
|
||||
KC_BTN2, KC_BTN1, KC_BTN3, KC_BTN3, KC_BTN1,
|
||||
XXXXXXX, KC_BTN2, KC_BTN2
|
||||
|
|
@ -120,33 +127,31 @@ report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) {
|
|||
# ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_NONE);
|
||||
rgb_matrix_sethsv_noeeprom(HSV_GREEN);
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
auto_pointer_layer_timer = timer_read();
|
||||
}
|
||||
return mouse_report;
|
||||
}
|
||||
|
||||
void matrix_scan_kb(void) {
|
||||
void matrix_scan_user(void) {
|
||||
if (auto_pointer_layer_timer != 0 && TIMER_DIFF_16(timer_read(), auto_pointer_layer_timer) >= CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_TIMEOUT_MS) {
|
||||
auto_pointer_layer_timer = 0;
|
||||
layer_off(LAYER_POINTER);
|
||||
# ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_mode_noeeprom(RGB_MATRIX_STARTUP_MODE);
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
# endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
matrix_scan_user();
|
||||
}
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
# endif // CHARYBDIS_AUTO_POINTER_LAYER_TRIGGER_ENABLE
|
||||
|
||||
# ifdef CHARYBDIS_AUTO_SNIPING_ON_LAYER
|
||||
layer_state_t layer_state_set_kb(layer_state_t state) {
|
||||
state = layer_state_set_user(state);
|
||||
layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
charybdis_set_pointer_sniping_enabled(layer_state_cmp(state, CHARYBDIS_AUTO_SNIPING_ON_LAYER));
|
||||
return state;
|
||||
}
|
||||
# endif // CHARYBDIS_AUTO_SNIPING_ON_LAYER
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
# endif // CHARYBDIS_AUTO_SNIPING_ON_LAYER
|
||||
#endif // POINTING_DEVICE_ENABLE
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
// Forward-declare this helper function since it is defined in rgb_matrix.c.
|
||||
|
|
@ -158,9 +163,9 @@ void shutdown_user(void) {
|
|||
rgblight_enable_noeeprom();
|
||||
rgblight_mode_noeeprom(1);
|
||||
rgblight_setrgb_red();
|
||||
#endif // RGBLIGHT_ENABLE
|
||||
#endif // RGBLIGHT_ENABLE
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
rgb_matrix_set_color_all(RGB_RED);
|
||||
rgb_matrix_update_pwm_buffers();
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
#endif // RGB_MATRIX_ENABLE
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue