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

Fix tool change priming #21142

Merged

Commits on Feb 20, 2021

  1. Update tool_change.cpp

    Fixed the tool change unretract logic when using `TOOLCHANGE_FILAMENT_SWAP` but not  `TOOLCHANGE_FS_PRIME_FIRST_USED`
    
    Previously:
    if not using `TOOLCHANGE_FS_PRIME_FIRST_USED` (disabled by default), then the unretract would simply never occur, defeating the entire purpose of enabling the filament swap feature.
    
    Now:
    After the 'Prime' and the 'Extra Prime' movements occur, log that the selected extruder has been primed. If you switch extruders again, then this will allow that extruder to retract. If it hasn't been primed yet, then it will not retract.
    RFBomb committed Feb 20, 2021
    Configuration menu
    Copy the full SHA
    b899a96 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2021

  1. misc. updates

    thinkyhead committed Feb 21, 2021
    Configuration menu
    Copy the full SHA
    2a66a05 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2021

  1. Create tool_change_Revised.cpp

    HEAVY WIP
    RFBomb committed Mar 23, 2021
    Configuration menu
    Copy the full SHA
    ae9c4c5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4718c3d View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. Configuration menu
    Copy the full SHA
    f61f033 View commit details
    Browse the repository at this point in the history
  2. Merge remote-tracking branch 'github-desktop-rfbomb/Update_ToolChange…

    …_Retraction' into pr/21142
    thinkyhead committed Mar 24, 2021
    Configuration menu
    Copy the full SHA
    0a55679 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2021

  1. Configuration menu
    Copy the full SHA
    cf1128f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8f50fd3 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2021

  1. post-merge cleanup

    thinkyhead committed May 12, 2021
    Configuration menu
    Copy the full SHA
    c0c9558 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2022

  1. Configuration menu
    Copy the full SHA
    0261d64 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2022

  1. Fix redundant PID case

    thinkyhead committed Feb 10, 2022
    Configuration menu
    Copy the full SHA
    4a5c3b7 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f3ec875 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2022

  1. Configuration menu
    Copy the full SHA
    d5c29ab View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2022

  1. Configuration menu
    Copy the full SHA
    f9ca895 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2022

  1. Cutting Recover Method

    RFBomb committed Mar 27, 2022
    Configuration menu
    Copy the full SHA
    539e984 View commit details
    Browse the repository at this point in the history
  2. Intermediate Commit

    Ignore this commit - temporarily removed Extruder_cutting_recover to easier comparision within Github Desktop
    RFBomb committed Mar 27, 2022
    Configuration menu
    Copy the full SHA
    3dc8552 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2022

  1. extruder_cutting_recover() && too_cold() Methods

    Restore extruder_cutting_recover() method that was temporarily removed last commit.
    Convert TooCold checks to use a method instead to verify extruder being moved is able to be moved.
    RFBomb committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    10593e8 View commit details
    Browse the repository at this point in the history
  2. Extract new method to prime extruder

    Normalized extruder priming by creating a method for it to be used as needed. Should save minor amount of space if `TOOLCHANGE_FS_PRIME_FIRST_USED` is used.
    
    - Replaced corresponding lines in main `tool_change` and `tool_change_prime` with the call
    RFBomb committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    d579d2d View commit details
    Browse the repository at this point in the history
  3. Readability

    RFBomb committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    baed265 View commit details
    Browse the repository at this point in the history
  4. Relocate static variable declarations

    Relocated static variable declarations to above the extruder priming method since that new method requires reading them
    RFBomb committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    210587e View commit details
    Browse the repository at this point in the history
  5. Update Extruder_prime for SingleNozzle

    Single Nozzle setups should always retract prior to loading in the first filament. As such, they don't need reduced speeds on first nozzle prime.
    RFBomb committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    a5e0c71 View commit details
    Browse the repository at this point in the history
  6. Delete tool_change_Revised.cpp

    Deleted temporary file that has been merged in with tool_change.cpp
    RFBomb committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    58cdf9d View commit details
    Browse the repository at this point in the history
  7. Modify Declarations

    Modify Declaration here to allow viewing the relevant command description in tool_change.cpp
    RFBomb committed Mar 28, 2022
    Configuration menu
    Copy the full SHA
    40be4eb View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2022

  1. Echo Debug for FIlament Swap

    RFBomb committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    a633fdf View commit details
    Browse the repository at this point in the history
  2. Undo Name Change

    Didn't realize that was also used by M217 'Q'
    RFBomb committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    6b1cb76 View commit details
    Browse the repository at this point in the history
  3. Update tool_change.cpp

    Converted the Tool_Change_Prime() tooCold check to use the standardized 'TooCold()' method
    RFBomb committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    f92ef12 View commit details
    Browse the repository at this point in the history
  4. Clarify method comments

    RFBomb committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    c0e1369 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5f5310a View commit details
    Browse the repository at this point in the history
  6. clean up

    thinkyhead committed Mar 29, 2022
    Configuration menu
    Copy the full SHA
    4642925 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. Remove extra qualification

    Removed the check that 'extra_prime > 0' qualification because it would prevent the routine from being run, when the routine is already locked behind both a define and `M217 V1`
    RFBomb committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    ac49660 View commit details
    Browse the repository at this point in the history
  2. Rename TOOLCHANGE_FS_INIT_BEFORE_SWAP to TOOLCHANGE_FS_SLOW_FIRST_PRIME

    Removed comments that were notes to self for testing.
    
    TOOLCHANGE_FS_INIT_BEFORE_SWAP did not clearly communicate what the setting was doing.
    As such, it has been renamed to `TOOLCHANGE_FS_SLOW_FIRST_PRIME`.
    
    Also clarified functionality of  `TOOLCHANGE_FS_PRIME_FIRST_USED`
    
    Fixed priming a nozzle twice when `TOOLCHANGE_FS_PRIME_FIRST_USED` and that T# was issued twice in a row - This functionality is only meant for T0!
    RFBomb committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    971bac7 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2022

  1. Configuration menu
    Copy the full SHA
    31c316f View commit details
    Browse the repository at this point in the history
  2. restore configs

    thinkyhead committed Apr 1, 2022
    Configuration menu
    Copy the full SHA
    e8ea0db View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9098609 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2022

  1. global strings

    thinkyhead committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    5e02ae8 View commit details
    Browse the repository at this point in the history
  2. thinkyhead committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    7e30a78 View commit details
    Browse the repository at this point in the history
  3. more axes

    thinkyhead committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    6543a29 View commit details
    Browse the repository at this point in the history
  4. fix F and D units

    thinkyhead committed Apr 2, 2022
    Configuration menu
    Copy the full SHA
    a2f2b02 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. simplify first prime code

    thinkyhead committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    ab8f7e1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    113957f View commit details
    Browse the repository at this point in the history
  3. use flags type

    thinkyhead committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    47a5b18 View commit details
    Browse the repository at this point in the history
  4. Fix a serial print

    thinkyhead committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    44025ff View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2022

  1. Fix flags typo

    thinkyhead committed Apr 9, 2022
    Configuration menu
    Copy the full SHA
    e6ea8b3 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2022

  1. cleanup

    thinkyhead committed Apr 10, 2022
    Configuration menu
    Copy the full SHA
    c41ecae View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3c3aca2 View commit details
    Browse the repository at this point in the history