diff --git a/client.py b/client.py index 49baa91..402351c 100644 --- a/client.py +++ b/client.py @@ -36,6 +36,7 @@ def do(ser, b): ser.flush() ser.flushInput() ser.flushOutput() + _ = ser.read(ser.in_waiting) ret = sync(ser, b'DATA') print(ret) diff --git a/common.mk b/common.mk index 8dcd9e4..484e412 100644 --- a/common.mk +++ b/common.mk @@ -59,6 +59,9 @@ MAIN_OBJ = \ all: main.cdi +%.bin.o: %.bin + $(BUILD_BINARY_O) + %.o: %.obj $(OBJCOPY) -g \ --rename-section IP=.text.$* \ diff --git a/vga.cpp b/vga.cpp index b9646af..8974135 100644 --- a/vga.cpp +++ b/vga.cpp @@ -166,7 +166,22 @@ void vga() v_sync_in(); holly.VO_BORDER_COL = (63 << 5) | (31 << 0); - holly.VO_CONTROL = 0x0016; + //holly.VO_CONTROL = 0x0016; + uint32_t hsync_pol = 0; + uint32_t vsync_pol = 0; + uint32_t blank_pol = 0; + uint32_t blank_video = 0; + uint32_t field_mode = 0; + uint32_t pixel_double = 0; + uint32_t pclk_delay = 0x16; + HOLLY.VO_CONTROL = 0 + | (( pclk_delay & 0x3f) << 16 ) + | (( pixel_double & 0x01) << 8 ) + | (( field_mode & 0x0f) << 4 ) + | (( blank_video & 0x01) << 3 ) + | (( blank_pol & 0x01) << 2 ) + | (( vsync_pol & 0x01) << 1 ) + | (( hsync_pol & 0x01) << 0 ); holly.SOFTRESET = 0b000; }