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

Introduce the reprobe and rewipe features #3553

Closed
wants to merge 11 commits into from
Closed

Introduce the reprobe and rewipe features #3553

wants to merge 11 commits into from

Commits on Apr 18, 2016

  1. Introduce the reprobe and rewipe features 

    Uses the G26 command to continue allowing G-code to enter the buffer after the final attempt has failed. This G-code should be placed at the beginning of each start G-code profile.
    @scalez
    scalez committed Apr 18, 2016
    Configuration menu
    Copy the full SHA
    28bc371 View commit details
    Browse the repository at this point in the history

  2. Add REPROBE, REWIPE, and REPROBE_FAIL_PANIC preprocessor definitions … 

    …to each example configuration header
    @scalez
    scalez committed Apr 18, 2016
    Configuration menu
    Copy the full SHA
    f9da0b5 View commit details
    Browse the repository at this point in the history

  3. Add G26 to the process_next_command() function and include a gcode_g2… 

    …6() function

The actual execution of G26 is done inside get_serial_commands(), this commit is just for completeness.
    @scalez
    scalez committed Apr 18, 2016
    Configuration menu
    Copy the full SHA
    2fa5a8b View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2016

  1. Format the code to conform with Marlin's coding standards and include… 

    … thinkyhead's suggestions
    @scalez
    scalez committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    c6eef47 View commit details
    Browse the repository at this point in the history

  2. State "giving up" rather than "quiting" and align the indentation of … 

    …the MIN_PROBE_PT comment in each of the example configuration headers
    @scalez
    scalez committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    9f97acc View commit details
    Browse the repository at this point in the history

  3. Add spaces in clear_buffer() for formating consistency

    @scalez
    scalez committed Apr 19, 2016
    Configuration menu
    Copy the full SHA
    650fc20 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2016

  1. Merge remote-tracking branch 'upstream/RCBugFix' into ReprobeRewipe 

    Conflicts:
	Marlin/Marlin_main.cpp
    @scalez
    scalez committed Apr 27, 2016
    Configuration menu
    Copy the full SHA
    658cf13 View commit details
    Browse the repository at this point in the history

  2. Bring back clear_buffer() after fixing merge conflict

    @scalez
    scalez committed Apr 27, 2016
    Configuration menu
    Copy the full SHA
    3285a19 View commit details
    Browse the repository at this point in the history

Commits on May 9, 2016

  1. Merge remote-tracking branch 'upstream/RCBugFix' into ReprobeRewipe 

    Conflicts:
	Marlin/Marlin_main.cpp
    @scalez
    scalez committed May 9, 2016
    Configuration menu
    Copy the full SHA
    76e2c97 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2016

  1. Merge remote-tracking branch 'upstream/RCBugFix' into ReprobeRewipe

    @scalez
    scalez committed May 20, 2016
    Configuration menu
    Copy the full SHA
    ead40cf View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2016

  1. Merge remote-tracking branch 'upstream/RCBugFix' into ReprobeRewipe 

    Conflicts:
	Marlin/Configuration.h
	Marlin/Marlin_main.cpp
	Marlin/example_configurations/Felix/Configuration.h
	Marlin/example_configurations/Felix/DUAL/Configuration.h
	Marlin/example_configurations/Hephestos/Configuration.h
	Marlin/example_configurations/Hephestos_2/Configuration.h
	Marlin/example_configurations/K8200/Configuration.h
	Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
	Marlin/example_configurations/RigidBot/Configuration.h
	Marlin/example_configurations/SCARA/Configuration.h
	Marlin/example_configurations/TAZ4/Configuration.h
	Marlin/example_configurations/WITBOX/Configuration.h
	Marlin/example_configurations/adafruit/ST7565/Configuration.h
	Marlin/example_configurations/delta/biv2.5/Configuration.h
	Marlin/example_configurations/delta/generic/Configuration.h
	Marlin/example_configurations/delta/kossel_mini/Configuration.h
	Marlin/example_configurations/delta/kossel_pro/Configuration.h
	Marlin/example_configurations/delta/kossel_xl/Configuration.h
	Marlin/example_configurations/makibox/Configuration.h
	Marlin/example_configurations/tvrrug/Round2/Configuration.h
    @scalez
    scalez committed Jun 17, 2016
    Configuration menu
    Copy the full SHA
    821a773 View commit details
    Browse the repository at this point in the history