keyboard/qmk-keychron-q3-colemak-dh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compile error when define constant mode (#474)

Browse Source 
* Combine conditional expressions in one line

* Remove spaces
This commit is contained in:
lsh4711 2023-06-09 14:20:36 +09:00 committed by GitHub
parent 105915582a
commit f1bdb0531c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quantum/qmk_settings.c
View File

@ -26,7 +26,7 @@ static void auto_shift_timeout_apply(void) {
set_autoshift_timeout(QS.auto_shift_timeout); set_autoshift_timeout(QS.auto_shift_timeout);
} }
#ifdef MOUSEKEY_ENABLE #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED)
static void mousekey_apply(void) { static void mousekey_apply(void) {
mk_delay = QS.mousekey_delay / 10; mk_delay = QS.mousekey_delay / 10;
mk_interval = QS.mousekey_interval; mk_interval = QS.mousekey_interval;
@ -48,7 +48,7 @@ static const qmk_settings_proto_t protos[] PROGMEM = {
DECLARE_STATIC_SETTING(6, osk_timeout), DECLARE_STATIC_SETTING(6, osk_timeout),
DECLARE_STATIC_SETTING(7, tapping_term), DECLARE_STATIC_SETTING(7, tapping_term),
DECLARE_STATIC_SETTING(8, tapping), DECLARE_STATIC_SETTING(8, tapping),
#ifdef MOUSEKEY_ENABLE #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED)
DECLARE_STATIC_SETTING_NOTIFY(9, mousekey_delay, mousekey_apply), DECLARE_STATIC_SETTING_NOTIFY(9, mousekey_delay, mousekey_apply),
DECLARE_STATIC_SETTING_NOTIFY(10, mousekey_interval, mousekey_apply), DECLARE_STATIC_SETTING_NOTIFY(10, mousekey_interval, mousekey_apply),
DECLARE_STATIC_SETTING_NOTIFY(11, mousekey_move_delta, mousekey_apply), DECLARE_STATIC_SETTING_NOTIFY(11, mousekey_move_delta, mousekey_apply),
@ -166,7 +166,7 @@ void qmk_settings_reset(void) {
QS.osk_tap_toggle = ONESHOT_TAP_TOGGLE; QS.osk_tap_toggle = ONESHOT_TAP_TOGGLE;
QS.osk_timeout = ONESHOT_TIMEOUT; QS.osk_timeout = ONESHOT_TIMEOUT;
#ifdef MOUSEKEY_ENABLE #if defined(MOUSEKEY_ENABLE) && !defined(MK_3_SPEED)
QS.mousekey_delay = MOUSEKEY_DELAY; QS.mousekey_delay = MOUSEKEY_DELAY;
QS.mousekey_interval = MOUSEKEY_INTERVAL; QS.mousekey_interval = MOUSEKEY_INTERVAL;
QS.mousekey_move_delta = MOUSEKEY_MOVE_DELTA; QS.mousekey_move_delta = MOUSEKEY_MOVE_DELTA;