diff options
author | David Crocker <dcrocker@eschertech.com> | 2018-08-27 12:21:13 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2018-08-27 12:21:13 +0300 |
commit | 413586e519ce77215d9bee808cc62cf0e6ac6f79 (patch) | |
tree | e175b92b431e25e538012842d5fb46e69afcaf97 /src/Display/Display.cpp | |
parent | cdaf681010845fc6e8300f656bfb213a499f94ae (diff) |
Merged in Matt's additions to 12864 display support
Diffstat (limited to 'src/Display/Display.cpp')
-rw-r--r-- | src/Display/Display.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Display/Display.cpp b/src/Display/Display.cpp index e9eff7f4..195cd9f2 100644 --- a/src/Display/Display.cpp +++ b/src/Display/Display.cpp @@ -9,7 +9,7 @@ #include "GCodes/GCodes.h" #include "GCodes/GCodeBuffer.h" -#include "IoPort.h" +#include "IoPorts.h" #include "Pins.h" constexpr int DefaultPulsesPerClick = -4; // values that work with displays I have are 2 and -4 @@ -49,7 +49,6 @@ void Display::Spin(bool full) if (!updatingFirmware) { // Check encoder and update display here - // For now we just test the encoder functionality const int ch = encoder.GetChange(); if (ch != 0) { @@ -67,6 +66,7 @@ void Display::Spin(bool full) if (beepActive && millis() - whenBeepStarted > beepLength) { IoPort::WriteAnalog(LcdBeepPin, 0.0, 0); + beepActive = false; } } @@ -84,6 +84,8 @@ void Display::Exit() lcd.FlushAll(); } +// NOTE: nothing enforces that this beep concludes before another is begun; +// that is, in rapid succession of commands, only the last beep issued will be heard by the user void Display::Beep(unsigned int frequency, unsigned int milliseconds) { whenBeepStarted = millis(); |