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

[1.1.x] Dual endstops XYZ #8123

Merged

Conversation

thinkyhead
Copy link
Member

@thinkyhead thinkyhead commented Oct 27, 2017

Fix up #7648 by @jeffeb3 for merge. CC: @Allted

  • Rebase to bugfix-1.1.x (original based on 1.1.x branch)
  • Apply new options to all configs
  • Apply coding standards
  • Use macros to reduce some error-prone repetition
  • Apply corrections to configuration store (EEPROM) block sizes

@thinkyhead thinkyhead force-pushed the bf1_dual_xyz_endstops branch 7 times, most recently from b34d4a4 to ceac098 Compare October 28, 2017 00:54
@thinkyhead thinkyhead force-pushed the bf1_dual_xyz_endstops branch 12 times, most recently from c66626e to f6926e3 Compare October 29, 2017 07:12
@thinkyhead thinkyhead force-pushed the bf1_dual_xyz_endstops branch 3 times, most recently from da1f7f7 to 80a1e72 Compare October 29, 2017 08:39
@thinkyhead thinkyhead merged commit daa85f7 into MarlinFirmware:bugfix-1.1.x Oct 29, 2017
@thinkyhead thinkyhead deleted the bf1_dual_xyz_endstops branch October 29, 2017 09:36
thinkyhead added a commit to thinkyhead/Marlin that referenced this pull request Oct 29, 2017
thinkyhead added a commit that referenced this pull request Oct 30, 2017
MoellerDi added a commit to MoellerDi/Marlin that referenced this pull request Nov 27, 2017
… into bugfix-1.1.x-HD-CR10

* 'bugfix-1.1.x' of https://github.com/MarlinFirmware/Marlin:
  Only show custom bootscreen once
  [1.1.x] Fix NO_MOTION_BEFORE_HOMING unwanted behaviour (MarlinFirmware#8177)
  Kinematic clamp_to_software_endstops
  Fix for MAX_VFAT_ENTRIES sanity check
  The plural of 'axis' is 'axes'
  Tweak to QUICK_HOME comment
  No hacks needed for SD_REPRINT_LAST_SELECTED_FILE
  Tweak for soft endstops
  Update LCD draw condition
  Cleanups for SD_REPRINT_LAST_SELECTED_FILE
  Include time scale in some planner vars
  Add a hidden 8s watchdog option for easier debugging
  Add mfup to mfpub for safety
  Provide a default SERVO0_PIN for Anet 1.0
  Followup to MarlinFirmware#8123 - to match 2.0.x changes

# Conflicts:
#	Marlin/Configuration_adv.h
mtm88001 pushed a commit to mtm88001/Marlin that referenced this pull request Dec 9, 2017
damicreabox pushed a commit to damicreabox/Marlin that referenced this pull request Sep 14, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant