From 82d03dc3e997561b60d0da374c971abde82007a3 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Wed, 28 Jun 2017 10:58:40 -0400
Subject: [PATCH] A2600: implement paddle support

Warning: Deadzone in float controls should be set to zero. I don't know where to look to do this by default though
---
 .../Consoles/Atari/2600/Atari2600.Core.cs     | 14 ++++++++
 .../Atari/2600/Atari2600ControllerDeck.cs     | 10 ++++++
 .../Atari/2600/Atari2600Controllers.cs        | 33 +++++++++++++++----
 3 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs
index 5b1c1e6cd4..bbfdb5e569 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600.Core.cs
@@ -468,6 +468,20 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 			return value;
 		}
 
+		internal int ReadPot1(int pot)
+		{
+			int value = _controllerDeck.ReadPot1(_controller, pot);
+
+			return value;
+		}
+
+		internal int ReadPot2(int pot)
+		{
+			int value = _controllerDeck.ReadPot2(_controller, pot);
+
+			return value;
+		}
+
 		internal byte ReadConsoleSwitches(bool peek)
 		{
 			byte value = 0xFF;
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600ControllerDeck.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600ControllerDeck.cs
index 7a972c2f30..775592841c 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600ControllerDeck.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600ControllerDeck.cs
@@ -51,6 +51,16 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 			return Port2.Read(c);
 		}
 
+		public int ReadPot1(IController c, int pot)
+		{
+			return Port1.Read_Pot(c, pot);
+		}
+
+		public int ReadPot2(IController c, int pot)
+		{
+			return Port2.Read_Pot(c, pot);
+		}
+
 		public ControllerDefinition Definition { get; }
 
 		public void SyncState(Serializer ser)
diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs
index 9bd411a3a6..d1e40c10fd 100644
--- a/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Atari/2600/Atari2600Controllers.cs
@@ -22,6 +22,8 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 	{
 		byte Read(IController c);
 
+		int Read_Pot(IController c, int pot);
+
 		ControllerDefinition Definition { get; }
 
 		void SyncState(Serializer ser);
@@ -45,6 +47,11 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 			return 0xFF;
 		}
 
+		public int Read_Pot(IController c, int pot)
+		{
+			return -1; // indicates not applicable
+		}
+
 		public ControllerDefinition Definition { get; }
 
 		public void SyncState(Serializer ser)
@@ -90,6 +97,11 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 			return result;
 		}
 
+		public int Read_Pot(IController c, int pot)
+		{
+			return -1; // indicates not applicable
+		}
+
 		private static readonly string[] BaseDefinition =
 		{
 			"Up", "Down", "Left", "Right", "Button"
@@ -106,8 +118,8 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 				BoolButtons = BaseDefinition
 				.Select(b => $"P{PortNum} " + b)
 				.ToList(),
-				FloatControls = { "P" + PortNum + " Paddle X" },
-				FloatRanges = { new[] { -127.0f, 0, 127.0f }, } // No idea what values should be here
+				FloatControls = { "P" + PortNum + " Paddle X 1" , "P" + PortNum + " Paddle X 2" },
+				FloatRanges = { new[] { 16266.0f, 8138f, 10.0f }, new[] { 16266.0f, 8138f, 10.0f } } // No idea what values should be here
 			};
 		}
 
@@ -122,18 +134,25 @@ namespace BizHawk.Emulation.Cores.Atari.Atari2600
 
 		private static readonly string[] BaseDefinition =
 		{
-			"Button"
+			"Button 0",
+			"Button 1"
 		};
 
 		public byte Read(IController c)
 		{
-			byte result = 0xFF;
+			byte result = 0xF0;
 
-			if (c.IsPressed($"P{PortNum} Button")) { result &= 0xF7; } // TODO
-
-			//int x = (int)c.GetFloat(Definition.FloatControls[0]);
+			if (c.IsPressed($"P{PortNum} Button 0")) { result &= 0x70; }
+			if (c.IsPressed($"P{PortNum} Button 1")) { result &= 0xB0; }
 
 			return result;
 		}
+
+		public int Read_Pot(IController c, int pot)
+		{
+			int x = (int)c.GetFloat(Definition.FloatControls[pot]);
+
+			return x;
+		}
 	}
 }