diff options
| author | David Crocker <dcrocker@eschertech.com> | 2017-11-23 21:50:44 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2017-11-23 22:10:49 +0300 |
| commit | ceb7a22b86b9ddbf71cfda55cae831e85ae04f32 (patch) | |
| tree | b67b0fc391e57375d69da1ea726b3670863cc143 /src/Platform.h | |
| parent | c14d985aad12831de9b1bb1ee9f0733e4e56c1ff (diff) | |
Version 1.20beta10
Heater fault timeout to cancelling print to be configurable M570 S
parameter)
Filament monitor always updates calibration accumulators during a print
even if not in calbration mode
Added CoreXYUV
Aded Z probe types 7 and 8
Bug fix: semicolons inside quoted strings were still stipped out from
some gcode sources
Bug fix: giving silly numbers of microsteps in M350 messed up the
steps/mm
Bug fix: High microstepping and high acceleration on deltas led to poor
timing in deceleration phase and high MaxReps
Bug fix: The commands in tool change macro files were sometimes not
fully executed before the next action
Bug fix to speed limits in CoreXYU
Possible bug fix: avoid race condition in TMC SPI ISR
Diffstat (limited to 'src/Platform.h')
| -rw-r--r-- | src/Platform.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/Platform.h b/src/Platform.h index 8c10fec9..62635f97 100644 --- a/src/Platform.h +++ b/src/Platform.h @@ -1114,6 +1114,11 @@ inline uint16_t Platform::GetRawZProbeReading() const { switch (zProbeType) { + case 1: + case 2: + case 3: + return min<uint16_t>(AnalogInReadChannel(zProbeAdcChannel), 4000); + case 4: { const bool b = IoPort::ReadPin(endStopPins[E0_AXIS]); @@ -1121,6 +1126,7 @@ inline uint16_t Platform::GetRawZProbeReading() const } case 5: + case 8: return (IoPort::ReadPin(zProbePin)) ? 4000 : 0; case 6: @@ -1129,8 +1135,14 @@ inline uint16_t Platform::GetRawZProbeReading() const return (b) ? 4000 : 0; } + case 7: + { + const bool b = IoPort::ReadPin(endStopPins[Z_AXIS]); + return (b) ? 4000 : 0; + } + default: - return min<uint16_t>(AnalogInReadChannel(zProbeAdcChannel), 4000); + return 4000; } } |