diff --git a/COCO3_Comp.xlsx b/COCO3_Comp.xlsx index dba4f0a..a9542f0 100644 Binary files a/COCO3_Comp.xlsx and b/COCO3_Comp.xlsx differ diff --git a/CoCo3.sv b/CoCo3.sv index 122263c..7110600 100644 --- a/CoCo3.sv +++ b/CoCo3.sv @@ -201,8 +201,6 @@ localparam CONF_STR = { "H2-;", "H2F1,CCC,Load Cartridge;", "H1-;", -// "H1S4,DSKVHD,Load SDC Drive 0;", -// "H1S5,DSKVHD,Load SDC Drive 1;", "H1S4,DSKVHD,Load SDC Drive 0;", "H1S5,DSKVHD,Load SDC Drive 1;", "H1-;", @@ -223,8 +221,10 @@ localparam CONF_STR = { "P1-;", "P1O89,Aspect ratio,Original,Full Screen,Wide,[ARC1];", "P1O35,Scandoubler Fx,None,HQ2x,CRT 25%,CRT 50%,CRT 75%;", - "P1OL,CoCo3 Lower Case:,Enabled,Disabled - SG6 Enabled;", - "P1o56,Artifact Type,NONE,Simple,MESS;", + "P1-;", + "P1OL,CoCo3 LC,Yes,No-(SG6=Yes);", + "P1-;", + "P1o56,Artifact Type,MESS,Simple,NONE;", "P1OI,Artifact Color Set,0,1;", "-;", "P2,Debug Menu;", @@ -233,8 +233,6 @@ localparam CONF_STR = { "P2-;", "P2F3,BIN,Load COCO Font;", "P2OG,Cart Interrupt Disabled,OFF,ON;", - //P2O?,Force Disk 0 DS,Off,On;" - //P2O?,Force Disk 1 DS,Off,On;" "-;", "ON,D-Pad Joystick emu,No,Yes;", "O6,Swap Joysticks,Off,On;", @@ -249,7 +247,7 @@ localparam CONF_STR = { "R0,Reset;", "J,Button1,Button2;", "jn,A,B;", -// "v,51;", + "v,51;", "V,v",`BUILD_DATE }; diff --git a/changes.txt b/changes.txt index d8d89dd..bbbad82 100644 --- a/changes.txt +++ b/changes.txt @@ -1,12 +1,20 @@ -CTF = Compile Time Feature... - 1. For cycle accurate 6809, changed PH2 to cpu_cycle_ena. (Improve timing of control register writes) -2. Changed PIA(s) addressing to alow complete mirror through FF00-FF3F +2. Changed PIA(s) addressing to allow complete mirror through FF00-FF3F +3. Corrected usage of SG6 enable (SW5 in orig code) which allows the usage of SG6. Formerly it was used to + enable artifacts. That is no longer true. For most compatibility it has be relabeled 'CoCo3 LC', + and it default setting is Yes which is fully compatible with the CoCo3. [setting no allows SG6 mode]. + For some OS9 software this must be set to 'Yes' which is the default. +4. Added 'Artifact Type' menu in 'Video Settings' menu. Settings are 'MESS', 'Simple', and 'NONE'. 'MESS' + is the default and has improved fidelity over 'Simple' which was previously implemented in connection + with SW5 [see above]. Again, the default should be used. The artifact emulation can be turned off + by setting the option to 'NONE'. The 'Artifact Color Set' choice is only valid for 'MESS' and 'Simple' + artifact settings. + To Do... -1. Fix assign SDC_EN_CS -2. Add new color dithering... +1. Fix Color File II +2. Fic Castle of Tharoggad diff --git a/docs/CoCo3FPGA.docx b/docs/CoCo3FPGA.docx index 8ec4deb..b8a4bb6 100644 Binary files a/docs/CoCo3FPGA.docx and b/docs/CoCo3FPGA.docx differ diff --git a/docs/CoCo3FPGA.pdf b/docs/CoCo3FPGA.pdf index 8317819..8d3a1d7 100644 Binary files a/docs/CoCo3FPGA.pdf and b/docs/CoCo3FPGA.pdf differ diff --git a/rtl/Mister_Video.v b/rtl/Mister_Video.v index d81e4ed..8b176d3 100644 --- a/rtl/Mister_Video.v +++ b/rtl/Mister_Video.v @@ -516,8 +516,8 @@ function [7:0] messArtifactPalette( a3 = 8'h49;//48 a4 = 8'h48;//49 - a5 = 8'h01;//01 - a6 = 8'h01;//01 + a5 = 8'h08;//01 + a6 = 8'h08;//01 a7 = 8'h41;//40 a8 = 8'h40;//41 @@ -541,8 +541,8 @@ function [7:0] messArtifactPalette( a2 = 8'h08; // 0 0 0 0 1 0 0 0 0 0 0 0 00000_01000_00000 a3 = 8'h48; // 0 1 0 0 1 0 0 0 0 0 0 0 00000_11000_00000 a4 = 8'h49; // 0 1 0 0 1 0 0 1 0 0 0 0 00000_11100_00000 - a5 = 8'h01; // 0 0 0 0 0 0 0 1 0 0 0 0 00000_00100_00000 - a6 = 8'h01; // 0 0 0 0 0 0 0 1 0 0 0 0 00000_00100_00000 + a5 = 8'h08; // 0 0 0 0 1 0 0 0 0 0 0 0 00000_01000_00000 [fixed my SH 2/4/24] + a6 = 8'h08; // 0 0 0 0 1 0 0 0 0 0 0 0 00000_01000_00000 [fixed my SH 2/4/24] a7 = 8'h40; // 0 1 0 0 0 0 0 0 0 0 0 0 00000_10000_00000 a8 = 8'h41; // 0 1 0 0 0 0 0 1 0 0 0 0 00000_10100_00000 a9 = 8'h48; // 0 1 0 0 1 0 0 0 0 0 0 0 00000_11000_00000 @@ -759,7 +759,6 @@ Standard Palette Colors 15 38 Orange 38 */ -parameter C_BLK = 8'h00; parameter C_WHT = 8'hFF; parameter C_FGR = 8'h49; @@ -1200,56 +1199,56 @@ assign PIXEL_X = // Black/Green and Black/White - ({CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0000_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0001_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0010_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0011_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0100_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0101_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0110_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0111_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1000_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1001_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1010_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1011_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1100_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1101_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1110_1_1111_00) ? C_BLK: - ({CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1111_1_1111_00) ? C_BLK: + ({CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0000_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0001_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0010_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0011_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0100_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0101_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0110_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_0111_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1000_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1001_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1010_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1011_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1100_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1101_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1110_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: + ({CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 12'b0_1111_1_1111_10) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: - ({CSS,CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0000_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0001_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0010_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0011_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0100_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0101_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0110_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0111_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1000_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1001_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1010_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1011_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1100_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1101_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1110_1_1111_00) ? C_WHT: - ({CSS,CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1111_1_1111_00) ? C_WHT: + ({CSS,CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0000_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0001_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0010_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0011_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0100_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0101_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0110_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_0111_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1000_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1001_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1010_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1011_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1100_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1101_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1110_1_1111_10) ? C_WHT: + ({CSS,CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b1_1_1111_1_1111_10) ? C_WHT: - ({CSS,CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0000_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0001_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0010_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0011_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0100_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0101_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0110_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0111_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1000_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1001_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1010_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1011_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1100_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1101_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1110_1_1111_00) ? C_FGR: - ({CSS,CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1111_1_1111_00) ? C_FGR: + ({CSS,CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0000_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[7],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0001_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0010_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[6],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0011_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0100_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[5],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0101_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0110_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[4],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_0111_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1000_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[3],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1001_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1010_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[2],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1011_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1100_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[1],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1101_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1110_1_1111_10) ? C_FGR: + ({CSS,CHAR_LATCH_0[0],PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 13'b0_1_1111_1_1111_10) ? C_FGR: //`endif @@ -1258,22 +1257,23 @@ assign PIXEL_X = // CSS = 1 Artifacting black, orange, blue, and white // CSS = 0 Artifacting black, orangeish, greenish, and green // Both Bits Clear -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[7:6],art} == 13'b00001111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[7:6],art} == 13'b00011111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[7:6],art} == 13'b00101111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[7:6],art} == 13'b00111111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[5:4],art} == 13'b01001111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[5:4],art} == 13'b01011111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[5:4],art} == 13'b01101111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[5:4],art} == 13'b01111111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[3:2],art} == 13'b10001111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[3:2],art} == 13'b10011111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[3:2],art} == 13'b10101111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[3:2],art} == 13'b10111111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[1:0],art} == 13'b11001111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[1:0],art} == 13'b11011111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[1:0],art} == 13'b11101111100_01) ? C_BLK: -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[1:0],art} == 13'b11111111100_01) ? C_BLK: +//00 vs 08 +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[7:6],art} == 13'b00001111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[7:6],art} == 13'b00011111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[7:6],art} == 13'b00101111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[7:6],art} == 13'b00111111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[5:4],art} == 13'b01001111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[5:4],art} == 13'b01011111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[5:4],art} == 13'b01101111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[5:4],art} == 13'b01111111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[3:2],art} == 13'b10001111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[3:2],art} == 13'b10011111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[3:2],art} == 13'b10101111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[3:2],art} == 13'b10111111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[1:0],art} == 13'b11001111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[1:0],art} == 13'b11011111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[1:0],art} == 13'b11101111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],CHAR_LATCH_0[1:0],art} == 13'b11111111100_01) ? {1'b0, 1'b0, 1'b0, 1'b0, !CSS, 1'b0, 1'b0, 1'b0}: // Bits Set // 2 Pixels means Green/White @@ -1378,22 +1378,22 @@ assign PIXEL_X = //`ifdef mess_arti //MESS Arti -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b000011111_10) ? messArtifactPalette({HISTORY[1:0], CHAR_LATCH_0[7:4]}, 1'b0, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b000111111_10) ? messArtifactPalette({HISTORY[1:0], CHAR_LATCH_0[7:4]}, 1'b0, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b001011111_10) ? messArtifactPalette({HISTORY[1:0], CHAR_LATCH_0[7:4]}, 1'b1, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b001111111_10) ? messArtifactPalette({HISTORY[1:0], CHAR_LATCH_0[7:4]}, 1'b1, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b010011111_10) ? messArtifactPalette( CHAR_LATCH_0[7:2], 1'b0, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b010111111_10) ? messArtifactPalette( CHAR_LATCH_0[7:2], 1'b0, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b011011111_10) ? messArtifactPalette( CHAR_LATCH_0[7:2], 1'b1, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b011111111_10) ? messArtifactPalette( CHAR_LATCH_0[7:2], 1'b1, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b100011111_10) ? messArtifactPalette( CHAR_LATCH_0[5:0], 1'b0, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b100111111_10) ? messArtifactPalette( CHAR_LATCH_0[5:0], 1'b0, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b101011111_10) ? messArtifactPalette( CHAR_LATCH_0[5:0], 1'b1, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b101111111_10) ? messArtifactPalette( CHAR_LATCH_0[5:0], 1'b1, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b110011111_10) ? messArtifactPalette({ CHAR_LATCH_0[3:0], FUTURE[1:0]}, 1'b0, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b110111111_10) ? messArtifactPalette({ CHAR_LATCH_0[3:0], FUTURE[1:0]}, 1'b0, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b111011111_10) ? messArtifactPalette({ CHAR_LATCH_0[3:0], FUTURE[1:0]}, 1'b1, !PHASE, CSS): -({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b111111111_10) ? messArtifactPalette({ CHAR_LATCH_0[3:0], FUTURE[1:0]}, 1'b1, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b000011111_00) ? messArtifactPalette({HISTORY[1:0], CHAR_LATCH_0[7:4]}, 1'b0, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b000111111_00) ? messArtifactPalette({HISTORY[1:0], CHAR_LATCH_0[7:4]}, 1'b0, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b001011111_00) ? messArtifactPalette({HISTORY[1:0], CHAR_LATCH_0[7:4]}, 1'b1, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b001111111_00) ? messArtifactPalette({HISTORY[1:0], CHAR_LATCH_0[7:4]}, 1'b1, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b010011111_00) ? messArtifactPalette( CHAR_LATCH_0[7:2], 1'b0, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b010111111_00) ? messArtifactPalette( CHAR_LATCH_0[7:2], 1'b0, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b011011111_00) ? messArtifactPalette( CHAR_LATCH_0[7:2], 1'b1, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b011111111_00) ? messArtifactPalette( CHAR_LATCH_0[7:2], 1'b1, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b100011111_00) ? messArtifactPalette( CHAR_LATCH_0[5:0], 1'b0, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b100111111_00) ? messArtifactPalette( CHAR_LATCH_0[5:0], 1'b0, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b101011111_00) ? messArtifactPalette( CHAR_LATCH_0[5:0], 1'b1, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b101111111_00) ? messArtifactPalette( CHAR_LATCH_0[5:0], 1'b1, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b110011111_00) ? messArtifactPalette({ CHAR_LATCH_0[3:0], FUTURE[1:0]}, 1'b0, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b110111111_00) ? messArtifactPalette({ CHAR_LATCH_0[3:0], FUTURE[1:0]}, 1'b0, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b111011111_00) ? messArtifactPalette({ CHAR_LATCH_0[3:0], FUTURE[1:0]}, 1'b1, !PHASE, CSS): +({PIXEL_COUNT[3:0],COCO1,VID_CONT[3:0],art} == 11'b111111111_00) ? messArtifactPalette({ CHAR_LATCH_0[3:0], FUTURE[1:0]}, 1'b1, !PHASE, CSS): //`endif // CoCo3 Graphics // 2 color 128/160 = 160/8 = 20 diff --git a/rtl/coco3fpga.sv b/rtl/coco3fpga.sv index fa4d965..edd9166 100644 --- a/rtl/coco3fpga.sv +++ b/rtl/coco3fpga.sv @@ -906,22 +906,6 @@ assign DATA_IN = RS232_EN ? DATA_RS232: SLOT3_HW ? {5'b00000, ROM_BANK}: // FF00, FF04, FF08, FF0C -//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000000) ? DATA_REG1: -// FF01, FF05, FF09, FF0D -//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000001) ? {!HSYNC1_IRQ_BUF[1], 3'b011, SEL[0], DDR1, HSYNC1_POL, HSYNC1_IRQ_INT}: -// FF02, FF06, FF0A, FF0E -//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000010) ? DATA_REG2: -// FF03, FF07, FF0B, FF0F -//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111000011) ? {!VSYNC1_IRQ_BUF[1], 3'b011, SEL[1], DDR2, VSYNC1_POL, VSYNC1_IRQ_INT}: -// FF20, FF24, FF28, FF2C -//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001000) ? DATA_REG3: -// FF21, FF25, FF29, FF2D -//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001001) ? {4'b0011, CAS_MTR, DDR3, 2'b00}: // CD_POL, CD_INT}: -// FF22, FF26, FF2A, FF2E -//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001010) ? DATA_REG4: -// FF23, FF27, FF2B, FF2F -//({ADDRESS[15:4], ADDRESS[1:0]} == 14'b11111111001011) ? {!CART1_FIRQ_BUF[1], 3'b011, SOUND_EN, DDR4, CART1_POL, CART1_FIRQ_INT}: -// FF00, FF04, FF08, FF0C ({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100000) ? DATA_REG1: // FF01, FF05, FF09, FF0D ({ADDRESS[15:5], ADDRESS[1:0]} == 13'b1111111100001) ? {!HSYNC1_IRQ_BUF[1], 3'b011, SEL[0], DDR1, HSYNC1_POL, HSYNC1_IRQ_INT}: @@ -3704,6 +3688,10 @@ begin BLUE[5] <= PALETTE[COLOR_BUF[4:0]][3]; BLUE[4] <= PALETTE[COLOR_BUF[4:0]][0]; end + RED[4] = RED[6]; + GREEN[4] = GREEN[6]; + BLUE[5] = BLUE[7]; + BLUE[4] = BLUE[6]; end end diff --git a/rtl/sdc.sv b/rtl/sdc.sv index ab2a885..4768e12 100644 --- a/rtl/sdc.sv +++ b/rtl/sdc.sv @@ -416,7 +416,8 @@ begin ext_response <= 1'b1; `ifdef CoCo3_sdc_override_size - response_reg <= 24'h555555; // This fixes a redirect error in OS9EOU - Value=no hardware +// response_reg <= 24'h555555; // This fixes a redirect error in OS9EOU - Value=no hardware + response_reg <= 24'h404040; // This fixes a redirect error in OS9EOU - Value=no hardware `else response_reg <= drive_size[l_drive][31:8]; // This returns the correct size of the mounted drive in sectors `endif