-
-
Notifications
You must be signed in to change notification settings - Fork 19.2k
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
Various small fixes/tweaks #26502
Various small fixes/tweaks #26502
Conversation
remove whitespace, add hyphen (-) remove unused `INLINE_USART_IRQ` optimize code
have `HAS_Z_OFFSET_ITEM` defined in one file undef PROBE_OFFSET_ZMIN when ProUI is disabled
Sounds like these Ender-3 V2 UIs need to decouple from requiring/assuming a probe is installed instead of this workaround. |
it uses that probe offset value regardless of one or not, using it for changing the Z-offset. how about using a - setPFloatOnClick(PROBE_OFFSET_ZMIN, PROBE_OFFSET_ZMAX, 2, applyZOffset, liveZOffset);
+ setPFloatOnClick(TERN(PROBE_OFFSET_ZMIN, 20), TERN(PROBE_OFFSET_ZMAX, 20), 2, applyZOffset, liveZOffset); or completely omit this #undef since the other or we could add somewhere #ifndef PROBE_OFFSET_ZMIN
#define PROBE_OFFSET_ZMIN 20
#endif
#ifndef PROBE_OFFSET_ZMAX
#define PROBE_OFFSET_ZMAX 20
#endif |
"#if DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)" is literally HAS_AUTOLEVEL
@@ -1139,7 +1131,7 @@ void popupWindowHome(const bool parking/*=false*/) { | |||
} | |||
} | |||
|
|||
#if HAS_ONESTEP_LEVELING | |||
#if HAS_AUTOLEVEL |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This includes UBL but unfortunately UBL is rarely a one step leveling process. It usually requires an auto leveling step followed by a manual leveling step. So some additional checking must be done to ensure that UBL is actually one-step (i.e., it can reach all mesh points with the probe) or additional UI must be developed to guide users through the following steps.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so then it makes sense to be HAS_AUTOLEVEL
?
as far as I understand it, UBL doesnt have to be followed by manual leveling. the auto level option usually probes all the points, and any points not able to reach, it fills in the unprobed values based on the surrounding probed points, and in my experience with great accuracy.
for Bilinear or UBL, its usually the default, and one and done kind of thing. and if they wanted to check the points or do it manually they have that option as well.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
UBL only fills in the un-probed values when commanded to do so by a call to G29 P3
. I don't think this old Creality screen implementation does that.
278f930
to
979edb6
Compare
if one had no Probe and no Mesh, they can still adjust their Z-Offset
… into bugfix-2.1.x-Dec
… into bugfix-2.1.x-Dec
swap to TERN_ in switch case
… into bugfix-2.1.x-Dec
removed COLOR_AQUA - unused, same as COLOR_CYAN
… into bugfix-2.1.x-Dec
… into bugfix-2.1.x-Dec
… into bugfix-2.1.x-Dec
… into bugfix-2.1.x-Dec
… into bugfix-2.1.x-Dec
It is not possible to review all these changes and accept them all in one PR. You should cherry-pick parts of this large PR into smaller pieces with changes limited to specific areas of the code, or only addressing specific things, and submit those separately as smaller PRs. |
Description
Most file changes remove
HAS_STATUS_MESSAGE
swap w/HAS_DISPLAY
Also, 2nd most are changes to whitespace, and comments.
add hyphen (-) to "Gcode" -- (follow up to "📝 GCode => G-Code")i believe done in another PRremove unuseddone in another PRINLINE_USART_IRQ
MMS_SCALED
tofeedrate_mm_s
+ simplified the PID Plot code in proui/dwin.cpp so it's easier to readCOLOR_AQUA
because it is unused, and also the same asCOLOR_CYAN
HAS_TRAMMING_WIZARD
done in another PRset_status_and_level(..., level=0)
from Enabled 2 mesh viewers #26181withoutlevel=0
, we can just add, 0
like soset_status_and_level(...code.., 0)
??done in another PRextrude_length
=>purge_length
to match othersdtostrf
=>p/w_float_t
--M114.cpp|M48.cppUpdate
follow up to "[BUG] DWIN ProUI: error: 'PROBE_OFFSET_ZMIN' was not declared in this scope #26505"
in ProUI, created
_OFFSET_ZMIN/MAX
like in is in CrealityUI, made it so it =PROBE_OFFSET_ZMIN/MAX
ifHAS_BED_PROBE
/defined, otherwise =+/-20
optimize #define/#include in JyersUI and CrealityUI as well
use
PROBE_SELECTED
to enabledPROBE_OFFSET_ZMIN|MAX
(because --see below--`)simplified Print Progress (
_printtime
,_remain_time
,_percent_done
) in ProUImay need to adjust layout position on the UI
duration_t
--toDigital
, andpcttostrpctrj
update bedlevel_tools.cpp, utilize unused functions
add function to
zeroPoint
(reset single mesh x/y coordinate)update trammingwizard:
shows correct screen while inuse - rather than user being able to still navigate menu
exits the wizard - displays within tolerance - if values are 0.00 as fail-safe, otherwise gives false reading.
show's Lower/Raise in green/red.
move
dwinIconShow
to respected headeradd to ESDiag: filament sensor "PRESENT" (green) / "Runout Detected" (red)
ES_REPORT
=>ES_REPORTS
to not be confused with previously defined in endstops.cppremove/replace
dwinPopupConfirm
w/dwinPopupContinue
typo in module/probe.cpp
Probe::run_z_probe()
. "-float" to "- float"swap
const char *
withPGM_P
(which is defined asconst char *
)Tweak
CASELIGHT_USES_BRIGHTNESS
in ProUI, separate function that sets it into "apply" and "live"fix tramming wizard, so now:
Note
I'm not so sure about this onein pinsDebug_list.h I added Maple support which have their SDIO defined asBOARD_SDIO_*
in Marlin\src\inc\Conditionals_post.h
you will see
removed
HAS_ONESTEP_LEVELING
, replaced withHAS_AUTOLEVEL
because(previously...)
this code is the same as
HAS_AUTOLEVEL
, as you can see here:RequirementsBenefitsConfigurationsRelated Issues
if anyone wishes to take another look, these are what I suggest:
see if buildroot/tests/STM32F103RE_creality needs anything
and also...
in JyersUI/dwin.cpp
MAX_Z_OFFSET
seemed out of place withoutMIN_Z_OFFSET
basically these values can be used even without
HAS_Z_OFFSET_ITEM
(BABYSTEPPING
), it would cause an error being undefined for some Configurations