libzedmd 0.9.0

mkalkbrenner · mkalkbrenner · commit bba7971a16ee · 2025-01-26T20:49:40.000+01:00
diff --git a/Console/Common/BaseCommand.cs b/Console/Common/BaseCommand.cs
@@ -95,7 +95,7 @@ protected List<IDestination> GetRenderers(IConfiguration config, HashSet<string>
 			}
 
 			if (config.ZeDMDHD.Enabled) {
-				var zeDMDHD = ZeDMDHD.GetInstance(config.ZeDMDHD.Debug, config.ZeDMDHD.Brightness, config.ZeDMDHD.RgbOrder, config.ZeDMDHD.Port, config.ZeDMDHD.ScaleRgb24);
+				var zeDMDHD = ZeDMDHD.GetInstance(config.ZeDMDHD.Debug, config.ZeDMDHD.Brightness, config.ZeDMDHD.RgbOrder, config.ZeDMDHD.Port);
 				if (zeDMDHD.IsAvailable) {
 					renderers.Add(zeDMDHD);
 					Logger.Info("Added ZeDMD renderer.");
@@ -107,7 +107,7 @@ protected List<IDestination> GetRenderers(IConfiguration config, HashSet<string>
 			}
 
 			if (config.ZeDMDWiFi.Enabled) {
-				var zeDMDWiFi = ZeDMDWiFi.GetInstance(config.ZeDMDWiFi.Debug, config.ZeDMDWiFi.Brightness, config.ZeDMDWiFi.RgbOrder, config.ZeDMDHD.Port, config.ZeDMDWiFi.WifiAddress, config.ZeDMDWiFi.WifiPort);
+				var zeDMDWiFi = ZeDMDWiFi.GetInstance(config.ZeDMDWiFi.Debug, config.ZeDMDWiFi.Brightness, config.ZeDMDWiFi.RgbOrder, config.ZeDMDWiFi.WifiAddress);
 				if (zeDMDWiFi.IsAvailable) {
 					renderers.Add(zeDMDWiFi);
 					Logger.Info("Added ZeDMD WiFi renderer.");
@@ -119,7 +119,7 @@ protected List<IDestination> GetRenderers(IConfiguration config, HashSet<string>
 			}
 
 			if (config.ZeDMDHDWiFi.Enabled) {
-				var zeDMDHDWiFi = ZeDMDHDWiFi.GetInstance(config.ZeDMDHDWiFi.Debug, config.ZeDMDHDWiFi.Brightness, config.ZeDMDHDWiFi.RgbOrder, config.ZeDMDHD.Port, config.ZeDMDHD.ScaleRgb24, config.ZeDMDHDWiFi.WifiAddress, config.ZeDMDHDWiFi.WifiPort);
+				var zeDMDHDWiFi = ZeDMDHDWiFi.GetInstance(config.ZeDMDHDWiFi.Debug, config.ZeDMDHDWiFi.Brightness, config.ZeDMDHDWiFi.RgbOrder, config.ZeDMDHD.Port, config.ZeDMDHDWiFi.WifiAddress);
 				if (zeDMDHDWiFi.IsAvailable) {
 					renderers.Add(zeDMDHDWiFi);
 					Logger.Info("Added ZeDMD HD WiFi renderer.");
diff --git a/Console/Common/BaseOptions.cs b/Console/Common/BaseOptions.cs
@@ -154,9 +154,6 @@ internal abstract class BaseOptions : IConfiguration
 		[Option("zedmd-wifi-address", HelpText = "Connect to ZeDMD in WiFi mode using this IP address. If not provided, a connection to zedmd-wifi.local will be established.")]
 		public string WifiAddress { get; set; } = null;
 
-		[Option("zedmd-wifi-port", HelpText = "Connect to ZeDMD in WiFi mode using this port. Default: 3333.")]
-		public int WifiPort { get; set; } = 3333;
-
 		public IGlobalConfig Global { get; }
 		public IVirtualDmdConfig VirtualDmd { get; }
 		public IVirtualAlphaNumericDisplayConfig VirtualAlphaNumericDisplay { get; }
@@ -430,7 +427,6 @@ public ZeDMDWiFiOptions(BaseOptions options)
 		public int RgbOrder => _options.RgbOrder;
 		public string Port => _options.Port;
 		public string WifiAddress => _options.WifiAddress;
-		public int WifiPort => _options.WifiPort;
 	}
 
 	internal class ZeDMDHDWiFiOptions : IZeDMDWiFiConfig
@@ -449,7 +445,6 @@ public ZeDMDHDWiFiOptions(BaseOptions options)
 		public int RgbOrder => _options.RgbOrder;
 		public string Port => _options.Port;
 		public string WifiAddress => _options.WifiAddress;
-		public int WifiPort => _options.WifiPort;
 	}
 
 	internal class Pin2DmdOptions : IPin2DmdConfig
diff --git a/LibDmd.Test/DmdDevice/TestConfiguration.cs b/LibDmd.Test/DmdDevice/TestConfiguration.cs
@@ -116,7 +116,6 @@ public class TestZeDMDConfig : IZeDMDConfig
 	public class TestZeDMDWiFiConfig : TestZeDMDConfig, IZeDMDWiFiConfig
 	{
 		public string WifiAddress { get; set; }
-		public int WifiPort { get; set; }
 	}
 
 	public class TestPin2DmdConfig : IPin2DmdConfig
diff --git a/LibDmd/Costura32/libserialport.dll b/LibDmd/Costura32/libserialport.dll
diff --git a/LibDmd/Costura32/sockpp.dll b/LibDmd/Costura32/sockpp.dll
diff --git a/LibDmd/Costura32/zedmd.dll b/LibDmd/Costura32/zedmd.dll
diff --git a/LibDmd/Costura64/libserialport64.dll b/LibDmd/Costura64/libserialport64.dll
diff --git a/LibDmd/Costura64/sockpp64.dll b/LibDmd/Costura64/sockpp64.dll
diff --git a/LibDmd/Costura64/zedmd64.dll b/LibDmd/Costura64/zedmd64.dll
diff --git a/LibDmd/DmdDevice/Configuration.cs b/LibDmd/DmdDevice/Configuration.cs
@@ -331,7 +331,6 @@ public class ZeDMDWiFiConfig : ZeDMDConfig, IZeDMDWiFiConfig
 	{
 		public override string Name { get; } = "zedmdwifi";
 		public string WifiAddress => GetString("wifi.address", null);
-		public int WifiPort => GetInt("wifi.port", 3333);
 		public ZeDMDWiFiConfig(IniData data, Configuration parent) : base(data, parent)
 		{
 		}
diff --git a/LibDmd/DmdDevice/DmdDevice.cs b/LibDmd/DmdDevice/DmdDevice.cs
@@ -494,7 +494,7 @@ private void SetupGraphs()
 				}
 			}
 			if (_config.ZeDMDWiFi.Enabled) {
-				var zeDmdWifi = ZeDMDWiFi.GetInstance(_config.ZeDMDWiFi.Debug, _config.ZeDMDWiFi.Brightness, _config.ZeDMDWiFi.RgbOrder, _config.ZeDMDWiFi.Port, _config.ZeDMDWiFi.WifiAddress, _config.ZeDMDWiFi.WifiPort);
+				var zeDmdWifi = ZeDMDWiFi.GetInstance(_config.ZeDMDWiFi.Debug, _config.ZeDMDWiFi.Brightness, _config.ZeDMDWiFi.RgbOrder, _config.ZeDMDWiFi.WifiAddress);
 				if (zeDmdWifi.IsAvailable) {
 					renderers.Add(zeDmdWifi);
 					Logger.Info("Added ZeDMD WiFi renderer.");
@@ -503,7 +503,7 @@ private void SetupGraphs()
 				}
 			}
 			if (_config.ZeDMDHDWiFi.Enabled) {
-				var zeDmdHdWifi = ZeDMDHDWiFi.GetInstance(_config.ZeDMDHDWiFi.Debug, _config.ZeDMDHDWiFi.Brightness, _config.ZeDMDHDWiFi.RgbOrder, _config.ZeDMDHDWiFi.Port, _config.ZeDMDHDWiFi.WifiAddress, _config.ZeDMDHDWiFi.WifiPort);
+				var zeDmdHdWifi = ZeDMDHDWiFi.GetInstance(_config.ZeDMDHDWiFi.Debug, _config.ZeDMDHDWiFi.Brightness, _config.ZeDMDHDWiFi.RgbOrder, _config.ZeDMDHDWiFi.WifiAddress);
 				if (zeDmdHdWifi.IsAvailable) {
 					renderers.Add(zeDmdHdWifi);
 					Logger.Info("Added ZeDMD HD WiFi renderer.");
diff --git a/LibDmd/DmdDevice/IConfiguration.cs b/LibDmd/DmdDevice/IConfiguration.cs
@@ -80,7 +80,6 @@ public interface IZeDMDConfig
 	public interface IZeDMDWiFiConfig : IZeDMDConfig
 	{
 		string WifiAddress { get; }
-		int WifiPort { get; }
 	}
 
 	public interface IPin2DmdConfig
diff --git a/LibDmd/LibDmd.csproj b/LibDmd/LibDmd.csproj
@@ -621,6 +621,7 @@
         <EmbeddedResource Include="Costura32\serum.dll" />
         <EmbeddedResource Include="Costura32\zedmd.dll" />
         <EmbeddedResource Include="Costura32\libserialport.dll" />
+        <EmbeddedResource Include="Costura32\sockpp.dll" />
         <EmbeddedResource Include="Costura32\libSkiaSharp.dll" />
         <EmbeddedResource Include="Costura32\sqlite3.dll" />
         <EmbeddedResource Include="Costura32\ftd2xx.dll" />
@@ -633,6 +634,7 @@
         <EmbeddedResource Include="Costura64\serum64.dll" />
         <EmbeddedResource Include="Costura64\zedmd64.dll" />
         <EmbeddedResource Include="Costura64\libserialport64.dll" />
+        <EmbeddedResource Include="Costura64\sockpp64.dll" />
         <EmbeddedResource Include="Costura64\libSkiaSharp.dll" />
         <EmbeddedResource Include="Costura64\sqlite3.dll" />
         <EmbeddedResource Include="Costura64\ftd2xx.dll" />
diff --git a/LibDmd/Output/ZeDMD/ZeDMDBase.cs b/LibDmd/Output/ZeDMD/ZeDMDBase.cs
@@ -22,7 +22,6 @@ public abstract class ZeDMDBase
 		protected bool Debug { get; set; }
 		protected int Brightness { get; set; }
 		protected int RgbOrder { get; set; }
-		protected string Port { get; set; }
 
 		protected IntPtr _pZeDMD = IntPtr.Zero;
 		protected readonly Logger Logger = LogManager.GetCurrentClassLogger();
diff --git a/LibDmd/Output/ZeDMD/ZeDMDHDWiFi.cs b/LibDmd/Output/ZeDMD/ZeDMDHDWiFi.cs
@@ -19,10 +19,10 @@ public class ZeDMDHDWiFi : ZeDMDWiFiBase, IRgb24Destination, IRgb565Destination,
 		/// Returns the current instance of ZeDMD.
 		/// </summary>
 		/// <returns>New or current instance</returns>
-		public static ZeDMDHDWiFi GetInstance(bool debug, int brightness, int rgbOrder, string port, string wifiAddress, int wifiPort)
+		public static ZeDMDHDWiFi GetInstance(bool debug, int brightness, int rgbOrder, string wifiAddress)
 		{
 			if (_instance == null) {
-				_instance = new ZeDMDHDWiFi { Debug = debug, Brightness = brightness, RgbOrder = rgbOrder, Port = port, WifiAddress = wifiAddress, WifiPort = wifiPort };
+				_instance = new ZeDMDHDWiFi { Debug = debug, Brightness = brightness, RgbOrder = rgbOrder, WifiAddress = wifiAddress };
 			}
 
             _instance.Init();
diff --git a/LibDmd/Output/ZeDMD/ZeDMDUsbBase.cs b/LibDmd/Output/ZeDMD/ZeDMDUsbBase.cs
@@ -11,6 +11,8 @@ namespace LibDmd.Output.ZeDMD
 	/// </summary>
 	public abstract class ZeDMDUsbBase : ZeDMDBase
 	{
+		protected string Port { get; set; }
+
 		protected new void Init()
 		{
 			base.Init();
diff --git a/LibDmd/Output/ZeDMD/ZeDMDWiFi.cs b/LibDmd/Output/ZeDMD/ZeDMDWiFi.cs
@@ -19,11 +19,11 @@ public class ZeDMDWiFi : ZeDMDWiFiBase, IRgb24Destination, IRgb565Destination, I
 		/// Returns the current instance of ZeDMD.
 		/// </summary>
 		/// <returns>New or current instance</returns>
-		public static ZeDMDWiFi GetInstance(bool debug, int brightness, int rgbOrder, string port, string wifiAddress, int wifiPort)
+		public static ZeDMDWiFi GetInstance(bool debug, int brightness, int rgbOrder, string wifiAddress)
 		{
 			if (_instance == null)
 			{
-				_instance = new ZeDMDWiFi { Debug = debug, Brightness = brightness, RgbOrder = rgbOrder, Port = port, WifiAddress = wifiAddress, WifiPort = wifiPort };
+				_instance = new ZeDMDWiFi { Debug = debug, Brightness = brightness, RgbOrder = rgbOrder, WifiAddress = wifiAddress };
 			}
 
             _instance.Init();
diff --git a/LibDmd/Output/ZeDMD/ZeDMDWiFiBase.cs b/LibDmd/Output/ZeDMD/ZeDMDWiFiBase.cs
@@ -12,14 +12,12 @@ namespace LibDmd.Output.ZeDMD
 	public abstract class ZeDMDWiFiBase : ZeDMDBase
 	{
 		protected string WifiAddress { get; set; }
-		protected int WifiPort { get; set; }
-
 		protected new void Init()
 		{
 			base.Init();
 
-			if (!string.IsNullOrEmpty(WifiAddress) && WifiPort > 0) {
-				IsAvailable = ZeDMD_OpenWiFi(_pZeDMD, WifiAddress, WifiPort);
+			if (!string.IsNullOrEmpty(WifiAddress)) {
+				IsAvailable = ZeDMD_OpenWiFi(_pZeDMD, WifiAddress);
 			} else {
 				IsAvailable = ZeDMD_OpenDefaultWiFi(_pZeDMD);
 			}
@@ -51,7 +49,7 @@ public abstract class ZeDMDWiFiBase : ZeDMDBase
 #else
 		[DllImport("zedmd.dll", CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)]
 #endif
-		protected static extern bool ZeDMD_OpenWiFi(IntPtr pZeDMD, string ip, int port);
+		protected static extern bool ZeDMD_OpenWiFi(IntPtr pZeDMD, string ip);
 
 		#endregion
 	}
diff --git a/PinMameDevice/DmdDevice.ini b/PinMameDevice/DmdDevice.ini
@@ -281,7 +281,6 @@ enabled = false
 
 ; if not set, the WiFi mode uses its autodiscovery 
 ;wifi.address = 192.168.0.27
-;wifi.port = 3333
 
 [zedmdhdwifi]
 
@@ -299,7 +298,6 @@ enabled = false
 
 ; if not set, the WiFi mode uses its autodiscovery 
 ;wifi.address = 192.168.0.27
-;wifi.port = 3333
 
 [pin2dmd]
 
diff --git a/README.md b/README.md
@@ -405,7 +405,6 @@ The output are described by block below.
 | `--zedmd-brightness`           | [zedmd]<br>brightness                          | Change any ZeDMD brightness between 0 and 15.                                                                                                                                                                                                                                                                                                                                                                                                                                        |
 | `--zedmd-rgborder`             | [zedmd]<br>rgborder                            | Change any ZeDMD RGB order between 0 and 5.                                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | `--zedmd-wifi-address`         | [zedmdwifi]<br>wifi.address                    | Connect to ZeDMD (HD) WiFi using this IP address. If not provided, a connection to zedmd-wifi.local will be established.                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| `--zedmd-wifi-port`            | [zedmdwifi]<br>wifi.port                       | Connect to ZeDMD (HD) WiFi using this port. Default: 3333.                                                                                                                                                                                                                                                                                                                                                                                                                                       |
 | *n/a*                          | [video]<br>enabled                             | Enables creating an .avi video from the DMD frames.                                                                                                                                                                                                                                                                                                                                                                                                                         |
 | *n/a*                          | [video]<br>path                                | Path to folder or .avi file. If a folder is given, it will create a file named after the current game.                                                                                                                                                                                                                                                                                                                                                                      |
 | *n/a*                          | [browserstream]<br>enabled                     | Enables streaming the DMD in real time to your browser in your LAN.                                                                                                                                                                                                                                                                                                                                                                                                         |

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,6 @@ public class TestZeDMDConfig : IZeDMDConfig`
`116`	`116`	`public class TestZeDMDWiFiConfig : TestZeDMDConfig, IZeDMDWiFiConfig`
`117`	`117`	`{`
`118`	`118`	`public string WifiAddress { get; set; }`
`119`		`- public int WifiPort { get; set; }`
`120`	`119`	`}`
`121`	`120`
`122`	`121`	`public class TestPin2DmdConfig : IPin2DmdConfig`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,6 @@ public class ZeDMDWiFiConfig : ZeDMDConfig, IZeDMDWiFiConfig`
`331`	`331`	`{`
`332`	`332`	`public override string Name { get; } = "zedmdwifi";`
`333`	`333`	`public string WifiAddress => GetString("wifi.address", null);`
`334`		`- public int WifiPort => GetInt("wifi.port", 3333);`
`335`	`334`	`public ZeDMDWiFiConfig(IniData data, Configuration parent) : base(data, parent)`
`336`	`335`	`{`
`337`	`336`	`}`