Support for Nikon Z6 II

dukus · Oct 5, 2021 · a6b644f · a6b644f
1 parent f83fa03
commit a6b644f
Show file tree

Hide file tree

Showing 19 changed files with 37 additions and 36 deletions.
diff --git a/CameraControl.Core/Properties/AssemblyInfo.cs b/CameraControl.Core/Properties/AssemblyInfo.cs
@@ -68,5 +68,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/CameraControl.Devices/CameraDeviceManager.cs b/CameraControl.Devices/CameraDeviceManager.cs
@@ -200,6 +200,7 @@ private void PopulateDeviceClass()
                 {"Z 50", typeof(NikonZ6)},
                 {"Z 5", typeof(NikonZ6)},
                 {"Z 6", typeof(NikonZ6)},
+                {"Z 6_2", typeof(NikonZ6)},
                 {"Z 7", typeof(NikonZ7)},
                 //{"Canon EOS 5D Mark II", typeof (CanonSDKBase)},
                 {"MTP Sim", typeof(BaseMTPCamera)},

diff --git a/CameraControl.Devices/Properties/AssemblyInfo.cs b/CameraControl.Devices/Properties/AssemblyInfo.cs
@@ -68,5 +68,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/CameraControl.PluginManager/Properties/AssemblyInfo.cs b/CameraControl.PluginManager/Properties/AssemblyInfo.cs
@@ -86,5 +86,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/CameraControl.Plugins/Properties/AssemblyInfo.cs b/CameraControl.Plugins/Properties/AssemblyInfo.cs
@@ -68,5 +68,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/CameraControl.ServerTest/Properties/AssemblyInfo.cs b/CameraControl.ServerTest/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/CameraControl.Test/Properties/AssemblyInfo.cs b/CameraControl.Test/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/CameraControl.Trigger/Properties/AssemblyInfo.cs b/CameraControl.Trigger/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/CameraControl/Properties/AssemblyInfo.cs b/CameraControl/Properties/AssemblyInfo.cs
@@ -86,5 +86,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/CameraControlCmd/Properties/AssemblyInfo.cs b/CameraControlCmd/Properties/AssemblyInfo.cs
@@ -68,5 +68,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/CameraControlRemoteCmd/Properties/AssemblyInfo.cs b/CameraControlRemoteCmd/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/Canon.Eos.Framework/Properties/AssemblyInfo.cs b/Canon.Eos.Framework/Properties/AssemblyInfo.cs
@@ -12,6 +12,6 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("3a70507d-c50a-47ca-b920-303d687631ec")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
 [assembly: InternalsVisibleTo("Canon.Eos.UnitTests")]
diff --git a/DccObsPlugin/Properties/AssemblyInfo.cs b/DccObsPlugin/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/MtpTester/Properties/AssemblyInfo.cs b/MtpTester/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/PhotoBooth/Properties/AssemblyInfo.cs b/PhotoBooth/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/Plugin.DeviceControl/Properties/AssemblyInfo.cs b/Plugin.DeviceControl/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/PortableDeviceLib/Properties/AssemblyInfo.cs b/PortableDeviceLib/Properties/AssemblyInfo.cs
@@ -52,6 +52,6 @@ You should have received a copy of the GNU Lesser General Public
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut 
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
 [assembly: InternalsVisibleTo("PortableDeviceLib.Tests")]
diff --git a/Setup/Properties/AssemblyInfo.cs b/Setup/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
diff --git a/ZoomAndPan/Properties/AssemblyInfo.cs b/ZoomAndPan/Properties/AssemblyInfo.cs
@@ -30,8 +30,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.3.6")]
-[assembly: AssemblyFileVersion("2.1.3.6")]
+[assembly: AssemblyVersion("2.1.3.7")]
+[assembly: AssemblyFileVersion("2.1.3.7")]
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located