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.

Sign up for GitHub

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

Jump to bottom

[1.1] Patch G33's use of the term PROBE_MANUALLY #8318

Merged
merged 2 commits into from Nov 8, 2017
Merged

[1.1] Patch G33's use of the term PROBE_MANUALLY #8318

merged 2 commits into from Nov 8, 2017

Conversation

thinkyhead
Copy link
Member

@thinkyhead thinkyhead commented Nov 8, 2017 •
edited

Addressing #8302

Concise Diff

Background: The PROBE_MANUALLY option was originally intended to request a "manual probe" option for the core auto-leveling options:

  • AUTO_BED_LEVELING_3POINT
  • AUTO_BED_LEVELING_LINEAR
  • AUTO_BED_LEVELING_BILINEAR
  • …and any future leveling systems.

Under the existing scheme if you want to use any form of G29 that's automated when a probe is attached, you must select either a real bed probe or PROBE_MANUALLY. With a real probe option G29 will always be automatic. With PROBE_MANUALLY it will always be manual. (Under manual control you must invoke G29 repeatedly, using G1 or your LCD controller to adjust Z between points.)

Since MESH_BED_LEVELING is always a manual procedure, it doesn't use PROBE_MANUALLY.

The LCD_BED_LEVELING option extends MESH_BED_LEVELING and ABL with PROBE_MANUALLY by adding a step-by-step guided procedure to the LCD controller.

These options are not used by AUTO_BED_LEVELING_UBL. Instead UBL always includes manual leveling as part of its grand suite and automatically includes LCD menus and options whenever there's an LCD.

Since PROBE_MANUALLY specifically pertains to core Auto Bed Leveling only, it should not be referenced by G33, which also follows its own star and provides its own custom lcd_probe_pt function because why not. Presumably G33 can be used with no bed leveling options enabled whatsoever.

This PR:

  • Removes references to PROBE_MANUALLY from G33.
  • Waits until SanityCheck.h to hide PROBE_MANUALLY for UBL / MBL.
  • Cleans up some other probe-oriented sanity checks.

@thinkyhead thinkyhead force-pushed the bf1_sprintf_p_fix branch 2 times, most recently from 623227e to 02bb1f8 Compare November 8, 2017 04:20
@thinkyhead thinkyhead merged commit 50a1352 into MarlinFirmware:bugfix-1.1.x Nov 8, 2017
@thinkyhead thinkyhead deleted the bf1_sprintf_p_fix branch November 8, 2017 04:40
@Roxy-3D Roxy-3D changed the title [1.1] Patch G33 misuse of PROBE_MANUALLY [1.1] Patch G33's use of the term PROBE_MANUALLY Nov 8, 2017
@Roxy-3D
Copy link
Member

Roxy-3D commented Nov 8, 2017 •
edited

We really need a 'Manual Probe' configured into the firmware that is independent of (and supportive) of any bed leveling system. And it should be able to be used in combination with what ever 'normal' Z-Probe is in the system.

thinkyhead added a commit to thinkyhead/Marlin that referenced this pull request Nov 8, 2017
@thinkyhead
Followup to G33/LCD patch MarlinFirmware#8318
4a857f1
thinkyhead added a commit that referenced this pull request Nov 8, 2017
@thinkyhead
Merge pull request #8322 from thinkyhead/bf1_sprintf_p_fix
77cef3b 
[1.1] Followup to G33/LCD patch #8318
@LVD-AC
Copy link
Contributor

LVD-AC commented Nov 8, 2017

I think you missed to delete one PROBE_SELECTED in Marlin_main.ccp; With UBL on, MANUAL_PROBE is still forced off; so if no probe is selected G33 will not be parsed when manual probing.

      #if PROBE_SELECTED

        #if ENABLED(DELTA_AUTO_CALIBRATION)

          case 33: // G33: Delta Auto-Calibration
            gcode_G33();
            break;

        #endif // DELTA_AUTO_CALIBRATION

      #endif // PROBE_SELECTED

Not present in 2.0.x
See #8324 and #8325

mtm88001 pushed a commit to mtm88001/Marlin that referenced this pull request Dec 9, 2017
@thinkyhead @mtm88001
Followup to G33/LCD patch MarlinFirmware#8318
cc2b993
damicreabox pushed a commit to damicreabox/Marlin that referenced this pull request Sep 14, 2018
@thinkyhead @damicreabox
Followup to G33/LCD patch MarlinFirmware#8318
f3629a1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
F: Calibration PR: Bug Fix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@thinkyhead @Roxy-3D @LVD-AC