diff options
| author | David Crocker <dcrocker@eschertech.com> | 2019-12-14 16:15:01 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2019-12-14 16:15:01 +0300 |
| commit | dc9a01971422302933e104445752121bf22adeba (patch) | |
| tree | 0694decaa7be064b64b8e82fe66ad920cbb6a049 /src/Endstops/SwitchEndstop.h | |
| parent | 8ab811c4122a4fef46b7a6cd5bc410f484b5f2dd (diff) | |
Final (?) changes to 3.0RC1
Removed M574 S0 option
Fix truncation of M574 report
Unconfigured fans report fanPercent -1 instead of -100
Diffstat (limited to 'src/Endstops/SwitchEndstop.h')
| -rw-r--r-- | src/Endstops/SwitchEndstop.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/Endstops/SwitchEndstop.h b/src/Endstops/SwitchEndstop.h index cd4492be..e0fa278f 100644 --- a/src/Endstops/SwitchEndstop.h +++ b/src/Endstops/SwitchEndstop.h @@ -22,7 +22,7 @@ public: SwitchEndstop(uint8_t axis, EndStopPosition pos); - EndStopInputType GetEndstopType() const override; + EndStopType GetEndstopType() const override; EndStopHit Stopped() const override; bool Prime(const Kinematics& kin, const AxisDriversConfig& axisDrivers) override; EndstopHitDetails CheckTriggered(bool goingSlow) override; @@ -34,9 +34,8 @@ public: void HandleRemoteInputChange(CanAddress src, uint8_t handleMinor, bool state) override; #endif - GCodeResult Configure(GCodeBuffer& gb, const StringRef& reply, EndStopInputType inputType); - GCodeResult Configure(const char *pinNames, const StringRef& reply, EndStopInputType inputType); - void Reconfigure(EndStopPosition pos, EndStopInputType inputType); + GCodeResult Configure(GCodeBuffer& gb, const StringRef& reply); + GCodeResult Configure(const char *pinNames, const StringRef& reply); private: typedef uint16_t PortsBitmap; @@ -46,7 +45,7 @@ private: inline bool IsTriggered(size_t index) const { #if SUPPORT_CAN_EXPANSION - return (boardNumbers[index] == CanId::MasterAddress) ? ports[index].Read() : states[index] != activeLow; + return (boardNumbers[index] == CanId::MasterAddress) ? ports[index].Read() : states[index]; #else return ports[index].Read(); #endif @@ -60,7 +59,6 @@ private: #if SUPPORT_CAN_EXPANSION CanAddress boardNumbers[MaxDriversPerAxis]; bool states[MaxDriversPerAxis]; - bool activeLow; #endif size_t numPortsUsed; PortsBitmap portsLeftToTrigger; |