diff --git a/README.md b/README.md index e46e6b0..e7860ea 100644 --- a/README.md +++ b/README.md @@ -32,19 +32,19 @@ is useful when you only have 264K of RAM). For a fuller description of scanout video see [here](https://github.com/raspberrypi/pico-extras/blob/master/src/common/pico_scanvideo/README.adoc) -Name|Description ----|--- -[demo1](scanvideo/demo1)| So named because it was the first demo program written that used video.. it is a bit dated now and hails from a time where there was _much_ less RAM on the RP2040 -[flash_stream](scanvideo/flash_stream)| Streams video data out of flash fast enough to drive 640x480x60fps bitmap display -[hscroll_dma_tiles](scanvideo/hscroll_dma_tiles)| A horizontal scrolling test app which uses a second video plane (PIO) to overlay sprites -[mandelbrot](scanvideo/mandelbrot)| A mandelbrot generator using a 320x240x16 framebuffer -[mario_tiles](scanvideo/mario_tiles)| Confusingly named as a reference to Super Mario Kart's tiled psuedo-3D rendering. This is similar to [hscroll_dma_tiles](scanvideo/hscroll_dma_tiles) except the whole tiled scrolling area is now rotated and zoomed. -[scanvideo_minimal](scanvideo/scanvideo_minimal)| A very basic video output generator which generates a test pattern -[render](scanvideo/render)| A very dated rendering library used by [demo1](scanvideo/demo1) - avoid! -[sprite](scanvideo/sprite)| A small sprite library used by [sprite_demo](scanvideo/scanvideo_minimal) -[sprite_demo](scanvideo/sprite_demo)| Some bouncing Eben heads -[test_pattern](scanvideo/test_pattern)| Display color bars -[textmode](scanvideo/textmode)| Shows off chained DMA to generate scanlines out of glyph fragments via DMA/PIO +Name|Screenshot|Description +---|---|--- +[demo1](scanvideo/demo1)|![](scanvideo/demo1/screenshot.jpg)| So named because it was the first demo program written that used video.. it is a bit dated now and hails from a time where there was _much_ less RAM on the RP2040 +[flash_stream](scanvideo/flash_stream)|![](scanvideo/flash_stream/screenshot.jpg)| Streams video data out of flash fast enough to drive 640x480x60fps bitmap display +[hscroll_dma_tiles](scanvideo/hscroll_dma_tiles)|![](scanvideo/hscroll_dma_tiles/screenshot.jpg)| A horizontal scrolling test app which uses a second video plane (PIO) to overlay sprites +[mandelbrot](scanvideo/mandelbrot)|![](scanvideo/mandelbrot/screenshot.jpg)| A mandelbrot generator using a 320x240x16 framebuffer +[mario_tiles](scanvideo/mario_tiles)|![](scanvideo/mario_tiles/screenshot.jpg)| Confusingly named as a reference to Super Mario Kart's tiled psuedo-3D rendering. This is similar to [hscroll_dma_tiles](scanvideo/hscroll_dma_tiles) except the whole tiled scrolling area is now rotated and zoomed. +[scanvideo_minimal](scanvideo/scanvideo_minimal)|![](scanvideo/scanvideo_minimal/screenshot.jpg)| A very basic video output generator which generates a test pattern +[render](scanvideo/render)| | A very dated rendering library used by [demo1](scanvideo/demo1) - avoid! +[sprite](scanvideo/sprite)| | A small sprite library used by [sprite_demo](scanvideo/scanvideo_minimal) +[sprite_demo](scanvideo/sprite_demo)|![](scanvideo/sprite_demo/screenshot.jpg)| Some bouncing Eben heads +[test_pattern](scanvideo/test_pattern)|![](scanvideo/test_pattern/screenshot.jpg)| Display color bars +[textmode](scanvideo/textmode)|![](scanvideo/textmode/screenshot.jpg)| Shows off chained DMA to generate scanlines out of glyph fragments via DMA/PIO ## Sleep diff --git a/scanvideo/demo1/screenshot.jpg b/scanvideo/demo1/screenshot.jpg new file mode 100644 index 0000000..2b821bc Binary files /dev/null and b/scanvideo/demo1/screenshot.jpg differ diff --git a/scanvideo/flash_stream/screenshot.jpg b/scanvideo/flash_stream/screenshot.jpg new file mode 100644 index 0000000..d826f92 Binary files /dev/null and b/scanvideo/flash_stream/screenshot.jpg differ diff --git a/scanvideo/hscroll_dma_tiles/screenshot.jpg b/scanvideo/hscroll_dma_tiles/screenshot.jpg new file mode 100644 index 0000000..ac8876f Binary files /dev/null and b/scanvideo/hscroll_dma_tiles/screenshot.jpg differ diff --git a/scanvideo/mandelbrot/screenshot.jpg b/scanvideo/mandelbrot/screenshot.jpg new file mode 100644 index 0000000..e7be32c Binary files /dev/null and b/scanvideo/mandelbrot/screenshot.jpg differ diff --git a/scanvideo/mario_tiles/screenshot.jpg b/scanvideo/mario_tiles/screenshot.jpg new file mode 100644 index 0000000..46d7d21 Binary files /dev/null and b/scanvideo/mario_tiles/screenshot.jpg differ diff --git a/scanvideo/scanvideo_minimal/screenshot.jpg b/scanvideo/scanvideo_minimal/screenshot.jpg new file mode 100644 index 0000000..74b7cf9 Binary files /dev/null and b/scanvideo/scanvideo_minimal/screenshot.jpg differ diff --git a/scanvideo/sprite_demo/screenshot.jpg b/scanvideo/sprite_demo/screenshot.jpg new file mode 100644 index 0000000..11cd5b9 Binary files /dev/null and b/scanvideo/sprite_demo/screenshot.jpg differ diff --git a/scanvideo/sprite_demo/sprite_demo.c b/scanvideo/sprite_demo/sprite_demo.c index f268338..124982b 100644 --- a/scanvideo/sprite_demo/sprite_demo.c +++ b/scanvideo/sprite_demo/sprite_demo.c @@ -174,12 +174,13 @@ int main(void) { #ifdef TURBO_BOOST hw_set_bits(&mm_vreg_and_chip_reset->vreg, VREG_AND_CHIP_RESET_VREG_VSEL_BITS); sleep_ms(10); - set_sys_clock(1536*MHZ, 4, 1); + set_sys_clock_khz(400000, true); #else #if PICO_SCANVIDEO_48MHz set_sys_clock_khz(192000, true); -#endif +#else set_sys_clock_khz(200000, true); +#endif #endif // Re init uart now that clk_peri has changed setup_default_uart(); diff --git a/scanvideo/test_pattern/screenshot.jpg b/scanvideo/test_pattern/screenshot.jpg new file mode 100644 index 0000000..e1cefe3 Binary files /dev/null and b/scanvideo/test_pattern/screenshot.jpg differ diff --git a/scanvideo/textmode/screenshot.jpg b/scanvideo/textmode/screenshot.jpg new file mode 100644 index 0000000..46b2bb5 Binary files /dev/null and b/scanvideo/textmode/screenshot.jpg differ