From 559ce08e04825cc01d8f2f8bfcd5815ce6d5e9e6 Mon Sep 17 00:00:00 2001
From: Mike Bell <mike@mercuna.com>
Date: Wed, 28 Jun 2023 19:47:59 +0100
Subject: [PATCH] DV Display: Fix C++ examples

---
 examples/dv_stick/dv_slideshow.cpp  |  4 ++--
 examples/dv_stick/dv_stick_test.cpp | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/dv_stick/dv_slideshow.cpp b/examples/dv_stick/dv_slideshow.cpp
index 3c34a9c5..8f24a5c6 100644
--- a/examples/dv_stick/dv_slideshow.cpp
+++ b/examples/dv_stick/dv_slideshow.cpp
@@ -18,7 +18,7 @@ using namespace pimoroni;
 FATFS fs;
 FRESULT fr;
 
-DVDisplay display(FRAME_WIDTH, FRAME_HEIGHT, DVDisplay::MODE_RGB888);
+DVDisplay display;
 PicoGraphics_PenDV_RGB888 graphics(FRAME_WIDTH, FRAME_HEIGHT, display);
 
 JPEGDEC jpeg;
@@ -126,7 +126,7 @@ int main() {
 
   sleep_ms(5000);
 
-  display.init();
+  display.init(FRAME_WIDTH, FRAME_HEIGHT, DVDisplay::MODE_RGB888);
   //display.test();
 
   graphics.set_pen(0);
diff --git a/examples/dv_stick/dv_stick_test.cpp b/examples/dv_stick/dv_stick_test.cpp
index 53de073d..df60681b 100644
--- a/examples/dv_stick/dv_stick_test.cpp
+++ b/examples/dv_stick/dv_stick_test.cpp
@@ -10,7 +10,7 @@
 using namespace pimoroni;
 
 #define FRAME_WIDTH 360
-#define FRAME_HEIGHT 240
+#define FRAME_HEIGHT 480
 
 #define READ_EDID 0
 #if READ_EDID
@@ -48,8 +48,8 @@ int main() {
 
   //sleep_ms(5000);
 
-  DVDisplay display(FRAME_WIDTH, FRAME_HEIGHT, DVDisplay::MODE_RGB888);
-  display.init();
+  DVDisplay display;
+  display.init(FRAME_WIDTH, FRAME_HEIGHT, DVDisplay::MODE_RGB888);
   //display.test();
 
 #if READ_EDID
@@ -78,6 +78,9 @@ int main() {
   for (int i = 0; i < 25; ++i) {
     graphics.create_pen_hsv(i * 0.04f, 1.0f, 1.0f);
   }
+  for (int i = 0; i < 5; ++i) {
+    graphics.create_pen((i+3) * (255/8), 255, 255);
+  }
 #endif
 
   graphics.set_pen(0xFF, 0, 0);
@@ -122,7 +125,7 @@ int main() {
 
 #if 1
     for (int j = 0; j < FRAME_HEIGHT; ++j) {
-      graphics.set_pen(j, 0xFF, 0xFF);
+      graphics.set_pen(j & 0xFF, 0xFF, 0xFF);
       graphics.pixel_span({0,j}, FRAME_WIDTH);
     }
 #else