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

Revert "Adding custom move feedrate for G26" #20870

Merged
merged 1 commit into from
Jan 24, 2021

Conversation

Roxy-3D
Copy link
Member

@Roxy-3D Roxy-3D commented Jan 24, 2021

Reverts #20729

We need the Example Configuration.h files to have the same option added to them.

@Roxy-3D Roxy-3D self-assigned this Jan 24, 2021
@qwewer0 qwewer0 mentioned this pull request Jan 24, 2021
@Roxy-3D Roxy-3D merged commit 8f7bac4 into bugfix-2.0.x Jan 24, 2021
TyMi pushed a commit to TyMi/Marlin that referenced this pull request Jan 25, 2021
…_bugfix

* commit '876c2586b9146dd123af4c7b21138b8239ef5d39': (116 commits)
  Clean up MMU2 code (MarlinFirmware#20794)
  Init KILL, SUICIDE, PSU earlier (MarlinFirmware#20810)
  "Move … code" followup (MarlinFirmware#20869)
  Apply SEC_TO_MS and other fixes
  Reformat abortSDPrinting
  Fix sign warning (MarlinFirmware#20872)
  Cosmetic changes (2) (MarlinFirmware#20876)
  "Move … code" followup (MarlinFirmware#20868)
  "Move … code" followup (MarlinFirmware#20874)
  Graphical TFT fixes, cleanup (MarlinFirmware#20861)
  🧻 Cosmetic changes (MarlinFirmware#20859)
  🛠Fix deps script version regex
  Fix Ender 3 V2 DWIN manual move (MarlinFirmware#20837)
  [cron] Bump distribution date (2021-01-25)
  Fix LiquidCrystal CI failures (MarlinFirmware#20873)
  Revert "Adding custom move feedrate for G26 (MarlinFirmware#20729)" (MarlinFirmware#20870)
  MeatPack serial encoding (MarlinFirmware#20802)
  [cron] Bump distribution date (2021-01-24)
  lcd_put_wchar_max for COLOR_UI (MarlinFirmware#20838)
  Adding custom move feedrate for G26 (MarlinFirmware#20729)
  ...

# Conflicts:
#	Marlin/Configuration.h
#	Marlin/Configuration_adv.h
kpishere pushed a commit to kpishere/Marlin that referenced this pull request Feb 19, 2021
zillarob pushed a commit to zillarob/Marlin that referenced this pull request Feb 25, 2021
@Roxy-3D Roxy-3D deleted the revert-20729-bugfix-2.0.x branch March 11, 2021 20:25
W4tel-BiDi pushed a commit to W4tel-BiDi/Marlin that referenced this pull request Apr 5, 2021
thinkyhead pushed a commit that referenced this pull request Apr 30, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant