fix small compile complaint

this requires less OC than 800x480p60 and is verified to work with
https://www.adafruit.com/product/2232

Readme.md

@@ -1,6 +1,5 @@
-PicoDVI - Adafruit Fork for Arduino IDE + Adafruit_GFX compatibility
-====================================================================
-(Original Readme content follows later)
+Special Fork of PicoDVI for RP2040/RP2350 Arduino Philhower Core + Adafruit_GFX
+========================================================================
 
 Implements a few framebuffer types to which Adafruit_GFX drawing operations
 can be made; not every permutation PicoDVI is capable of, but a useful subset.
@@ -39,37 +38,11 @@ All files from the PicoDVI repo are kept even if not used in this build
 used via Pico SDK if desired.
 
 Original Readme content:
-=======
-RP2350 PicoDVI Preview
-======================
-
-Changes from the public GitHub version:
-
-* All Arm assembly in `libdvi` has been ported to RISC-V and tuned for Hazard3
-* Some of the existing Arm assembly in `libdvi` has been tweaked for better performance on Cortex-M33
-* RGB encode now uses the SIO TMDS encoders by default on RP2350 (can be disabled by defining `DVI_USE_SIO_TMDS_ENCODE=0` -- see `software/libdvi/dvi_config_defs.h`)
-* Much of the Arm assembly in `libsprite` has been ported to RISC-V -- enough to run the stock demos
-
-Build instructions:
-
-```bash
-cd software
-mkdir build
-# PICO_PLATFORM can also be rp2350-riscv
-# List of DVI configs is in software/include/common_dvi_pin_configs.h
-cmake -DPICO_SDK_PATH=/path/to/sdk -DPICO_PLATFORM=rp2350 -DPICO_COPY_TO_RAM=1 -DDVI_DEFAULT_SERIAL_CONFIG=pico_sock_cfg ..
-make -j$(nproc)
-# Then flash a binary, e.g.:
-cp apps/tiles_and_sprites/tiles_and_sprites.uf2
-```
-
-If you plan to run the `vista` demo, then note that there are now two UF2 data files, `software/assets/vista_data_rp2040.uf2` and `software/assets/vista_data_rp2350.uf2`. The only difference is the family IDs: the first can be dragged on RP2040 and on RP2350 A0, and the second can be dragged on RP2350 A1 and later.
-
-The following is the original RP2040 writeup:
 
 Bitbanged DVI on the RP2040 Microcontroller
 ===========================================
 
+
 ![](img/mountains.jpg)
 
 *640x480 RGB565 image, 640x480p 60 Hz DVI mode. 264 kB SRAM, 2x Cortex-M0+, system clock 252 MHz*

examples/16bit_hello/16bit_hello.ino

@@ -510,7 +510,7 @@ void show_canvas() {
   display.setFont(&FreeSansBold18pt7b); // Use a custom font
   display.setTextSize(1);               // and reset to 1:1 scale
 
-  char          *label[] = { "X:", "Y:", "Z:" };       // Labels for each axis
+  const char    *label[] = { "X:", "Y:", "Z:" };       // Labels for each axis
   const uint16_t color[] = { 0xF800, 0x07E0, 0x001F }; // Colors for each value
 
   // To get the labels right-aligned, one option would be simple trial and

library.properties

@@ -1,5 +1,5 @@
 name=PicoDVI - Adafruit Fork
-version=1.3.2
+version=1.1.0
 author=Luke Wren (Wren6991)
 maintainer=Adafruit <info@adafruit.com>
 sentence=Arduino library for RP2040 DVI output, based on PicoDVI

software/apps/terminal/main.c

@@ -24,12 +24,11 @@
 
 
 // Pick one:
-
-//#define MODE_640x480_60Hz
+#define MODE_640x480_60Hz
 // #define MODE_720x480_60Hz
 // #define MODE_800x600_60Hz
 // #define MODE_960x540p_60Hz
-#define MODE_1280x720_30Hz
+//#define MODE_1280x720_30Hz
 
 #if defined(MODE_640x480_60Hz)
 // DVDD 1.2V (1.1V seems ok too)

software/include/common_dvi_pin_configs.h

@@ -112,6 +112,14 @@ static const struct dvi_serialiser_cfg adafruit_feather_dvi_cfg = {
 	.invert_diffpairs = true
 };
 
+// Waveshare RP2040-PiZero
+static const struct dvi_serialiser_cfg waveshare_rp2040_pizero = {
+	.pio = DVI_DEFAULT_PIO_INST,
+	.sm_tmds = {0, 1, 2},
+	.pins_tmds = {26, 24, 22},
+	.pins_clk = 28,
+	.invert_diffpairs = false
+
 static const struct dvi_serialiser_cfg adafruit_dvibell_cfg = {
   .pio = DVI_DEFAULT_PIO_INST,
   .sm_tmds = {0, 1, 2},
@@ -120,43 +128,4 @@ static const struct dvi_serialiser_cfg adafruit_dvibell_cfg = {
   .invert_diffpairs = false,
 };
 
-// hstx dvi cowbell
-static const struct dvi_serialiser_cfg adafruit_hstxdvibell_cfg = {
-  .pio = DVI_DEFAULT_PIO_INST,
-  .sm_tmds = {0, 1, 2},
-  .pins_tmds = {12, 18, 16},
-  .pins_clk = 14,
-  .invert_diffpairs = false,
-};
-
-
-// Adafruit 'Fruit Jam' computer board
-static const struct dvi_serialiser_cfg adafruit_fruitjam_cfg = {
-	.pio = DVI_DEFAULT_PIO_INST,
-	.sm_tmds = {0, 1, 2},
-	.pins_tmds = {14, 16, 18},
-	.pins_clk = 12,
-	.invert_diffpairs = true,
-};
-
-
-
-// Waveshare RP2040-PiZero
-static const struct dvi_serialiser_cfg waveshare_rp2040_pizero = {
-	.pio = DVI_DEFAULT_PIO_INST,
-	.sm_tmds = {0, 1, 2},
-	.pins_tmds = {26, 24, 22},
-	.pins_clk = 28,
-	.invert_diffpairs = false
-};
-
-// Olimex RP2040PC, RP2040-Pico-PC, Neo6502, 
-static struct dvi_serialiser_cfg olimex_rp2040_cfg = {
-    .pio = DVI_DEFAULT_PIO_INST,
-    .sm_tmds = {0, 1, 2},
-    .pins_tmds = {14, 18, 16},
-    .pins_clk = 12,
-    .invert_diffpairs = true
-};
-
 #endif

software/libdvi/tmds_encode.h

@@ -4,6 +4,11 @@
 #include "hardware/interp.h"
 #include "dvi_config_defs.h"
 
+#if defined(__cplusplus)
+extern "C"
+{
+#endif
+
 // Functions from tmds_encode.c
 void tmds_encode_data_channel_16bpp(const uint32_t *pixbuf, uint32_t *symbuf, size_t n_pix, uint channel_msb, uint channel_lsb);
 void tmds_encode_data_channel_8bpp(const uint32_t *pixbuf, uint32_t *symbuf, size_t n_pix, uint channel_msb, uint channel_lsb);
@@ -51,6 +56,9 @@ void tmds_encode_sio_loop_peekpop_ratio8(const uint32_t *pixbuf, uint32_t *symbu
 void tmds_encode_sio_loop_peekpop_ratio16(const uint32_t *pixbuf, uint32_t *symbuf, size_t n_pix);
 void tmds_encode_sio_loop_peekpop_ratio32(const uint32_t *pixbuf, uint32_t *symbuf, size_t n_pix);
 void tmds_encode_sio_loop_peekpop_ratio64(const uint32_t *pixbuf, uint32_t *symbuf, size_t n_pix);
+
+#if defined(__cplusplus)
+}
 #endif
 
 #endif

src/libdvi/dvi.c

@@ -191,11 +191,7 @@ static void __dvi_func(dvi_dma_irq_handler)(struct dvi_inst *inst) {
 	// Make sure all three channels have definitely loaded their last block
 	// (should be within a few cycles of one another)
 	for (int i = 0; i < N_TMDS_LANES; ++i) {
-#if PICO_SDK_VERSION_MAJOR == 2
-		while (dma_debug_hw->ch[inst->dma_cfg[i].chan_data].dbg_tcr != inst->timing->h_active_pixels / DVI_SYMBOLS_PER_WORD)
-#else
 		while (dma_debug_hw->ch[inst->dma_cfg[i].chan_data].tcr != inst->timing->h_active_pixels / DVI_SYMBOLS_PER_WORD)
-#endif
 			tight_loop_contents();
 	}
 

src/libdvi/dvi_config_defs.h

@@ -8,11 +8,8 @@
 
 // Pull in base headers to make sure board definitions override the
 // definitions provided here. Note this file is included in asm and C.
-// added ifndef after Philhower 4.6.0 release to fix compilation issue
-#ifndef __ASSEMBLER__
 #include "hardware/platform_defs.h"
 #include "pico/config.h"
-#endif
 
 // ----------------------------------------------------------------------------
 // General DVI defines