diff options
author | Joel Challis <[email protected]> | 2023-02-22 22:49:07 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2023-02-23 09:49:07 +1100 |
commit | 961f0b7b2de54f988daf4ce7b791f91a33e55612 (patch) | |
tree | a96aecd70d8f1341c81dc12d79cbb59a94803241 /keyboards/bastardkb/charybdis | |
parent | ea772468650f7c79a9919a4770d371839985bef0 (diff) | |
download | qmk_firmware-961f0b7b2de54f988daf4ce7b791f91a33e55612.tar.gz qmk_firmware-961f0b7b2de54f988daf4ce7b791f91a33e55612.zip |
Reallocate SAFE_RANGE (#19909)
Diffstat (limited to 'keyboards/bastardkb/charybdis')
-rw-r--r-- | keyboards/bastardkb/charybdis/charybdis.c | 2 | ||||
-rw-r--r-- | keyboards/bastardkb/charybdis/charybdis.h | 1 | ||||
-rw-r--r-- | keyboards/bastardkb/charybdis/readme.md | 17 |
3 files changed, 2 insertions, 18 deletions
diff --git a/keyboards/bastardkb/charybdis/charybdis.c b/keyboards/bastardkb/charybdis/charybdis.c index 2000641f9a..c321af7aa9 100644 --- a/keyboards/bastardkb/charybdis/charybdis.c +++ b/keyboards/bastardkb/charybdis/charybdis.c @@ -304,7 +304,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) { } # endif // !NO_CHARYBDIS_KEYCODES # endif // POINTING_DEVICE_ENABLE - if ((keycode >= POINTER_DEFAULT_DPI_FORWARD && keycode < CHARYBDIS_SAFE_RANGE) || IS_MOUSEKEY(keycode)) { + if (IS_QK_KB(keycode) || IS_MOUSEKEY(keycode)) { debug_charybdis_config_to_console(&g_charybdis_config); } return true; diff --git a/keyboards/bastardkb/charybdis/charybdis.h b/keyboards/bastardkb/charybdis/charybdis.h index 2e311a4aaf..06142aded2 100644 --- a/keyboards/bastardkb/charybdis/charybdis.h +++ b/keyboards/bastardkb/charybdis/charybdis.h @@ -43,7 +43,6 @@ enum charybdis_keycodes { SNIPING_MODE_TOGGLE, DRAGSCROLL_MODE, DRAGSCROLL_MODE_TOGGLE, - CHARYBDIS_SAFE_RANGE, }; # define DPI_MOD POINTER_DEFAULT_DPI_FORWARD diff --git a/keyboards/bastardkb/charybdis/readme.md b/keyboards/bastardkb/charybdis/readme.md index dd0fca0015..01eef250cd 100644 --- a/keyboards/bastardkb/charybdis/readme.md +++ b/keyboards/bastardkb/charybdis/readme.md @@ -121,7 +121,7 @@ The Charybdis firmware defines a number of keycodes to leverage its features, na ``` #ifndef NO_CHARYBDIS_KEYCODES enum charybdis_keycodes { - POINTER_DEFAULT_DPI_FORWARD = SAFE_RANGE, + POINTER_DEFAULT_DPI_FORWARD = QK_KB_0, POINTER_DEFAULT_DPI_REVERSE, POINTER_SNIPING_DPI_FORWARD, POINTER_SNIPING_DPI_REVERSE, @@ -129,7 +129,6 @@ enum charybdis_keycodes { SNIPING_MODE_TOGGLE, DRAGSCROLL_MODE, DRAGSCROLL_MODE_TOGGLE, - CHARYBDIS_SAFE_RANGE, }; #define DPI_MOD POINTER_DEFAULT_DPI_FORWARD @@ -143,20 +142,6 @@ enum charybdis_keycodes { #endif // !NO_CHARYBDIS_KEYCODES ``` -Users extending the keycode set themselves (either in their keymap, or in their userspace) must start at `CHARYBDIS_SAFE_RANGE` to avoid conflicts, _eg._: - -```c -enum userspace_keycodes { -#ifndef NO_CHARYBDIS_KEYCODES - MY_FIRST_KEYCODE = CHARYBDIS_SAFE_RANGE, -#else - MY_FIRST_KEYCODE = SAFE_RANGE, -#endif // !NO_CHARYBDIS_KEYCODES - MY_SECOND_KEYCODE, - … -}; -``` - To disable the custom keycodes, and reduce binary size, simply add a definition in `config.h`: ```c |