Merge pull request #245 from petterhs/fixDisplayErrors

JF002 · web-flow · commit 0c8b371a4c63 · 2021-03-21T16:35:21.000+01:00
fix display driver issues in recovery
diff --git 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
@@ -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);
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,7 @@ void DisplayApp::DisplayLogo(uint16_t color) {`
`83`	`83`	`for(int i = 0; i < displayWidth; i++) {`
`84`	`84`	`rleDecoder.DecodeNext(displayBuffer, displayWidth * bytesPerPixel);`
`85`	`85`	`ulTaskNotifyTake(pdTRUE, 500);`
`86`		`- lcd.BeginDrawBuffer(0, i, displayWidth, 1);`
`87`		`- lcd.NextDrawBuffer(reinterpret_cast<const uint8_t >(displayBuffer), displayWidth bytesPerPixel);`
	`86`	`+ lcd.DrawBuffer(0, i, displayWidth, 1, reinterpret_cast<const uint8_t >(displayBuffer), displayWidth bytesPerPixel);`
`88`	`87`	`}`
`89`	`88`	`}`
`90`	`89`
`@@ -94,8 +93,7 @@ void DisplayApp::DisplayOtaProgress(uint8_t percent, uint16_t color) {`
`94`	`93`	`for(int i = 0; i < barHeight; i++) {`
`95`	`94`	`ulTaskNotifyTake(pdTRUE, 500);`
`96`	`95`	`uint16_t barWidth = std::min(static_cast<float>(percent) * 2.4f, static_cast<float>(displayWidth));`
`97`		`- lcd.BeginDrawBuffer(0, displayWidth - barHeight + i, barWidth, 1);`
`98`		`- lcd.NextDrawBuffer(reinterpret_cast<const uint8_t >(displayBuffer), barWidth bytesPerPixel);`
	`96`	`+ lcd.DrawBuffer(0, displayWidth - barHeight + i, barWidth, 1, reinterpret_cast<const uint8_t >(displayBuffer), barWidth bytesPerPixel);`
`99`	`97`	`}`
`100`	`98`	`}`
`101`	`99`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,7 @@ void DisplayLogo() {`
`134`	`134`	`for(int i = 0; i < displayWidth; i++) {`
`135`	`135`	`rleDecoder.DecodeNext(displayBuffer, displayWidth * bytesPerPixel);`
`136`	`136`	`ulTaskNotifyTake(pdTRUE, 500);`
`137`		`- lcd.BeginDrawBuffer(0, i, displayWidth, 1);`
`138`		`- lcd.NextDrawBuffer(reinterpret_cast<const uint8_t >(displayBuffer), displayWidth bytesPerPixel);`
	`137`	`+ lcd.DrawBuffer(0, i, displayWidth, 1, reinterpret_cast<const uint8_t >(displayBuffer), displayWidth bytesPerPixel);`
`139`	`138`	`}`
`140`	`139`	`}`
`141`	`140`
`@@ -145,8 +144,7 @@ void DisplayProgressBar(uint8_t percent, uint16_t color) {`
`145`	`144`	`for(int i = 0; i < barHeight; i++) {`
`146`	`145`	`ulTaskNotifyTake(pdTRUE, 500);`
`147`	`146`	`uint16_t barWidth = std::min(static_cast<float>(percent) * 2.4f, static_cast<float>(displayWidth));`
`148`		`- lcd.BeginDrawBuffer(0, displayWidth - barHeight + i, barWidth, 1);`
`149`		`- lcd.NextDrawBuffer(reinterpret_cast<const uint8_t >(displayBuffer), barWidth bytesPerPixel);`
	`147`	`+ lcd.DrawBuffer(0, displayWidth - barHeight + i, barWidth, 1, reinterpret_cast<const uint8_t >(displayBuffer), barWidth bytesPerPixel);`
`150`	`148`	`}`
`151`	`149`	`}`
`152`	`150`