mirror of
https://github.com/Gehstock/Mist_FPGA.git
synced 2026-01-19 01:16:58 +00:00
Merge branch 'master' of https://github.com/Gehstock/Mist_FPGA
This commit is contained in:
commit
41f43cc8da
@ -113,9 +113,9 @@ video_mixer #(.LINE_LENGTH(320), .HALF_DEPTH(1)) video_mixer
|
||||
.SPI_SCK(SPI_SCK),
|
||||
.SPI_SS3(SPI_SS3),
|
||||
.SPI_DI(SPI_DI),
|
||||
.R(blankn ? r&r : "000000"),
|
||||
.G(blankn ? g&g : "000000"),
|
||||
.B(blankn ? b&b : "0000"),
|
||||
.R(blankn ? {r,r} : "000000"),
|
||||
.G(blankn ? {g,g} : "000000"),
|
||||
.B(blankn ? {b,b} : "0000"),
|
||||
.HSync(hs),
|
||||
.VSync(vs),
|
||||
.VGA_R(VGA_R),
|
||||
|
||||
@ -113,9 +113,9 @@ video_mixer #(.LINE_LENGTH(320), .HALF_DEPTH(1)) video_mixer
|
||||
.SPI_SCK(SPI_SCK),
|
||||
.SPI_SS3(SPI_SS3),
|
||||
.SPI_DI(SPI_DI),
|
||||
.R(blankn ? r&r : "000000"),
|
||||
.G(blankn ? g&g : "000000"),
|
||||
.B(blankn ? b&b : "0000"),
|
||||
.R(blankn ? {r,r} : "000000"),
|
||||
.G(blankn ? {g,g} : "000000"),
|
||||
.B(blankn ? {b,b} : "0000"),
|
||||
.HSync(hs),
|
||||
.VSync(vs),
|
||||
.VGA_R(VGA_R),
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user