diff --git a/MEMLNaut-PAF-CARL.ino b/MEMLNaut-PAF-CARL.ino index 0bca483..1053feb 100644 --- a/MEMLNaut-PAF-CARL.ino +++ b/MEMLNaut-PAF-CARL.ino @@ -1,6 +1,6 @@ // #include "src/memllib/interface/InterfaceBase.hpp" #include "src/memllib/interface/MIDIInOut.hpp" -#include "display.hpp" +#include "src/memllib/hardware/memlnaut/display.hpp" #include "src/memllib/audio/AudioAppBase.hpp" #include "src/memllib/audio/AudioDriver.hpp" #include "src/memllib/hardware/memlnaut/MEMLNaut.hpp" diff --git a/display.hpp b/display.hpp deleted file mode 100644 index fbef737..0000000 --- a/display.hpp +++ /dev/null @@ -1,46 +0,0 @@ -#ifndef __DISPLAY_H -#define __DISPLAY_H - -#include -#include - -#define DISPLAY_MEM __not_in_flash("display") - -TFT_eSPI DISPLAY_MEM tft = TFT_eSPI(); // Invoke custom library - - -class display { -public: - void setup() { - tft.begin(); - tft.setRotation(1); - tft.fillScreen(TFT_BLACK); - tft.setFreeFont(&FreeSans9pt7b); - tft.setTextColor(0xFC9F); - - } - - void post(String str) { - redraw = true; - lines.push_back(str); - if(lines.size() > 11) { - lines.pop_front(); - } - } - - void update() { - if (redraw) { - redraw = false; - tft.fillScreen(TFT_BLACK); - constexpr int32_t lineheight = 20; - for(size_t i=0; i < lines.size(); i++) { - tft.drawString(lines[i].c_str(), 10,i*lineheight); - } - } - } -private: - std::deque lines; - bool redraw=false; -}; - -#endif \ No newline at end of file diff --git a/src/memllib b/src/memllib index ebc5d74..96d0c87 160000 --- a/src/memllib +++ b/src/memllib @@ -1 +1 @@ -Subproject commit ebc5d7401fa2ee96409087eba9213b3a33fc12b9 +Subproject commit 96d0c879fcbbebc1ee57198251029f849c99a278