yair/picovga-RGsB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Add VSYNC support and picovga.cmake file

Browse Source
This commit is contained in:
Wayne Venables
2023-02-25 15:30:08 -08:00
parent 04457da9fb
commit 73a91f3508
3 changed files with 104 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
CMakeLists.txt
View File

@@ -14,80 +14,16 @@ add_compile_options(-Wall
-Wno-maybe-uninitialized
)
set(PICOVGA_PATH ${CMAKE_CURRENT_LIST_DIR}/src)
macro(add_picovga project)
pico_generate_pio_header(${project} ${PICOVGA_PATH}/vga.pio)
target_sources(${project} PRIVATE
${PICOVGA_PATH}/render/vga_atext.S
${PICOVGA_PATH}/render/vga_attrib8.S
${PICOVGA_PATH}/render/vga_color.S
${PICOVGA_PATH}/render/vga_ctext.S
${PICOVGA_PATH}/render/vga_dtext.S
${PICOVGA_PATH}/render/vga_fastsprite.S
${PICOVGA_PATH}/render/vga_ftext.S
${PICOVGA_PATH}/render/vga_graph1.S
${PICOVGA_PATH}/render/vga_graph2.S
${PICOVGA_PATH}/render/vga_graph4.S
${PICOVGA_PATH}/render/vga_graph8.S
${PICOVGA_PATH}/render/vga_graph8mat.S
${PICOVGA_PATH}/render/vga_graph8persp.S
${PICOVGA_PATH}/render/vga_gtext.S
${PICOVGA_PATH}/render/vga_level.S
${PICOVGA_PATH}/render/vga_levelgrad.S
${PICOVGA_PATH}/render/vga_mtext.S
${PICOVGA_PATH}/render/vga_oscil.S
${PICOVGA_PATH}/render/vga_oscline.S
${PICOVGA_PATH}/render/vga_persp.S
${PICOVGA_PATH}/render/vga_persp2.S
${PICOVGA_PATH}/render/vga_plane2.S
${PICOVGA_PATH}/render/vga_progress.S
${PICOVGA_PATH}/render/vga_sprite.S
${PICOVGA_PATH}/render/vga_tile.S
${PICOVGA_PATH}/render/vga_tile2.S
${PICOVGA_PATH}/render/vga_tilepersp.S
${PICOVGA_PATH}/render/vga_tilepersp15.S
${PICOVGA_PATH}/render/vga_tilepersp2.S
${PICOVGA_PATH}/render/vga_tilepersp3.S
${PICOVGA_PATH}/render/vga_tilepersp4.S
${PICOVGA_PATH}/vga_blitkey.S
${PICOVGA_PATH}/vga_render.S
${PICOVGA_PATH}/vga.cpp
${PICOVGA_PATH}/vga_layer.cpp
${PICOVGA_PATH}/vga_pal.cpp
${PICOVGA_PATH}/vga_screen.cpp
${PICOVGA_PATH}/vga_util.cpp
${PICOVGA_PATH}/vga_vmode.cpp
${PICOVGA_PATH}/util/canvas.cpp
${PICOVGA_PATH}/util/mat2d.cpp
${PICOVGA_PATH}/util/overclock.cpp
${PICOVGA_PATH}/util/print.cpp
${PICOVGA_PATH}/util/rand.cpp
${PICOVGA_PATH}/util/pwmsnd.cpp
${PICOVGA_PATH}/font/font_bold_8x8.cpp
${PICOVGA_PATH}/font/font_bold_8x14.cpp
${PICOVGA_PATH}/font/font_bold_8x16.cpp
${PICOVGA_PATH}/font/font_boldB_8x14.cpp
${PICOVGA_PATH}/font/font_boldB_8x16.cpp
${PICOVGA_PATH}/font/font_game_8x8.cpp
${PICOVGA_PATH}/font/font_ibm_8x8.cpp
${PICOVGA_PATH}/font/font_ibm_8x14.cpp
${PICOVGA_PATH}/font/font_ibm_8x16.cpp
${PICOVGA_PATH}/font/font_ibmtiny_8x8.cpp
${PICOVGA_PATH}/font/font_italic_8x8.cpp
${PICOVGA_PATH}/font/font_thin_8x8.cpp
)
target_link_libraries(${project} pico_stdlib hardware_pio hardware_dma pico_multicore hardware_interp hardware_pwm)
include_directories(${project} ${CMAKE_CURRENT_BINARY_DIR})
endmacro()
# Since this is the picovga project set to the path to this directory
set(PICOVGA_PATH ${CMAKE_CURRENT_LIST_DIR})
# Include the picovga.cmake to add the add_picovga() macro
include(picovga.cmake)
# Our monitor requires vsync so set teh vsync pin
add_compile_definitions(VGA_GPIO_VSYNC=9)
# Add the examples
add_subdirectory(examples)
# Control the text output of the examples
#pico_enable_stdio_usb(picovga 0)
#pico_enable_stdio_uart(picovga 0)
#pico_add_extra_outputs(picovga)

73
picovga.cmake Normal file
View File

@@ -0,0 +1,73 @@
# This file should be included in your project to use the picovga library
# the PICOVGA_PATH variable should be set to the root of the picovga project directory
# The macro add_picovga adds the picovga path references to the specified project.
# PICOVGA_PATH must be set to the root of the picovga project directory
macro(add_picovga project)
pico_generate_pio_header(${project} ${PICOVGA_PATH}/src/vga.pio)
target_sources(${project} PRIVATE
${PICOVGA_PATH}/src/render/vga_atext.S
${PICOVGA_PATH}/src/render/vga_attrib8.S
${PICOVGA_PATH}/src/render/vga_color.S
${PICOVGA_PATH}/src/render/vga_ctext.S
${PICOVGA_PATH}/src/render/vga_dtext.S
${PICOVGA_PATH}/src/render/vga_fastsprite.S
${PICOVGA_PATH}/src/render/vga_ftext.S
${PICOVGA_PATH}/src/render/vga_graph1.S
${PICOVGA_PATH}/src/render/vga_graph2.S
${PICOVGA_PATH}/src/render/vga_graph4.S
${PICOVGA_PATH}/src/render/vga_graph8.S
${PICOVGA_PATH}/src/render/vga_graph8mat.S
${PICOVGA_PATH}/src/render/vga_graph8persp.S
${PICOVGA_PATH}/src/render/vga_gtext.S
${PICOVGA_PATH}/src/render/vga_level.S
${PICOVGA_PATH}/src/render/vga_levelgrad.S
${PICOVGA_PATH}/src/render/vga_mtext.S
${PICOVGA_PATH}/src/render/vga_oscil.S
${PICOVGA_PATH}/src/render/vga_oscline.S
${PICOVGA_PATH}/src/render/vga_persp.S
${PICOVGA_PATH}/src/render/vga_persp2.S
${PICOVGA_PATH}/src/render/vga_plane2.S
${PICOVGA_PATH}/src/render/vga_progress.S
${PICOVGA_PATH}/src/render/vga_sprite.S
${PICOVGA_PATH}/src/render/vga_tile.S
${PICOVGA_PATH}/src/render/vga_tile2.S
${PICOVGA_PATH}/src/render/vga_tilepersp.S
${PICOVGA_PATH}/src/render/vga_tilepersp15.S
${PICOVGA_PATH}/src/render/vga_tilepersp2.S
${PICOVGA_PATH}/src/render/vga_tilepersp3.S
${PICOVGA_PATH}/src/render/vga_tilepersp4.S
${PICOVGA_PATH}/src/vga_blitkey.S
${PICOVGA_PATH}/src/vga_render.S
${PICOVGA_PATH}/src/vga.cpp
${PICOVGA_PATH}/src/vga_layer.cpp
${PICOVGA_PATH}/src/vga_pal.cpp
${PICOVGA_PATH}/src/vga_screen.cpp
${PICOVGA_PATH}/src/vga_util.cpp
${PICOVGA_PATH}/src/vga_vmode.cpp
${PICOVGA_PATH}/src/util/canvas.cpp
${PICOVGA_PATH}/src/util/mat2d.cpp
${PICOVGA_PATH}/src/util/overclock.cpp
${PICOVGA_PATH}/src/util/print.cpp
${PICOVGA_PATH}/src/util/rand.cpp
${PICOVGA_PATH}/src/util/pwmsnd.cpp
${PICOVGA_PATH}/src/font/font_bold_8x8.cpp
${PICOVGA_PATH}/src/font/font_bold_8x14.cpp
${PICOVGA_PATH}/src/font/font_bold_8x16.cpp
${PICOVGA_PATH}/src/font/font_boldB_8x14.cpp
${PICOVGA_PATH}/src/font/font_boldB_8x16.cpp
${PICOVGA_PATH}/src/font/font_game_8x8.cpp
${PICOVGA_PATH}/src/font/font_ibm_8x8.cpp
${PICOVGA_PATH}/src/font/font_ibm_8x14.cpp
${PICOVGA_PATH}/src/font/font_ibm_8x16.cpp
${PICOVGA_PATH}/src/font/font_ibmtiny_8x8.cpp
${PICOVGA_PATH}/src/font/font_italic_8x8.cpp
${PICOVGA_PATH}/src/font/font_thin_8x8.cpp
)
target_link_libraries(${project} pico_stdlib hardware_pio hardware_dma pico_multicore hardware_interp hardware_pwm)
include_directories(${project} ${CMAKE_CURRENT_BINARY_DIR})
endmacro()

27
src/vga.cpp
View File

@@ -83,6 +83,12 @@ int __not_in_flash_func(VgaBufProcess)()
int y0 = -1;
u8 linetype = ScanlineType[line];
// Added VSYNC support (Added by WV)
#ifdef VGA_GPIO_VSYNC
gpio_put(VGA_GPIO_VSYNC, linetype != LINE_VSYNC);
#endif
switch (linetype)
{
case LINE_IMG: // progressive image 0, 1, 2,...
@@ -712,10 +718,17 @@ void VgaBufInit()
// VGA mode
else
{
// vertical synchronization
// hsync must be min. 4
LineBufSync[0] = BYTESWAP(VGACMD(vga_offset_sync+BASE_OFFSET,CurVmode.htot-CurVmode.hsync-3)); // invert dark line
LineBufSync[1] = BYTESWAP(VGADARK(CurVmode.hsync-4,0)); // invert HSYNC
// Add VSYNC support. If VSYNC provided, don't HSYNC on VSYNC (Added by WV)
#ifndef VGA_GPIO_VSYNC
// vertical synchronization
// hsync must be min. 4
LineBufSync[0] = BYTESWAP(VGACMD(vga_offset_sync+BASE_OFFSET,CurVmode.htot-CurVmode.hsync-3)); // invert dark line
LineBufSync[1] = BYTESWAP(VGADARK(CurVmode.hsync-4,0)); // invert HSYNC
#else
// no-vertical synchronization (Added by WV)
LineBufSync[0] = BYTESWAP(VGACMD(vga_offset_sync+BASE_OFFSET,CurVmode.hsync-3)); // HSYNC
LineBufSync[1] = BYTESWAP(VGADARK(CurVmode.htot-CurVmode.hsync-4,0)); // dark line
#endif
// control blocks - initialize to VSYNC
CtrlBuf1[0] = 2; // send 2x u32
@@ -975,6 +988,12 @@ void VgaInit(const sVmode* vmode)
LayerProgInx = vmode->prog;
memcpy(&CurLayerProg, &LayerProg[LayerProgInx], sizeof(sLayerProg));
// set vsync output if necessary (Added by WV)
#ifdef VGA_GPIO_VSYNC
gpio_init(VGA_GPIO_VSYNC);
gpio_set_dir(VGA_GPIO_VSYNC, true);
#endif
// initialize VGA PIO
VgaPioInit();