diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-10-19 12:51:35 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-10-19 12:51:35 +0300 |
| commit | 7361f65fc75ed4d5e73aa3d87b71b060aaaac1e5 (patch) | |
| tree | bef8c81cd771d981bf936ffea5449e4af0a82788 /src/FilamentMonitors | |
| parent | 7f04c9f483e561899467d4feab3d660a92bee1d1 (diff) | |
Minor refactoring to bring IoPorts into line with expansion board f/w
Diffstat (limited to 'src/FilamentMonitors')
| -rw-r--r-- | src/FilamentMonitors/Duet3DFilamentMonitor.cpp | 2 | ||||
| -rw-r--r-- | src/FilamentMonitors/FilamentMonitor.cpp | 3 | ||||
| -rw-r--r-- | src/FilamentMonitors/SimpleFilamentMonitor.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/FilamentMonitors/Duet3DFilamentMonitor.cpp b/src/FilamentMonitors/Duet3DFilamentMonitor.cpp index 494f6ca9..7cd26c10 100644 --- a/src/FilamentMonitors/Duet3DFilamentMonitor.cpp +++ b/src/FilamentMonitors/Duet3DFilamentMonitor.cpp @@ -48,7 +48,7 @@ bool Duet3DFilamentMonitor::Interrupt() noexcept const size_t writePointer = edgeCaptureWritePointer; // capture volatile variable if ((writePointer + 1) % EdgeCaptureBufferSize != edgeCaptureReadPointer) // if buffer is not full { - if (GetPort().Read()) + if (GetPort().ReadDigital()) { if ((writePointer & 1) == 0) // low-to-high transitions should occur on odd indices { diff --git a/src/FilamentMonitors/FilamentMonitor.cpp b/src/FilamentMonitors/FilamentMonitor.cpp index ee20f482..369072e0 100644 --- a/src/FilamentMonitors/FilamentMonitor.cpp +++ b/src/FilamentMonitors/FilamentMonitor.cpp @@ -253,7 +253,6 @@ bool FilamentMonitor::IsValid() const noexcept if (fs.IsLocal()) #endif { - GCodes& gCodes = reprap.GetGCodes(); bool isPrinting; bool fromIsr; int32_t extruderStepsCommanded; @@ -275,6 +274,8 @@ bool FilamentMonitor::IsValid() const noexcept fromIsr = false; locIsrMillis = 0; } + + GCodes& gCodes = reprap.GetGCodes(); if (gCodes.IsReallyPrinting() && !gCodes.IsSimulating()) { const float extrusionCommanded = (float)extruderStepsCommanded/reprap.GetPlatform().DriveStepsPerUnit(ExtruderToLogicalDrive(extruder)); diff --git a/src/FilamentMonitors/SimpleFilamentMonitor.cpp b/src/FilamentMonitors/SimpleFilamentMonitor.cpp index 3f2b8250..301e21c9 100644 --- a/src/FilamentMonitors/SimpleFilamentMonitor.cpp +++ b/src/FilamentMonitors/SimpleFilamentMonitor.cpp @@ -79,7 +79,7 @@ bool SimpleFilamentMonitor::Interrupt() noexcept // Call the following regularly to keep the status up to date void SimpleFilamentMonitor::Poll() noexcept { - const bool b = GetPort().Read(); + const bool b = GetPort().ReadDigital(); filamentPresent = (highWhenNoFilament) ? !b : b; } |