Support new DAL iterator format

Author: sebgod

.github/workflows/dotnet.yml

@@ -7,7 +7,7 @@ on:
     branches: [ main ]
 
 env:
-  VERSION_PREFIX: 3.2.${{ github.run_number }}
+  VERSION_PREFIX: 3.3.${{ github.run_number }}
   VERSION_REV: ${{ github.run_attempt }}
   VERSION_SUFFIX: +${{ github.sha }}
   BUILD_CONF: Release

ZWOptical.SDK.csproj

@@ -51,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup>
-	<PackageReference Include="TianWen.DAL" Version="1.2.61" />
+	<PackageReference Include="TianWen.DAL" Version="1.2.81" />
   </ItemGroup>
 
 </Project>

include/ASICamera2.cs

@@ -182,8 +182,40 @@ public BayerPattern BayerPattern
 
             public IReadOnlyList<int> SupportedBins => _supportedBins;
 
+            public IReadOnlyList<PixelDataFormat> SupportedPixelDataFormats
+            {
+                get
+                {
+                    var list = new List<PixelDataFormat>(_supportedVideoFormat.Length);
+
+                    for (var i = 0; i < _supportedVideoFormat.Length; i++)
+                    {
+                        if (_supportedVideoFormat[i] is ASI_IMG_TYPE.ASI_IMG_END)
+                        {
+                            break;
+                        }
+
+                        PixelDataFormat format;
+                        switch (_supportedVideoFormat[i])
+                        {
+                            case ASI_IMG_TYPE.ASI_IMG_RAW8: format = PixelDataFormat.RAW8; break;
+                            case ASI_IMG_TYPE.ASI_IMG_RGB24: format = PixelDataFormat.RGB24; break;
+                            case ASI_IMG_TYPE.ASI_IMG_RAW16: format = PixelDataFormat.RAW16; break;
+                            case ASI_IMG_TYPE.ASI_IMG_Y8: format = PixelDataFormat.Y8; break;
+                            default: throw new NotSupportedException($"Unsupported image type: {_supportedVideoFormat[i]}");
+                        }
+
+                        list[i] = format;
+                    }
+
+                    return list;
+                }
+            }
+
             public bool HasMechanicalShutter => _mechanicalShutter is ASI_BOOL.ASI_TRUE;
 
+            public bool HasCooler => _isCoolerCam is ASI_BOOL.ASI_TRUE;
+
             public bool HasST4Port => _st4Port is ASI_BOOL.ASI_TRUE;
 
             public int MaxWidth => _maxWidth;

include/DeviceIterator.cs

@@ -29,33 +29,33 @@ protected override int DeviceCount()
             return 0;
         }
 
-        protected override (int? DeviceId, TDeviceInfo? DeviceInfo) GetId(int index)
+        protected override TDeviceInfo? GetDeviceInfo(int index)
         {
             if (typeof(TDeviceInfo) == typeof(ASI_CAMERA_INFO))
             {
                 if (ASIGetCameraProperty(out var camInfo, index) is ASI_SUCCESS)
                 {
-                    return (camInfo.ID, (TDeviceInfo)(INativeDeviceInfo)camInfo);
+                    return (TDeviceInfo)(INativeDeviceInfo)camInfo;
                 }
             }
             else if (typeof(TDeviceInfo) == typeof(EAF_INFO))
             {
                 if (EAFGetID(index, out var eafId) is EAF_SUCCESS
                     && EAFGetProperty(eafId, out var eafInfo) is EAF_SUCCESS && eafInfo.ID == eafId)
                 {
-                    return (eafInfo.ID,  (TDeviceInfo)(INativeDeviceInfo)eafInfo);
+                    return (TDeviceInfo)(INativeDeviceInfo)eafInfo;
                 }
             }
             else if (typeof(TDeviceInfo) == typeof(EFW_INFO))
             {
                 if (EFWGetID(index, out var efwId) is EFW_SUCCESS
                     && EFWGetProperty(efwId, out var efwInfo) is EFW_SUCCESS && efwInfo.ID == efwId)
                 {
-                    return (efwInfo.ID, (TDeviceInfo)(INativeDeviceInfo)efwInfo);
+                    return (TDeviceInfo)(INativeDeviceInfo)efwInfo;
                 }
             }
 
-            return (null, null);
+            return null;
         }
     }
 }