diff options
| author | petter <39340152+petterhs@users.noreply.github.com> | 2021-03-20 19:34:41 +0100 |
|---|---|---|
| committer | petter <39340152+petterhs@users.noreply.github.com> | 2021-03-21 12:29:57 +0100 |
| commit | 3b51b4367df324972510ecb4d4f3411e59bbdf83 (patch) | |
| tree | 47787b0a063ceb027156c71ef2849223d50b0f5c | |
| parent | a3ff2e46ca9e663af864a2bd04b9afa3efbddfb8 (diff) | |
fix display driver issues in recovery
| -rw-r--r-- | src/displayapp/DisplayAppRecovery.cpp | 6 | ||||
| -rw-r--r-- | src/recoveryLoader.cpp | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/displayapp/DisplayAppRecovery.cpp b/src/displayapp/DisplayAppRecovery.cpp index 9cf76953..57b8aedd 100644 --- a/src/displayapp/DisplayAppRecovery.cpp +++ b/src/displayapp/DisplayAppRecovery.cpp @@ -83,8 +83,7 @@ void DisplayApp::DisplayLogo(uint16_t color) { for(int i = 0; i < displayWidth; i++) { rleDecoder.DecodeNext(displayBuffer, displayWidth * bytesPerPixel); ulTaskNotifyTake(pdTRUE, 500); - lcd.BeginDrawBuffer(0, i, displayWidth, 1); - lcd.NextDrawBuffer(reinterpret_cast<const uint8_t *>(displayBuffer), displayWidth * bytesPerPixel); + lcd.DrawBuffer(0, i, displayWidth, 1, reinterpret_cast<const uint8_t *>(displayBuffer), displayWidth * bytesPerPixel); } } @@ -94,8 +93,7 @@ void DisplayApp::DisplayOtaProgress(uint8_t percent, uint16_t color) { for(int i = 0; i < barHeight; i++) { ulTaskNotifyTake(pdTRUE, 500); uint16_t barWidth = std::min(static_cast<float>(percent) * 2.4f, static_cast<float>(displayWidth)); - lcd.BeginDrawBuffer(0, displayWidth - barHeight + i, barWidth, 1); - lcd.NextDrawBuffer(reinterpret_cast<const uint8_t *>(displayBuffer), barWidth * bytesPerPixel); + lcd.DrawBuffer(0, displayWidth - barHeight + i, barWidth, 1, reinterpret_cast<const uint8_t *>(displayBuffer), barWidth * bytesPerPixel); } } diff --git a/src/recoveryLoader.cpp b/src/recoveryLoader.cpp index 40cd66da..9ed062e2 100644 --- a/src/recoveryLoader.cpp +++ b/src/recoveryLoader.cpp @@ -134,8 +134,7 @@ void DisplayLogo() { for(int i = 0; i < displayWidth; i++) { rleDecoder.DecodeNext(displayBuffer, displayWidth * bytesPerPixel); ulTaskNotifyTake(pdTRUE, 500); - lcd.BeginDrawBuffer(0, i, displayWidth, 1); - lcd.NextDrawBuffer(reinterpret_cast<const uint8_t *>(displayBuffer), displayWidth * bytesPerPixel); + lcd.DrawBuffer(0, i, displayWidth, 1, reinterpret_cast<const uint8_t *>(displayBuffer), displayWidth * bytesPerPixel); } } @@ -145,8 +144,7 @@ void DisplayProgressBar(uint8_t percent, uint16_t color) { for(int i = 0; i < barHeight; i++) { ulTaskNotifyTake(pdTRUE, 500); uint16_t barWidth = std::min(static_cast<float>(percent) * 2.4f, static_cast<float>(displayWidth)); - lcd.BeginDrawBuffer(0, displayWidth - barHeight + i, barWidth, 1); - lcd.NextDrawBuffer(reinterpret_cast<const uint8_t *>(displayBuffer), barWidth * bytesPerPixel); + lcd.DrawBuffer(0, displayWidth - barHeight + i, barWidth, 1, reinterpret_cast<const uint8_t *>(displayBuffer), barWidth * bytesPerPixel); } } |