CPCHawk2024 (#4071)

* [CPCHawk] Start of new gate array and CRTC implementation

* [CPCHawk] Some cleanup

* [CPCHawk] More Cleanup

* [CPCHawk] More CRTC work

* [CPCHawk] More crtc work

* [CPCHawk] more CRTC work

* [CPCHawk] More CRTC work

* [CPCHawk] more crtc

* [CPCHawk] GateArray breaking changes WIP

* [CPCHawk] GA, CRTC and Screen changes

* [CPCHawk] CRTC and GateArray

* [CPCHawk] More stuff

* [CPCHawk] Progress

* [CPCHawk] Starting CRTC type abstraction

* [CPCHawk] Start CRTC status register implementation

* [CPCHAWK] Update colour palatte

* [CPCHawk] Trying to fix GA colour issues

* [CPCHawk] Actually use the Z80 /WAIT line

* [CPCHawk] Frame now running at req 19968 x6 INT

* [CPCHawk] Implement PAL16L8 as a separate device

* [CPCHawk] Border cropping SyncSetting

* [CPCHawk] Stuff

* [CPCHawk] More accurate CRT emulation

* [CPCHawk] Reset vertical timing var only when VSYNC ends in the middle of a scaline

* [CPCHawk] Allow IN port accesses to affect certain write-only devices

* [CPCHawk] Fixed high-impedence returns

* [CPCHawk] Readme update

* [CPCHawk] Update readme with Z80 timing test failures

* [CPCHawk] Update readme

Author: Asnivor

src/BizHawk.Client.Common/movie/PlatformFrameRates.cs

@@ -72,7 +72,8 @@ public static class PlatformFrameRates
 			["INTV"] = 59.92,
 
 			["ZXSpectrum_PAL"] = 50.080128205,
-			["AmstradCPC_PAL"] = 50.08012820512821,
+			["AmstradCPC_PAL"] = 50.08012820512821,	// = 1 / ((1024 * 312) / 16,000,000)
+
 			["UZE"] = 1125000.0 / 18733.0, // = 8 * 315000000 / 88 / 1820 / 262 ≈ 60.05444936742646666
 			["VEC"] = 50,
 			["O2"] = 89478485.0 / 1495643, // 59.8260982065907439141559850846

src/BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj

@@ -267,10 +267,10 @@
 		<EmbeddedResource Update="LogWindow.resx" DependentUpon="LogWindow.cs" />
 		<Compile Update="MainForm.cs" SubType="Form" />
 		<Compile Update="MainForm.Designer.cs" DependentUpon="MainForm.cs" />
-		<Compile Update="MainForm.Events.cs" DependentUpon="MainForm.cs" SubType="Form" />
+		<Compile Update="MainForm.Events.cs" DependentUpon="MainForm.cs" />
 		<Compile Update="MainForm.FileLoader.cs" DependentUpon="MainForm.cs" SubType="Form" />
-		<Compile Update="MainForm.Hotkey.cs" DependentUpon="MainForm.cs" SubType="Form" />
-		<Compile Update="MainForm.Movie.cs" DependentUpon="MainForm.cs" SubType="Form" />
+		<Compile Update="MainForm.Hotkey.cs" DependentUpon="MainForm.cs" />
+		<Compile Update="MainForm.Movie.cs" DependentUpon="MainForm.cs" />
 		<EmbeddedResource Update="MainForm.resx" DependentUpon="MainForm.cs" SubType="Designer" />
 		<Compile Update="movie/EditCommentsForm.cs" SubType="Form" />
 		<Compile Update="movie/EditCommentsForm.Designer.cs" DependentUpon="EditCommentsForm.cs" />
@@ -330,9 +330,9 @@
 		<EmbeddedResource Update="tools/Debugger/BreakpointControl.resx" DependentUpon="BreakpointControl.cs" />
 		<Compile Update="tools/Debugger/GenericDebugger.cs" SubType="Form" />
 		<Compile Update="tools/Debugger/GenericDebugger.Designer.cs" DependentUpon="GenericDebugger.cs" />
-		<Compile Update="tools/Debugger/GenericDebugger.Disassembler.cs" DependentUpon="GenericDebugger.cs" SubType="Form" />
-		<Compile Update="tools/Debugger/GenericDebugger.IControlMainform.cs" DependentUpon="GenericDebugger.cs" SubType="Form" />
-		<Compile Update="tools/Debugger/GenericDebugger.IToolForm.cs" DependentUpon="GenericDebugger.cs" SubType="Form" />
+		<Compile Update="tools/Debugger/GenericDebugger.Disassembler.cs" DependentUpon="GenericDebugger.cs" />
+		<Compile Update="tools/Debugger/GenericDebugger.IControlMainform.cs" DependentUpon="GenericDebugger.cs" />
+		<Compile Update="tools/Debugger/GenericDebugger.IToolForm.cs" DependentUpon="GenericDebugger.cs" />
 		<EmbeddedResource Update="tools/Debugger/GenericDebugger.resx" DependentUpon="GenericDebugger.cs" />
 		<Compile Update="tools/Debugger/RegisterBoxControl.cs" SubType="UserControl" />
 		<Compile Update="tools/Debugger/RegisterBoxControl.Designer.cs" DependentUpon="RegisterBoxControl.cs" />

src/BizHawk.Client.EmuHawk/config/AmstradCPC/AmstradCPCCoreEmulationSettings.cs

@@ -99,9 +99,8 @@ private void UpdateBorderNotes(AmstradCPC.BorderType type)
 		{
 			lblBorderInfo.Text = type switch
 			{
-				AmstradCPC.BorderType.Uniform => "Attempts to equalize the border areas",
-				AmstradCPC.BorderType.Uncropped => "Pretty much the signal the gate array is generating (looks pants)",
-				AmstradCPC.BorderType.Widescreen => "Top and bottom border removed so that the result is *almost* 16:9",
+				AmstradCPC.BorderType.Visible => "Approximates what you see on a CPC monitor",
+				AmstradCPC.BorderType.Uncropped => "The full display area",
 				_ => lblBorderInfo.Text
 			};
 		}

src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.ISettable.cs

@@ -106,7 +106,7 @@ public class AmstradCPCSyncSettings
 
 			[DisplayName("Border type")]
 			[Description("Select how to show the border area")]
-			[DefaultValue(BorderType.Uniform)]
+			[DefaultValue(BorderType.Visible)]
 			public BorderType BorderType { get; set; }
 
 			public AmstradCPCSyncSettings Clone()
@@ -331,19 +331,14 @@ public static string GetMetaStringOld(MachineType type)
 		public enum BorderType
 		{
 			/// <summary>
-			/// Attempts to equalise the border areas
+			/// Roughly what you might see on an Amstrad monitor
 			/// </summary>
-			Uniform,
+			Visible,
 
 			/// <summary>
-			/// Pretty much the signal the gate array is generating (looks shit)
+			/// The full display area
 			/// </summary>
 			Uncropped,
-
-			/// <summary>
-			/// Top and bottom border removed so that the result is *almost* 16:9
-			/// </summary>
-			Widescreen,
 		}
 	}
 }

src/BizHawk.Emulation.Cores/Computers/AmstradCPC/AmstradCPC.cs

@@ -57,7 +57,8 @@ public AmstradCPC(CoreLoadParameters<AmstradCPCSettings, AmstradCPCSyncSettings>
 
 			ser.Register<ITraceable>(_tracer);
 			ser.Register<IDisassemblable>(_cpu);
-			ser.Register<IVideoProvider>(_machine.GateArray);
+			//ser.Register<IVideoProvider>(_machine.GateArray);
+			ser.Register<IVideoProvider>(_machine.CRTScreen);
 			ser.Register<IStatable>(new StateSerializer(SyncState));
 
 			// initialize sound mixer and attach the various ISoundProvider devices