Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bug] Fix compilation issue with WPM #18965

Merged
merged 1 commit into from
Nov 5, 2022
Merged

[Bug] Fix compilation issue with WPM #18965

merged 1 commit into from
Nov 5, 2022

Conversation

drashna
Copy link
Member

@drashna drashna commented Nov 5, 2022

Description

WPM_ALLOW_COUNT_REGRESSION uses mods and keycodes, and the recent changes break the chain of includes.

Types of Changes

  • Core
  • Bugfix

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@drashna drashna requested review from zvecr and a team November 5, 2022 17:51
@github-actions github-actions bot added the core label Nov 5, 2022
@zvecr
Copy link
Member

zvecr commented Nov 5, 2022

Whats the scenario that it fails in? A few test builds locally are not showing any failure.

WPM_ALLOW_COUNT_REGRESSION and something keycode related?

@drashna
Copy link
Member Author

drashna commented Nov 5, 2022

WPM_ALLOW_COUNT_REGRESSION and something keycode related

Yup, exactly. the "get_mods" function is not available anymore. I have it enabled/defined, and it errors out. adding the action_util.h include fixes it immediately.

builddefs/build_keyboard.mk:518: *** [.build/obj_bastardkb_charybdis_4x6_v1_elitec_drashna/quantum/wpm.o] error 1

#0 .build/obj_bastardkb_charybdis_4x6_v1_elitec_drashna/protocol/chibios/usb_main.o at /Users/drashna/repos/qmk_firmware/builddefs/build_keyboard.mk:514
#1 elf at /Users/drashna/repos/qmk_firmware/builddefs/common_rules.mk:187
#2 build at /Users/drashna/repos/qmk_firmware/builddefs/build_keyboard.mk:489
#3 all at /Users/drashna/repos/qmk_firmware/builddefs/build_keyboard.mk:483
Compiling: quantum/wpm.c quantum/wpm.c: In function 'wpm_regress_count':
quantum/wpm.c:90:36: error: 'QK_LCTL' undeclared (first use in this function); did you mean 'KC_LCTL'?
bool weak_modded = (keycode >= QK_LCTL && keycode < QK_LSFT) || (keycode >= QK_RCTL && keycode < QK_RSFT);
^~~~~~~
KC_LCTL
quantum/wpm.c:90:36: note: each undeclared identifier is reported only once for each function it appears in
quantum/wpm.c:90:57: error: 'QK_LSFT' undeclared (first use in this function); did you mean 'KC_LSFT'?
bool weak_modded = (keycode >= QK_LCTL && keycode < QK_LSFT) || (keycode >= QK_RCTL && keycode < QK_RSFT);
^~~~~~~
KC_LSFT
quantum/wpm.c:90:81: error: 'QK_RCTL' undeclared (first use in this function); did you mean 'QK_RBT'?
bool weak_modded = (keycode >= QK_LCTL && keycode < QK_LSFT) || (keycode >= QK_RCTL && keycode < QK_RSFT);
^~~~~~~
QK_RBT
quantum/wpm.c:90:102: error: 'QK_RSFT' undeclared (first use in this function); did you mean 'QK_RBT'?
bool weak_modded = (keycode >= QK_LCTL && keycode < QK_LSFT) || (keycode >= QK_RCTL && keycode < QK_RSFT);
^~~~~~~
QK_RBT
[ERRORS]
|
|
|

@zvecr zvecr merged commit 352beea into qmk:develop Nov 5, 2022
@drashna drashna deleted the fix/wpm branch November 5, 2022 19:58
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
elpekenin pushed a commit to elpekenin/qmk_firmware that referenced this pull request Dec 7, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants