-
-
Notifications
You must be signed in to change notification settings - Fork 19.4k
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
DWIN_LCD_PROUI compile errors & orphan code #25304
Conversation
… into bugfix-2.1.x
… into bugfix-2.1.x
… into bugfix-2.1.x
… into bugfix-2.1.x
… into bugfix-2.1.x
… into bugfix-2.1.x
… into bugfix-2.1.x
… into bugfix-2.1.x
… into bugfix-2.1.x
1) remove menu items when heatbed isn't present 2) restore #if logic so that onDrawHomeOffset menu item isn't an orphan 3) restore #if logic so that onDrawZOffset menu item is executed if either of the following are true: BABYSTEPPING is enabled and a probe is NOT enabled BABYSTEPPING is enabled and BABYSTEP_ZPROBE_OFFSET is enabled
@mriscoc Should be able to. |
Add in original condition so now it'll only execute when n!= PIDTEMP_START
Just changed new line 1254 so that it only executes when HMI_value.pidresult isn't equal to PIDTEMP_START. This makes it only execute the update under the same conditions as new line 1252. |
I'm preparing a PR with the menu items for Linear Advance and Input Shaping. I think that currently I have those issues fixed in my working sources. |
Let me know for sure. I'll close this PR if that's the case. |
40e1292
to
339773d
Compare
e90c213
to
4b9bb85
Compare
27df113
to
8d31429
Compare
de391db
to
0f34163
Compare
@mriscoc ; @Bob-the-Kuhn — Are these changes still needed, or is there a pending ProUI update that already has them? If needed, I can put together a PR based on the latest ProUI, rebased on the current state of |
@thinkyhead the code for ProUI has diverged from the code from my repository, so I need to do some more work to provide a good PR with the latest changes. |
Finally, here is the latest ProUI PR: #26003 |
This PR corrects three conditions in dwin.cpp:
MENU_ITEM(ICON_SetHome, MSG_SET_HOME_OFFSETS, onDrawHomeOffset, SetHome);
Steps to Reproduce:
Here's a minimal set of config files that demonstrate the problems.
Config.zip
This PR fixes the issues in #25271
NOTE: I do not have the hardware needed to test this PR.
Changes to fix DWIN_LCD_PROUI compile time errors when TEMP_SENSOR_BED being set to 0
Add #if HAS_HEATED_BED logic in three places:
Changes to fix DWIN_LCD_PROUI compile time errors when having a probe, enabling BABYSTEPPING, and NOT enabling BABYSTEP_ZPROBE_OFFSET
This backs out the changes from PR #25176 on the old line 3327.
The routine onDrawZOffset is only defined when either of the following is true:
The routine onDrawZOffset is only used in this line:
EDIT_ITEM(ICON_Zoffset, MSG_ZPROBE_ZOFFSET, onDrawZOffset, SetZOffset, &BABY_Z_VAR);
Currently this line is only compiled when BABYSTEPPING is enabled and a probe is enabled. Prior to PR #25176 it would be executed if either of the following are true:
Changes to allow MENU_ITEM(ICON_SetHome, MSG_SET_HOME_OFFSETS, onDrawHomeOffset, SetHome); to execute
This backs out the changes from PR #25176 on the old lines 3026, 3028 & 3030.