diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-04-07 17:14:32 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-04-07 17:14:32 +0300 |
| commit | ab5685b306a681915d6b842c2f1bd71afbc8d2ee (patch) | |
| tree | 3ae594807645de639bb405100210b4b333eea5e0 /src/Endstops/EndstopsManager.h | |
| parent | f545b211949a0993491d45e9eef16509b3d40e0f (diff) | |
Increment move.seq when speed or extrusion factor is changed
Speed factor is on longer live in object model
Rationalised exception specifications
Diffstat (limited to 'src/Endstops/EndstopsManager.h')
| -rw-r--r-- | src/Endstops/EndstopsManager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Endstops/EndstopsManager.h b/src/Endstops/EndstopsManager.h index 03f0f9da..4a36d0ea 100644 --- a/src/Endstops/EndstopsManager.h +++ b/src/Endstops/EndstopsManager.h @@ -53,15 +53,15 @@ public: void GetM119report(const StringRef& reply) noexcept; // Z probe - GCodeResult HandleM558(GCodeBuffer& gb, const StringRef &reply) THROWS_GCODE_EXCEPTION; // M558 - GCodeResult HandleG31(GCodeBuffer& gb, const StringRef& reply) THROWS_GCODE_EXCEPTION; // G31 + GCodeResult HandleM558(GCodeBuffer& gb, const StringRef &reply) THROWS(GCodeException); // M558 + GCodeResult HandleG31(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException); // G31 ReadLockedPointer<ZProbe> GetZProbe(size_t index) const noexcept; ReadLockedPointer<ZProbe> GetZProbeOrDefault(size_t index) const noexcept; ZProbe& GetDefaultZProbeFromISR() const noexcept; void SetZProbeDefaults() noexcept; - GCodeResult ProgramZProbe(GCodeBuffer& gb, const StringRef& reply) THROWS_GCODE_EXCEPTION; + GCodeResult ProgramZProbe(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeException); #if SUPPORT_CAN_EXPANSION void HandleRemoteEndstopChange(CanAddress src, uint8_t handleMajor, uint8_t handleMinor, bool state) noexcept; @@ -100,7 +100,7 @@ private: EndstopOrZProbe * volatile activeEndstops; // linked list of endstops and Z probes that are active for the current move Endstop *axisEndstops[MaxAxes]; // the endstops assigned to each axis (each one may have several switches), each may be null - StallDetectionEndstop *extrudersEndstop; // the endstop used for extruder stall detection, one will do for all extruders + StallDetectionEndstop *extrudersEndstop; // the endstop used for extruder stall detection, one will do for all extruders ZProbe *zProbes[MaxZProbes]; // the Z probes used. The first one is always non-null. ZProbe *defaultZProbe; |