Skip to content

[1.1.x] idex and bl touch fix#11392

Merged
Roxy-3D merged 6 commits intoMarlinFirmware:bugfix-1.1.xfrom
silentninja1:1.1.x]-IdexAndBLTouchFix
Jul 28, 2018
Merged

[1.1.x] idex and bl touch fix#11392
Roxy-3D merged 6 commits intoMarlinFirmware:bugfix-1.1.xfrom
silentninja1:1.1.x]-IdexAndBLTouchFix

Conversation

@silentninja1
Copy link
Contributor

Description

Z homing with bl touch crashes on fast home as probe is never deployed
Tool change when both tools are parked crashes as there are no sanity checks on target position

Issue #11252

Fix bltouch not deploying during fast home, fix dual x carriage setting opposing side park position as destination on tool change
@p3p
Copy link
Member

p3p commented Jul 27, 2018

Travis failing with:

sketch/Marlin_main.cpp: In function 'void tool_change(uint8_t, float, bool)':
Marlin_main.cpp:12012: error: 'x_home_pos' was not declared in this scope
         if(current_position[X_AXIS] != x_home_pos(active_extruder)){

@InsanityAutomation
Copy link
Contributor

I'm going to guess that function is not defined if dual-x Carriage is not defined. I'll confirm in update the pull request when I get back in front of my computer.

@GMagician
Copy link
Contributor

bltouch homing fix is duplicated, see #11380

@Roxy-3D Roxy-3D merged commit e1bef0e into MarlinFirmware:bugfix-1.1.x Jul 28, 2018
Roxy-3D added a commit that referenced this pull request Jul 29, 2018
Roxy-3D added a commit that referenced this pull request Jul 29, 2018
* Revert "[1.1.x] bltouch home refinements (#11398)"

This reverts commit 30839a6.

* Revert "[1.1.x] idex and bl touch fix (#11392)"

This reverts commit e1bef0e.
thinkyhead pushed a commit that referenced this pull request Sep 22, 2018
* [1.1.x] IDEX and BLTouch Fixes

Fix bltouch not deploying during fast home, fix dual x carriage setting opposing side park position as destination on tool change

* Update Marlin_main.cpp

* Update Marlin_main.cpp

* Change brackets to be more in conformance with Marlin coding standards
thinkyhead pushed a commit that referenced this pull request Sep 22, 2018
* Revert "[1.1.x] bltouch home refinements (#11398)"

This reverts commit 30839a6.

* Revert "[1.1.x] idex and bl touch fix (#11392)"

This reverts commit e1bef0e.
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.

5 participants