 Chris Roadfeldt
|
ec1d9c0b8f
|
Use Z_PROBE_ENDSTOP_INVERTING when checking pin status.
|
2015-03-31 01:06:01 -05:00 |
|
|
Chris Roadfeldt
|
3175c70c79
|
Manually synching back up with MarlinFirmware/Development.
|
2015-03-31 00:11:11 -05:00 |
|
|
Chris Roadfeldt
|
faac2af4af
|
Merge remote-tracking branch 'origin/Development' into Development
|
2015-03-31 00:03:07 -05:00 |
|
|
Chris Roadfeldt
|
3be00cce6f
|
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
Marlin/Configuration.h
|
2015-03-30 23:59:01 -05:00 |
|
|
Chris Roadfeldt
|
e08f8eed05
|
Revert 06f767d..cba5692
This rolls back to commit 06f767d608.
|
2015-03-30 23:51:36 -05:00 |
|
|
Chris Roadfeldt
|
992b07ca57
|
Don't disable Z_RAISE_BEFORE_HOMING when Z_PROBE_AND_ENDSTOP is enabled.
|
2015-03-30 22:58:10 -05:00 |
|
|
Chris Roadfeldt
|
cba5692673
|
Merge remote-tracking branch 'MarlinFirmware/Development' into Development
Conflicts:
Marlin/Marlin_main.cpp
Marlin/stepper.cpp
|
2015-03-30 22:33:05 -05:00 |
|
|
croadfeldt
|
06f767d608
|
Merge remote-tracking branch 'upstream/development' into development
|
2015-03-30 02:10:49 -05:00 |
|
|
Chris Roadfeldt
|
a9802c95b3
|
Ensure Z_PROBE_PIN is defined if Z_PROBE_AND_ENDSTOP is.
|
2015-03-29 04:18:37 -05:00 |
|
|
Chris Roadfeldt
|
62834a1c43
|
Don't deploy probe on Z Axis homing if Z_PROBE_AND_ENDSTOP is enabled,
unless Z_SAFE_HOMING is.
|
2015-03-29 03:55:41 -05:00 |
|
|
Chris Roadfeldt
|
666fad3494
|
Typo fixed in sanity check.
|
2015-03-29 03:25:03 -05:00 |
|
|
Chris Roadfeldt
|
08a7aa16c5
|
Don't deploy Z Probe on Z homing if Z_PROBE_AND_ENDSTOP is defined.
|
2015-03-29 03:21:48 -05:00 |
|
|
Chris Roadfeldt
|
80285251cc
|
More config cleanup work for Z_PROBE_AND_ENDSTOP.
|
2015-03-29 03:06:20 -05:00 |
|
|
Chris Roadfeldt
|
fe4549cd83
|
Config file Z_PROBE_AND_ENDSTOP description clean up.
|
2015-03-29 03:04:59 -05:00 |
|
|
Chris Roadfeldt
|
82d2f11129
|
More additional sanity checks for Z_PROBE_AND_ENDSTOP
|
2015-03-29 02:53:55 -05:00 |
|
|
Chris Roadfeldt
|
05134f0807
|
Additional Sanity Checks for Z_PROBE_AND_ENDSTOP
|
2015-03-29 02:51:51 -05:00 |
|
|
Chris Roadfeldt
|
c75a5e8c55
|
Fixed typo for Z_PROBE_AND_ENDSTOP support in pins_RAMPS.h.
Confirmed Sanity checks are working.....
|
2015-03-29 02:38:08 -05:00 |
|
|
Chris Roadfeldt
|
a98ac4033b
|
Added Z_PROBE_PIN to #define for Z_PROBE_AND_ENDSTOP support.
|
2015-03-29 02:36:26 -05:00 |
|
|
Chris Roadfeldt
|
6125124d6c
|
Config file cleanup for Z_PROBE_AND_ENDSTOP support.
|
2015-03-29 02:29:16 -05:00 |
|
|
Chris Roadfeldt
|
324c14943b
|
Bug fixes for Z_PROBE_AND_ENDSTOP.
Code cleanup for Z_PROBE_AND_ENDSTOP.
Added Z_PROBE_PIN to pins_RAMPS_13.h
|
2015-03-29 02:16:09 -05:00 |
|
|
Chris Roadfeldt
|
059052889f
|
Further Sanity Checks for Z_PROBE_AND_ENDSTOP.
|
2015-03-28 06:08:04 -05:00 |
|
|
Chris Roadfeldt
|
8b81f20c61
|
Filling in more places where Z_PROBE_PIN and Z_PROBE_AND_ENDSTOP need to
be.
Added Sanity Check for it.
Added hook so it's enabled.
|
2015-03-28 05:55:42 -05:00 |
|
|
Chris Roadfeldt
|
fd823449ad
|
Added serial message for Z Probe trigger.
|
2015-03-28 05:42:38 -05:00 |
|
|
Chris Roadfeldt
|
92eb8109ab
|
Fix declaration of old_z_probe_endstop.
|
2015-03-28 05:09:48 -05:00 |
|
|
Chris Roadfeldt
|
44b88b41a2
|
Added credit for code.
|
2015-03-28 05:01:04 -05:00 |
|
|
Chris Roadfeldt
|
2979b40a7a
|
Fixed typo in Z Probe and Endstop section.
|
2015-03-28 04:41:03 -05:00 |
|
|
Chris Roadfeldt
|
9f3ff14008
|
Enabled separate Z Probe and Z Axis endstop use at same time.
Typo fixes in comments in existing code.
|
2015-03-28 04:31:51 -05:00 |
|