dynamic ui, widgets

1 files changed, 17 insertions, 12 deletions

diff --git a/source/sharp.cpp b/source/sharp.cpp
index e780ae7..8fa22f9 100644
--- a/source/sharp.cpp
+++ b/source/sharp.cpp
@@ -1,20 +1,21 @@
 #include "sharp.hpp"
 #include "rtc.hpp"
 
+constexpr unsigned int SHARP_WIDTH = 144;
+constexpr unsigned int SHARP_HEIGHT = 168;
+
 constexpr unsigned int SHARP_SCK = 12;
 constexpr unsigned int SHARP_MOSI = 13;
 constexpr unsigned int SHARP_SS = 14;
 
-Adafruit_SharpMem Sharp::display(SHARP_SCK, SHARP_MOSI, SHARP_SS, 144, 168);
+Adafruit_SharpMem Sharp::display(SHARP_SCK, SHARP_MOSI, SHARP_SS, SHARP_WIDTH,
+	SHARP_HEIGHT);
 TaskHandle_t Sharp::taskHandle;
-bool Sharp::holdRendering = false;
-RenderFunc Sharp::currentScreen;
-
-#define BLACK 0
-#define WHITE 1
+std::vector<Widget *> Sharp::widgets;
 
 void Sharp::begin(void)
 {
+	widgets.reserve(10);
 	display.begin();
 	display.clearDisplay();
 	display.setTextSize(3);
@@ -26,15 +27,19 @@ void Sharp::begin(void)
 
 void Sharp::updateTask([[maybe_unused]] void *arg)
 {
-	static auto old = RTC::ticks();
 	while (1) {
-		do {
-			delay(300);
-		} while (holdRendering);
+		unsigned int y = 0;
+		for (auto& w : widgets) {
+			w->render(display, y);
+			y += w->getHeight();
+    			display.drawFastHLine(0, y + 1, SHARP_WIDTH, BLACK);
+			y += 3;
+			if (y >= SHARP_HEIGHT)
+				break;
+		}
 
-		if (currentScreen)
-			currentScreen(display);
 		display.refresh();
+		delay(300);
 	}
 }