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

Various small fixes/tweaks #26502

Closed
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
41d31ca
general small fixes/tweaks
classicrocker883 Dec 6, 2023
f93e12a
Update Probe Offset dependencies
classicrocker883 Dec 7, 2023
c10d5dc
edit Conditionals_post.h
classicrocker883 Dec 7, 2023
87dbb8e
Fix Cutter.md, more gcode => G-code
thisiskeithb Dec 7, 2023
806a728
omit PROBE_OFFSET_ZMIN/MAX
classicrocker883 Dec 8, 2023
f2368ee
change to HAS_LEVELING - creality dwin.cpp
classicrocker883 Dec 8, 2023
82c2457
replace HAS_ONESTEP_LEVELING => HAS_AUTOLEVEL
classicrocker883 Dec 8, 2023
d2b3bbb
Update Conditionals_post.h
thinkyhead Dec 8, 2023
979edb6
serial tweaks
thinkyhead Dec 8, 2023
ee55dfe
Conditionals_post.h replace HAS_ZOFFSET_ITEM => PROBE_SELECTED
classicrocker883 Dec 8, 2023
e696be3
Update Conditionals_post.h, include default-no probe/no mesh
classicrocker883 Dec 8, 2023
4ef2cbf
add default-no probe, no mesh to tests
classicrocker883 Dec 8, 2023
55f5122
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Dec 9, 2023
27b2353
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Dec 12, 2023
aa7e068
simplify MPC/PID Plot, dwin.cpp
classicrocker883 Dec 12, 2023
8a6bcc2
add HAS_TRAMMING_WIZARD
classicrocker883 Dec 12, 2023
2276bf6
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Dec 13, 2023
0a6d2b2
update dwin.cpp spacing
classicrocker883 Dec 13, 2023
cff0e4f
update DWIN UI - spacing
classicrocker883 Dec 15, 2023
cef2bda
update ProUI, remove unused, use Move/Probe methods
classicrocker883 Dec 15, 2023
a77fec9
revert #undef, change to _OFFSET_ZMIN|MAX
classicrocker883 Dec 21, 2023
590d66f
tweak spacing
classicrocker883 Dec 21, 2023
981aa04
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Dec 21, 2023
90607e1
small change
classicrocker883 Dec 21, 2023
41b5f74
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Dec 23, 2023
1c75a65
fix error, duplicate case
classicrocker883 Dec 25, 2023
843fc13
rename to G-Code, Marlin webui
classicrocker883 Dec 25, 2023
7fabcef
update digitpot spacing
classicrocker883 Dec 25, 2023
5722f55
update more spacing
classicrocker883 Dec 25, 2023
2184b96
add ZeroMesh in editmesh menu
classicrocker883 Dec 27, 2023
4b3ab1a
add space to "extern"
classicrocker883 Jan 1, 2024
0472c05
remove extra ";" from invaders.h
classicrocker883 Jan 1, 2024
b9ab56e
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 2, 2024
f5cadc5
update pins_CREALITY_CR4NTXXC10.h w/HAS_DWIN_E3V2
classicrocker883 Jan 2, 2024
36d9b25
remove DWIN_CREALITY_LCD from MarlinCore.cpp, use ui.update() - reloc…
classicrocker883 Jan 2, 2024
03a21fd
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 4, 2024
a7d1a8c
revert Configuration_adv.h
classicrocker883 Jan 6, 2024
eb4d1fc
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 6, 2024
fa02312
fix CrealityUI error - ui.update/kill_screen
classicrocker883 Jan 6, 2024
3a0cc0a
fix proui error
classicrocker883 Jan 6, 2024
3719b5d
fix other proui error
classicrocker883 Jan 6, 2024
22e8365
transfer from Enable 2 mesh viewers as fixes/tweaks
classicrocker883 Jan 7, 2024
f2947b1
remove comment (unused kill_screen)
classicrocker883 Jan 7, 2024
a59e022
add M48 pause, return if error
classicrocker883 Jan 8, 2024
39118d8
removed because result = default
classicrocker883 Jan 8, 2024
c79127b
no such ZHOME_BEFORE_LEVELING, removed
classicrocker883 Jan 9, 2024
7b618d6
fix for redef, rename SDIO_
classicrocker883 Jan 9, 2024
09a2aa3
unused option for smooth encoder added
classicrocker883 Jan 10, 2024
db8daf9
update dwin.cpp - add HAS_FLOW/FEEDRATE_EDIT
classicrocker883 Jan 10, 2024
cedf465
remove space
classicrocker883 Jan 10, 2024
ec5675d
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 10, 2024
3b399ea
fix for error, fontWidth/Height not used by these UI
classicrocker883 Jan 11, 2024
b527e50
update print progress
classicrocker883 Jan 11, 2024
bd80dd0
update print progress - simplify
classicrocker883 Jan 13, 2024
3a4438b
update ProgressElapsed
classicrocker883 Jan 14, 2024
c76f337
update dwin.cpp, bedleveltools
classicrocker883 Jan 16, 2024
aa3478b
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 16, 2024
b2ddf10
add to pinsDebug_list.h
classicrocker883 Jan 18, 2024
add7886
move dwinIconShow to dwin_lcd.h, replace dwinPopupConfirm w/ dwinPopu…
classicrocker883 Jan 19, 2024
d9405de
change signed float to long
classicrocker883 Jan 19, 2024
2417818
fix for manualMeshSave
classicrocker883 Jan 19, 2024
0def0b1
move previous up
classicrocker883 Jan 19, 2024
739931d
fix convert error
classicrocker883 Jan 20, 2024
f299a64
revert pins_trigorilla
classicrocker883 Jan 20, 2024
5aebe9f
update ESDiag - is filament sensor?
classicrocker883 Jan 20, 2024
e9b742d
misc. adjustments
thinkyhead Jan 20, 2024
7cab0c8
extra ui.*
thinkyhead Jan 20, 2024
b5d6bd1
Fix dwinPopupContinue
thinkyhead Jan 20, 2024
55ca949
dwinPopupContinue is undefined without #include dwin_popup.h
classicrocker883 Jan 20, 2024
750b47c
remove unneeded highlightY
classicrocker883 Jan 20, 2024
7eda51b
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 20, 2024
021ad75
🌐 Internationalize
thinkyhead Jan 21, 2024
34fbc57
prettify
thinkyhead Jan 21, 2024
e7c0ef8
update spanish lang
classicrocker883 Jan 21, 2024
4187388
missing _ typo error
classicrocker883 Jan 21, 2024
938b0fb
revert pinsDebug_list
classicrocker883 Jan 21, 2024
10b061a
remove bool from readEEPROM
classicrocker883 Jan 21, 2024
9eb38a0
4 arg dwinIconShow unused, rename dacaiIconShow
classicrocker883 Jan 21, 2024
f0249ac
fix some code wrappers
thinkyhead Jan 21, 2024
73816f9
wrappers cont.
classicrocker883 Jan 22, 2024
9f128a1
Merge branch 'bugfix-2.1.x' into pr/26502
thinkyhead Jan 22, 2024
ec3d22f
Merge branch 'bugfix-2.1.x' into pr/26502
thinkyhead Jan 22, 2024
d41f826
move test
thinkyhead Jan 22, 2024
26f6dca
…more…
thinkyhead Jan 22, 2024
1ee0684
if HAS_DWIN_E3V2 => HAS_DISPLAY then…
thinkyhead Jan 22, 2024
73119c6
…and…
thinkyhead Jan 22, 2024
9689b9c
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Jan 22, 2024
227115a
move up settings.load
classicrocker883 Jan 22, 2024
16edc20
update runout string
classicrocker883 Jan 22, 2024
52fc2c6
revert change to popup
classicrocker883 Jan 25, 2024
ce572da
update gcode_preview - fix for restarting after multiple clicks
classicrocker883 Jan 26, 2024
03ae02d
fix typo
classicrocker883 Jan 27, 2024
975ba09
initialize msg array
classicrocker883 Jan 27, 2024
ab61dba
shortened some espanol
classicrocker883 Jan 27, 2024
5fcab1f
fix tramwiz, so now...
classicrocker883 Jan 31, 2024
35c54cf
fix (-) float
classicrocker883 Feb 3, 2024
41eb690
toggleCheckboxLine -- ^= true
classicrocker883 Feb 3, 2024
4c8a9fa
null msg, meshviewer.cpp
classicrocker883 Feb 3, 2024
d1e6d1c
OPTARG to update_software_endstops
classicrocker883 Feb 4, 2024
f145848
tweak trammingwizard
classicrocker883 Feb 5, 2024
f90b455
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Feb 9, 2024
6640e78
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Feb 14, 2024
85ab376
update printtime
classicrocker883 Feb 19, 2024
ed845d4
add millis_t to duration_t.h
classicrocker883 Feb 19, 2024
22614cd
swap const char * w/ PGM_P - ignore previous commits of same
classicrocker883 Feb 19, 2024
819145f
revert PGM_P swap on gcode_preview
classicrocker883 Feb 19, 2024
db3684d
tweak caselightbrightness
classicrocker883 Feb 21, 2024
9c7813d
revert duration_t.h for other PR
classicrocker883 Feb 21, 2024
27413e0
change to update every second
classicrocker883 Feb 21, 2024
5f93b1c
update ubl_g29.cpp comment spacing
classicrocker883 Feb 22, 2024
51b786f
captialize letter
classicrocker883 Feb 22, 2024
a2d7fe9
update comments+spacing, ubl files
classicrocker883 Feb 22, 2024
0a006e0
update ubl_G29
classicrocker883 Feb 22, 2024
37f3c36
update ubl_G29
classicrocker883 Feb 22, 2024
71ba854
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Mar 14, 2024
c1f7c2e
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Apr 10, 2024
4aee98b
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Apr 10, 2024
4a3a301
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Apr 14, 2024
66cc566
remove HAS_STATUS_MESSAGE w/HAS_DISPLAY, update DWIN, use ALL(...)
classicrocker883 Apr 14, 2024
9011371
add kill_screen to CrealityUI, group MarlinUI functions in JyersUI
classicrocker883 Apr 14, 2024
e1b965b
add dwinPopupConfirm/Continue, update Creality/JyersUI dwinDrawString
classicrocker883 Apr 14, 2024
4411490
#include in dwin.cpp
classicrocker883 Apr 20, 2024
a09df0e
Merge branch 'bugfix-2.1.x' of https://github.com/MarlinFirmware/Marl…
classicrocker883 Apr 23, 2024
2774a48
remove characters causing issue with make format-pins
classicrocker883 Apr 24, 2024
095230a
revert pin *.h
classicrocker883 Apr 24, 2024
0c1aee9
Update jyersui dwin.cpp - manualValueUpdate
classicrocker883 Apr 24, 2024
f6b4f75
Update proui bedlevel_tools.cpp - manualValueUpdate
classicrocker883 Apr 24, 2024
349235a
update proui spacing/comments
classicrocker883 Apr 24, 2024
84567d8
Update jyers ui dwin.cpp
classicrocker883 Apr 24, 2024
098a62e
Update dwin_popup.h spacing
classicrocker883 Apr 24, 2024
72e4984
Merge branch 'bugfix-2.1.x' into pr/26502
thinkyhead May 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -3876,7 +3876,7 @@
// @section reporting

// Extra options for the M114 "Current Position" report
//#define M114_DETAIL // Use 'M114` for details to check planner calculations
//#define M114_DETAIL // Use 'M114' for details to check planner calculations
//#define M114_REALTIME // Real current position based on forward kinematics
//#define M114_LEGACY // M114 used to synchronize on every call. Enable if needed.

Expand All @@ -3888,7 +3888,6 @@
* Spend 28 bytes of SRAM to optimize the G-code parser
*/
#define FASTER_GCODE_PARSER

#if ENABLED(FASTER_GCODE_PARSER)
//#define GCODE_QUOTED_STRINGS // Support for quoted string parameters
#endif
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/HAL/HC32/MarlinSerial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

/**
* Not every MarlinSerial instance should handle emergency parsing, as
* it would not make sense to parse GCode from TMC responses
* it would not make sense to parse G-Code from TMC responses
*/
constexpr bool serial_handles_emergency(int port) {
return false
Expand Down
2 changes: 0 additions & 2 deletions Marlin/src/inc/Conditionals_LCD.h
Original file line number Diff line number Diff line change
Expand Up @@ -1466,8 +1466,6 @@
#undef Z_PROBE_ERROR_TOLERANCE
#undef MULTIPLE_PROBING
#undef EXTRA_PROBING
#undef PROBE_OFFSET_ZMIN
#undef PROBE_OFFSET_ZMAX
#undef PAUSE_BEFORE_DEPLOY_STOW
#undef PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED
#undef PROBING_HEATERS_OFF
Expand Down
6 changes: 5 additions & 1 deletion Marlin/src/inc/Conditionals_post.h
Original file line number Diff line number Diff line change
Expand Up @@ -2946,7 +2946,11 @@
/**
* Bed Probe dependencies
*/
#if ANY(MESH_BED_LEVELING, HAS_BED_PROBE)
#if ANY(BABYSTEPPING, PROBE_SELECTED)
#define HAS_ZOFFSET_ITEM 1
classicrocker883 marked this conversation as resolved.
Show resolved Hide resolved
#endif

#if HAS_ZOFFSET_ITEM
#ifndef PROBE_OFFSET_ZMIN
#define PROBE_OFFSET_ZMIN -20
classicrocker883 marked this conversation as resolved.
Show resolved Hide resolved
#endif
Expand Down
42 changes: 17 additions & 25 deletions Marlin/src/lcd/e3v2/creality/dwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@
//#define USE_STRING_HEADINGS
//#define USE_STRING_TITLES

#if DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
#define HAS_ONESTEP_LEVELING 1
#endif

#if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
#define HAS_ZOFFSET_ITEM 1
#endif

#if !HAS_BED_PROBE && ENABLED(BABYSTEPPING)
#define JUST_BABYSTEP 1
#endif
Expand Down Expand Up @@ -68,7 +60,7 @@
#include "../../../feature/host_actions.h"
#endif

#if HAS_ONESTEP_LEVELING
#if HAS_LEVELING
#include "../../../feature/bedlevel/bedlevel.h"
#endif

Expand Down Expand Up @@ -504,7 +496,7 @@ void drawBackFirst(const bool is_sel=true) {
#define PREHEAT_CASE_TOTAL PREHEAT_CASE_SAVE

#define ADVSET_CASE_HOMEOFF 1
#define ADVSET_CASE_PROBEOFF (ADVSET_CASE_HOMEOFF + ENABLED(HAS_ONESTEP_LEVELING))
#define ADVSET_CASE_PROBEOFF (ADVSET_CASE_HOMEOFF + ENABLED(HAS_AUTOLEVEL))
#define ADVSET_CASE_HEPID (ADVSET_CASE_PROBEOFF + ENABLED(HAS_HOTEND))
#define ADVSET_CASE_BEDPID (ADVSET_CASE_HEPID + ENABLED(HAS_HEATED_BED))
#define ADVSET_CASE_PWRLOSSR (ADVSET_CASE_BEDPID + ENABLED(POWER_LOSS_RECOVERY))
Expand Down Expand Up @@ -1139,7 +1131,7 @@ void popupWindowHome(const bool parking/*=false*/) {
}
}

#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL
Copy link
Member

@thinkyhead thinkyhead Dec 8, 2023

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.

Copy link
Contributor Author

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.

Copy link
Member

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.


void popupWindowLeveling() {
clearMainWindow();
Expand Down Expand Up @@ -1266,7 +1258,7 @@ void gotoMainMenu() {
iconPrint();
iconPrepare();
iconControl();
TERN(HAS_ONESTEP_LEVELING, iconLeveling, iconStartInfo)();
TERN(HAS_AUTOLEVEL, iconLeveling, iconStartInfo)();
}

void hmiPlanMove(const feedRate_t fr_mm_s) {
Expand Down Expand Up @@ -2086,7 +2078,7 @@ void hmiMainMenu() {
case PAGE_PRINT: iconPrint(); break;
case PAGE_PREPARE: iconPrint(); iconPrepare(); break;
case PAGE_CONTROL: iconPrepare(); iconControl(); break;
case PAGE_INFO_LEVELING: iconControl(); TERN(HAS_ONESTEP_LEVELING, iconLeveling, iconStartInfo)(); break;
case PAGE_INFO_LEVELING: iconControl(); TERN(HAS_AUTOLEVEL, iconLeveling, iconStartInfo)(); break;
}
}
}
Expand All @@ -2095,8 +2087,8 @@ void hmiMainMenu() {
switch (select_page.now) {
case PAGE_PRINT: iconPrint(); iconPrepare(); break;
case PAGE_PREPARE: iconPrepare(); iconControl(); break;
case PAGE_CONTROL: iconControl(); TERN(HAS_ONESTEP_LEVELING, iconLeveling, iconStartInfo)(); break;
case PAGE_INFO_LEVELING: TERN(HAS_ONESTEP_LEVELING, iconLeveling, iconStartInfo)(); break;
case PAGE_CONTROL: iconControl(); TERN(HAS_AUTOLEVEL, iconLeveling, iconStartInfo)(); break;
case PAGE_INFO_LEVELING: TERN(HAS_AUTOLEVEL, iconLeveling, iconStartInfo)(); break;
}
}
}
Expand All @@ -2122,7 +2114,7 @@ void hmiMainMenu() {
break;

case PAGE_INFO_LEVELING:
#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL
checkkey = ID_Leveling;
hmiLeveling();
#else
Expand Down Expand Up @@ -2423,7 +2415,7 @@ void itemAdvHomeOffsets(const uint8_t row) {
drawMoreIcon(row);
}

#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL

void itemAdvProbeOffsets(const uint8_t row) {
if (false && hmiIsChinese()) {
Expand Down Expand Up @@ -2514,7 +2506,7 @@ void drawAdvancedSettingsMenu() {

if (AVISI(0)) drawBackFirst(select_advset.now == CASE_BACK);
if (AVISI(ADVSET_CASE_HOMEOFF)) itemAdvHomeOffsets(ASCROL(ADVSET_CASE_HOMEOFF)); // Set Home Offsets >
#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL
if (AVISI(ADVSET_CASE_PROBEOFF)) itemAdvProbeOffsets(ASCROL(ADVSET_CASE_PROBEOFF)); // Probe Offsets >
#endif
if (AVISI(ADVSET_CASE_HEPID)) itemAdvHotendPID(ASCROL(ADVSET_CASE_HEPID)); // Nozzle PID
Expand Down Expand Up @@ -2589,7 +2581,7 @@ void drawHomeOffMenu() {
if (select_item.now != CASE_BACK) drawMenuCursor(select_item.now);
}

#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL

void drawProbeOffMenu() {
clearMainWindow();
Expand Down Expand Up @@ -2937,7 +2929,7 @@ void hmiControl() {
dwinUpdateLCD();
}

#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL
// Leveling
void hmiLeveling() {
popupWindowLeveling();
Expand Down Expand Up @@ -3566,7 +3558,7 @@ void hmiAdvSet() {
break;
#endif

#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL
case ADVSET_CASE_PROBEOFF:
checkkey = ID_ProbeOff;
select_item.reset();
Expand Down Expand Up @@ -3663,7 +3655,7 @@ void hmiAdvSet() {

#endif // HAS_HOME_OFFSET

#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL

// Probe Offset
void hmiProbeOff() {
Expand Down Expand Up @@ -3717,14 +3709,14 @@ void hmiAdvSet() {
void hmiProbeOffX() { hmiProbeOffN(hmiValues.probeOffsScaled.x, probe.offset.x); }
void hmiProbeOffY() { hmiProbeOffN(hmiValues.probeOffsScaled.y, probe.offset.y); }

#endif // HAS_ONESTEP_LEVELING
#endif // HAS_AUTOLEVEL

// Info
void hmiInfo() {
EncoderState encoder_diffState = get_encoder_state();
if (encoder_diffState == ENCODER_DIFF_NO) return;
if (encoder_diffState == ENCODER_DIFF_ENTER) {
#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL
checkkey = ID_Control;
select_control.set(CONTROL_CASE_INFO);
drawControlMenu();
Expand Down Expand Up @@ -4236,7 +4228,7 @@ void dwinHandleScreen() {
case ID_HomeOffY: hmiHomeOffY(); break;
case ID_HomeOffZ: hmiHomeOffZ(); break;
#endif
#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL
case ID_ProbeOff: hmiProbeOff(); break;
case ID_ProbeOffX: hmiProbeOffX(); break;
case ID_ProbeOffY: hmiProbeOffY(); break;
Expand Down
4 changes: 0 additions & 4 deletions Marlin/src/lcd/e3v2/jyersui/dwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,6 @@
#include "../../../feature/host_actions.h"
#endif

#if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
#define HAS_ZOFFSET_ITEM 1
#endif

#if HAS_LEVELING
#include "../../../feature/bedlevel/bedlevel.h"
#endif
Expand Down
6 changes: 1 addition & 5 deletions Marlin/src/lcd/e3v2/proui/dwin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,6 @@
#include "../../../feature/host_actions.h"
#endif

#if DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT)
#define HAS_ONESTEP_LEVELING 1
#endif
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should keep this define. If you've modified the LCD code to call G29 P1\nG29 P3 for UBL then UBL can be considered "one step" but the ABL options with PROBE_MANUALLY are definitely not one-step leveling procedures. PROBE_MANUALLY requires user interaction with the encoder to measure each point and proceed to the next point on click.

Copy link
Contributor Author

@classicrocker883 classicrocker883 Jan 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not see anywhere in ProUI that HAS_ONESTEP_LEVELING is being utilized. its currently defined like this in two seperate files. even the current repo at mriscoc's ProUI doesnt have that and it has no use for PROBE_MANUALLY. when UBL or ABL is used, its automatically understood you have that option...to use it as a "one step" or not. just like Mesh Bed Leveling.
which is also called Manual Mesh Bed Leveling right? since its manually probing the bed without an actual probe.

what is confusing is the #define PROBE_MANUALLY option in configuration.h:

The "Manual Probe" provides a means to do "Auto" Bed Leveling without a probe.

it sounds like if you have MESH_BED_LEVELING, you would want to also enable this. yet in inc/Conditionals_LCD.h:

#if !HAS_LEVELING || ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_UBL)
  #undef PROBE_MANUALLY

but besides that, a user having ABL or UBL should always have the option to "Probe manually" regardless.

that is how the menu is currently, except for maybe JyersUI. that is a bit confusing to have UBL, but also being able to not having any bed probe defined?

in summary, I think this should be left specifically for MESH_BED_LEVELING; if you dont have a probe, that should be your only option for mesh leveling.
and in regards to Auto bed leveling w/probe, it should always give you that "probe manually" option anyway in the menu/gcode. in otherwords, if it HAS_LEVELING the "probing manually" is always an option.

I'm just saying this is how it is set up with ProUI right now

  • Probe?
    UBL, or ABL
  • No Probe?
    Mesh Bed Leveling, or None

I'm also able to compile using MESH_BED_LEVELING while having a probe enabled. is that supposed to be?

It seems that things aren't what they used to be, or meant to be anymore. or maybe I have it all wrong. like was AUTO_BED_LEVELING_UBL supposed to be used without a bed probe like it can be in JyersUI? if so, why not just use MESH_BED_LEVELING instead?

on a side note, even Mriscoc is phasing out using Bilinear auto bed leveling in favor of UBL. I know their code is different, but on the surface its the same thing. you probe, and you get a mesh.
plus apparently there seems to be some issues with saving the mesh. it doesn't load properly, and you have to manually load settings otherwise you get an invalid mesh.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plus apparently there seems to be some issues with saving the mesh. it doesn't load properly, and you have to manually load settings otherwise you get an invalid mesh.

Currently the paradigm is different, due to the addition of AML 2.0 support, now all mesh parameters are saved in the UBL slot, so you can have slots with different mesh sizes and mesh densities. You can know how it is working now and the new way of use UBL in the Professional firmware here: https://github.com/mriscoc/Ender3V2S1/wiki/Mesh-Leveling-Menu#ubl

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I picked this line at random to comment on the define, but the general idea is to keep using this define in code that currently uses it, wherever that is.

Copy link
Member

@thinkyhead thinkyhead Jan 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm also able to compile using MESH_BED_LEVELING while having a probe enabled. is that supposed to be?

Yes, that option is specifically for a machine that has no probe. You can also use PROBE_MANUALLY with any ABL option (other than UBL) for a machine that has no probe. In both cases, you send a G29 command to get each point, and keep doing this in a loop until the procedure is completed.

See menu_bed_leveling.cpp within the ANY(PROBE_MANUALLY, MESH_BED_LEVELING) block to see how this is implemented from the UI.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

due to the addition of AML 2.0 support

Good that you have a wiki to cover the topic. My aim with ABL Bilinear was to make a leveling system that can be done all in one go based on a mesh that only covers the area of the bed that the probe can reach. It actually is "adaptive" in that you can set the boundaries of the mesh that you want to probe, but it always probes the same number of points.

We have a PR pending to make all leveling systems runtime-configurable in both the boundaries and the number of points in X and Y, but of course it's slow going because every LCD implementation wants to do things its own way. I cannot stress enough how important it is to work with the main Marlin project to standardize these things in the core and not to keep "going it alone." So anything you can do towards that effort would be much appreciated. I would do all of this myself, but daily tasks take up most of the time I would otherwise spend making awesome new code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would do all of this myself, but daily tasks take up most of the time I would otherwise spend making awesome new code.

this quote 😂
oh good, I'm not alone


#if HAS_MESH || (HAS_LEVELING && HAS_ZOFFSET_ITEM)
#include "../../../feature/bedlevel/bedlevel.h"
#include "bedlevel_tools.h"
Expand Down Expand Up @@ -749,7 +745,7 @@ void _drawFeedrate() {
DWINUI::drawString(DWIN_FONT_STAT, hmiData.colorIndicator, hmiData.colorBackground, 116 + 4 * STAT_CHR_W + 2, 384, F(" %"));
}
else {
_value = CEIL(feedrate_mm_s * feedrate_percentage / 100);
_value = CEIL(MMS_SCALED(feedrate_mm_s));
dwinDrawBox(1, hmiData.colorBackground, 116 + 5 * STAT_CHR_W + 2, 384, 20, 20);
}
DWINUI::drawInt(DWIN_FONT_STAT, hmiData.colorIndicator, hmiData.colorBackground, 3, 116 + 2 * STAT_CHR_W, 384, _value);
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/e3v2/proui/dwin.h
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ void doCoolDown();
#if ENABLED(NOZZLE_PARK_FEATURE)
void parkHead();
#endif
#if HAS_ONESTEP_LEVELING
#if HAS_AUTOLEVEL
void trammingwizard();
classicrocker883 marked this conversation as resolved.
Show resolved Hide resolved
#endif
#if ALL(LED_CONTROL_MENU, HAS_COLOR_LEDS)
Expand Down
8 changes: 0 additions & 8 deletions Marlin/src/lcd/e3v2/proui/dwin_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,10 @@
#define DASH_REDRAW 1
#endif

#if DISABLED(PROBE_MANUALLY) && ANY(AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_3POINT, AUTO_BED_LEVELING_UBL)
#define HAS_ONESTEP_LEVELING 1
#endif

#if !HAS_BED_PROBE && ENABLED(BABYSTEPPING)
#define JUST_BABYSTEP 1
#endif

#if ANY(BABYSTEPPING, HAS_BED_PROBE, HAS_WORKSPACE_OFFSET)
#define HAS_ZOFFSET_ITEM 1
#endif

#define defColorBackground RGB( 1, 12, 8)
#define defColorCursor RGB(20, 49, 31)
#define defColorTitleBg RGB( 0, 23, 16)
Expand Down
1 change: 0 additions & 1 deletion Marlin/src/module/motion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@
#define DEBUG_OUT ENABLED(DEBUG_LEVELING_FEATURE)
#include "../core/debug_out.h"


#if ENABLED(BD_SENSOR)
#include "../feature/bedlevel/bdl/bdl.h"
#endif
Expand Down
2 changes: 0 additions & 2 deletions Marlin/src/pins/gd32f1/pins_VOXELAB_AQUILA.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
#define DEFAULT_MACHINE_NAME "Aquila"
#endif

#define INLINE_USART_IRQ

#define NO_MAPLE_WARNING // Disable warning when compiling with Maple env

#include "../stm32f1/pins_CREALITY_V4.h"
2 changes: 1 addition & 1 deletion Marlin/src/sd/usb_flashdrive/lib-uhs2/Usb.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ uint8_t USB::ctrlReq(uint8_t addr, uint8_t ep, uint8_t bmReqType, uint8_t bReque
* Keep sending INs and writes data to memory area pointed by 'data'
* rcode 0 if no errors. rcode 01-0f is relayed from dispatchPkt(). Rcode f0 means RCVDAVIRQ error, fe = USB xfer timeout
*/
uint8_t USB::inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t *data, uint8_t bInterval /*= 0*/) {
uint8_t USB::inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t *data, uint8_t bInterval/*=0*/) {
EpInfo *pep = nullptr;
uint16_t nak_limit = 0;

Expand Down
Loading