From 279e156dc17cdb25c5f2fb5034ee0f129eac72a8 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Mon, 13 Nov 2023 17:33:09 +0100 Subject: [PATCH] Mark initial display init explicit --- src/lib/epd.cpp | 23 ++++++++++++++++++++--- src/lib/epd.hpp | 1 + 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/lib/epd.cpp b/src/lib/epd.cpp index b2fe059..2759884 100644 --- a/src/lib/epd.cpp +++ b/src/lib/epd.cpp @@ -78,11 +78,28 @@ void forceFullRefresh() } } +void refreshFromMemory() +{ + for (uint i = 0; i < NUM_SCREENS; i++) + { + int *taskParam = new int; + *taskParam = i; + + xTaskCreate([](void *pvParameters) + { + const int epdIndex = *(int *)pvParameters; + delete (int *)pvParameters; + displays[epdIndex].refresh(false); + vTaskDelete(NULL); }, + "PrepareUpd", 4096, taskParam, tskIDLE_PRIORITY, NULL); + } +} + void setupDisplays() { for (uint i = 0; i < NUM_SCREENS; i++) { - displays[i].init(); + displays[i].init(0, true, 30); } updateQueue = xQueueCreate(UPDATE_QUEUE_SIZE, sizeof(UpdateDisplayTaskItem)); @@ -144,7 +161,7 @@ void prepareDisplayUpdateTask(void *pvParameters) { uint epdIndex = receivedItem.dispNum; - displays[epdIndex].init(0, false); // Little longer reset duration because of MCP + // displays[epdIndex].init(0, false); // Little longer reset duration because of MCP bool updatePartial = true; @@ -389,7 +406,7 @@ void waitUntilNoneBusy() vTaskDelay(10); if (count == 200) { - //displays[i].init(0, false); + // displays[i].init(0, false); vTaskDelay(100); } else if (count > 205) diff --git a/src/lib/epd.hpp b/src/lib/epd.hpp index 1194e2d..2c81e3f 100644 --- a/src/lib/epd.hpp +++ b/src/lib/epd.hpp @@ -22,6 +22,7 @@ typedef struct } UpdateDisplayTaskItem; void forceFullRefresh(); +void refreshFromMemory(); void setupDisplays(); void splitText(const uint dispNum, const String& top, const String& bottom, bool partial);