diff options
| author | David Crocker <dcrocker@eschertech.com> | 2022-01-10 21:31:55 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2022-01-10 21:31:55 +0300 |
| commit | e39e8495e049610f7f1b0f6b7b84a2c264c18b85 (patch) | |
| tree | 910bdee07485d847df7e8ca3c1ec7659534e1644 /src/Display | |
| parent | bb765cf76647399b61547d500f71be13ec8ab8a7 (diff) | |
Simplified build configuration files and added Duet3_MB6XD
Diffstat (limited to 'src/Display')
| -rw-r--r-- | src/Display/Display.cpp | 7 | ||||
| -rw-r--r-- | src/Display/Lcd/Lcd.cpp | 1 | ||||
| -rw-r--r-- | src/Display/Lcd/ST7920/Lcd7920.cpp | 2 | ||||
| -rw-r--r-- | src/Display/RotaryEncoder.cpp | 3 |
4 files changed, 4 insertions, 9 deletions
diff --git a/src/Display/Display.cpp b/src/Display/Display.cpp index da24f428..a69d0517 100644 --- a/src/Display/Display.cpp +++ b/src/Display/Display.cpp @@ -11,10 +11,9 @@ #include "Lcd/ST7920/Lcd7920.h" #include "Lcd/ST7567/Lcd7567.h" -#include "GCodes/GCodes.h" -#include "GCodes/GCodeBuffer/GCodeBuffer.h" -#include "Hardware/IoPorts.h" -#include "Pins.h" +#include <GCodes/GCodes.h> +#include <GCodes/GCodeBuffer/GCodeBuffer.h> +#include <Hardware/IoPorts.h> constexpr int DefaultPulsesPerClick = -4; // values that work with displays I have are 2 and -4 diff --git a/src/Display/Lcd/Lcd.cpp b/src/Display/Lcd/Lcd.cpp index 2946d742..ad8df632 100644 --- a/src/Display/Lcd/Lcd.cpp +++ b/src/Display/Lcd/Lcd.cpp @@ -5,7 +5,6 @@ #if SUPPORT_12864_LCD -#include "Pins.h" #include <Hardware/SharedSpi/SharedSpiDevice.h> Lcd::Lcd(PixelNumber nr, PixelNumber nc, const LcdFont * const fnts[], size_t nFonts, SpiMode mode) noexcept diff --git a/src/Display/Lcd/ST7920/Lcd7920.cpp b/src/Display/Lcd/ST7920/Lcd7920.cpp index c499708d..71111ac8 100644 --- a/src/Display/Lcd/ST7920/Lcd7920.cpp +++ b/src/Display/Lcd/ST7920/Lcd7920.cpp @@ -5,8 +5,6 @@ #if SUPPORT_12864_LCD -#include "Pins.h" - // LCD basic instructions. These all take 72us to execute except LcdDisplayClear, which takes 1.6ms constexpr uint8_t LcdDisplayClear = 0x01; constexpr uint8_t LcdHome = 0x02; diff --git a/src/Display/RotaryEncoder.cpp b/src/Display/RotaryEncoder.cpp index 7a220e27..50558cb3 100644 --- a/src/Display/RotaryEncoder.cpp +++ b/src/Display/RotaryEncoder.cpp @@ -2,8 +2,7 @@ #if SUPPORT_12864_LCD -#include "Pins.h" -#include "Hardware/IoPorts.h" +#include <Hardware/IoPorts.h> RotaryEncoder::RotaryEncoder(Pin p0, Pin p1, Pin pb) noexcept : pin0(p0), pin1(p1), pinButton(pb), ppc(1), encoderChange(0), encoderState(0), newPress(false), reverseDirection(false) {} |