diff --git a/LumixCamera/ASCOM.Lumix.Camera Setup.iss b/LumixCamera/ASCOM.Lumix.Camera Setup.iss index e353467..d1455ce 100644 --- a/LumixCamera/ASCOM.Lumix.Camera Setup.iss +++ b/LumixCamera/ASCOM.Lumix.Camera Setup.iss @@ -5,13 +5,13 @@ [Setup] AppID={{77b4d898-3116-40a5-91d4-4c41ff123d93} AppName=ASCOM ASCOM.Lumix.Camera Camera Driver -AppVerName=ASCOM ASCOM.Lumix.Camera Camera Driver 7.0.1 +AppVerName=ASCOM ASCOM.Lumix.Camera Camera Driver 7.0.2 AppVersion=7.0.1 AppPublisher=robert hasson AppPublisherURL=mailto:robert_hasson@yahoo.com AppSupportURL=http://tech.groups.yahoo.com/group/ASCOM-Talk/ AppUpdatesURL=http://ascom-standards.org/ -VersionInfoVersion=7.0.1 +VersionInfoVersion=7.0.2 MinVersion=0,6.0 DefaultDirName="{cf}\ASCOM\Camera" DisableDirPage=yes @@ -25,7 +25,7 @@ WizardImageFile="C:\Program Files (x86)\ASCOM\Platform 6 Developer Components\In LicenseFile="C:\Program Files (x86)\ASCOM\Platform 6 Developer Components\Installer Generator\Resources\CreativeCommons.txt" ; {cf}\ASCOM\Uninstall\Camera folder created by Platform, always UninstallFilesDir="{cf}\ASCOM\Uninstall\Camera\ASCOM.Lumix.Camera" -OutputDir=Z:\ +OutputDir=Y:\ [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -34,13 +34,13 @@ Name: "english"; MessagesFile: "compiler:Default.isl" Name: "{cf}\ASCOM\Uninstall\Camera\ASCOM.Lumix.Camera" ; TODO: Add subfolders below {app} as needed (e.g. Name: "{app}\MyFolder")' [Files] -Source: "C:\Users\robert.hasson\source\repos\LumixCamera\LumixCamera\bin\Release\ASCOM.Lumix.Camera.dll"; DestDir: "{app}" -Source: "C:\Users\robert.hasson\source\repos\LumixCamera\LumixCamera\bin\Release\Libraw.dll"; DestDir: "{app}" -Source: "C:\Users\robert.hasson\source\repos\LumixCamera\LumixCamera\bin\Release\Libraw32.dll"; DestDir: "{app}" +Source: "C:\Users\rober\source\repos\totoantibes\LumixCameraAscomDriver\LumixCamera\bin\Release\ASCOM.Lumix.Camera.dll"; DestDir: "{app}" +Source: "C:\Users\rober\source\repos\totoantibes\LumixCameraAscomDriver\LumixCamera\bin\Release\Libraw.dll"; DestDir: "{app}" +Source: "C:\Users\rober\source\repos\totoantibes\LumixCameraAscomDriver\LumixCamera\bin\Release\Libraw32.dll"; DestDir: "{app}" ; Require a read-me HTML to appear after installation, maybe driver's Help doc -Source: "C:\Users\robert.hasson\source\repos\LumixCamera\readme.md"; DestDir: "{app}"; Flags: isreadme +Source: "C:\Users\rober\source\repos\totoantibes\LumixCameraAscomDriver\readme.md"; DestDir: "{app}"; Flags: isreadme ; TODO: Add other files needed by your driver here (add subfolders above) -Source: "C:\Users\robert.hasson\source\repos\LumixCamera\readme_files\*"; DestDir: "{app}\readme_files\"; +Source: "C:\Users\rober\source\repos\totoantibes\LumixCameraAscomDriver\readme_files\*"; DestDir: "{app}\readme_files\"; ; Only if driver is .NET diff --git a/LumixCamera/ASCOM.Lumix.Camera Setup32.iss b/LumixCamera/ASCOM.Lumix.Camera Setup32.iss index 5317a12..0f6fe01 100644 --- a/LumixCamera/ASCOM.Lumix.Camera Setup32.iss +++ b/LumixCamera/ASCOM.Lumix.Camera Setup32.iss @@ -5,13 +5,13 @@ [Setup] AppID={{77b4d898-3116-40a5-91d4-4c41ff123d93} AppName=ASCOM ASCOM.Lumix.Camera Camera Driver -AppVerName=ASCOM ASCOM.Lumix.Camera Camera Driver 7.0.1 -AppVersion=7.0.1 +AppVerName=ASCOM ASCOM.Lumix.Camera Camera Driver 7.0.2 +AppVersion=7.0.2 AppPublisher=robert hasson AppPublisherURL=mailto:robert_hasson@yahoo.com AppSupportURL=http://tech.groups.yahoo.com/group/ASCOM-Talk/ AppUpdatesURL=http://ascom-standards.org/ -VersionInfoVersion=7.0.1 +VersionInfoVersion=7.0.2 MinVersion=0,6.0 DefaultDirName="{cf}\ASCOM\Camera" DisableDirPage=yes @@ -25,7 +25,7 @@ WizardImageFile="C:\Program Files (x86)\ASCOM\Platform 6 Developer Components\In LicenseFile="C:\Program Files (x86)\ASCOM\Platform 6 Developer Components\Installer Generator\Resources\CreativeCommons.txt" ; {cf}\ASCOM\Uninstall\Camera folder created by Platform, always UninstallFilesDir="{cf}\ASCOM\Uninstall\Camera\ASCOM.Lumix.Camera" -OutputDir=Z:\ +OutputDir=Y:\ [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -35,13 +35,13 @@ Name: "{cf}\ASCOM\Uninstall\Camera\ASCOM.Lumix.Camera" ; TODO: Add subfolders below {app} as needed (e.g. Name: "{app}\MyFolder") ;C:\Users\robert.hasson\source\repos\LumixCamera\LumixCamera\bin\x86\Release [Files] -Source: "C:\Users\robert.hasson\source\repos\LumixCamera\LumixCamera\bin\x86\Release\ASCOM.Lumix.Camera.dll"; DestDir: "{app}" -Source: "C:\Users\robert.hasson\source\repos\LumixCamera\LumixCamera\bin\Release\Libraw.dll"; DestDir: "{app}" -Source: "C:\Users\robert.hasson\source\repos\LumixCamera\LumixCamera\bin\Release\Libraw32.dll"; DestDir: "{app}" +Source: "C:\Users\rober\Source\Repos\totoantibes\LumixCameraAscomDriver\LumixCamera\bin\x86\Release\ASCOM.Lumix.Camera.dll"; DestDir: "{app}" +Source: "C:\Users\rober\Source\Repos\totoantibes\LumixCameraAscomDriver\LumixCamera\bin\x86\Release\Libraw.dll"; DestDir: "{app}" +Source: "C:\Users\rober\Source\Repos\totoantibes\LumixCameraAscomDriver\LumixCamera\bin\x86\Release\Libraw32.dll"; DestDir: "{app}" ; Require a read-me HTML to appear after installation, maybe driver's Help doc -Source: "C:\Users\robert.hasson\source\repos\LumixCamera\readme.md"; DestDir: "{app}"; Flags: isreadme +Source: "C:\Users\rober\Source\Repos\totoantibes\LumixCameraAscomDriver\readme.md"; DestDir: "{app}"; Flags: isreadme ; TODO: Add other files needed by your driver here (add subfolders above) -Source: "C:\Users\robert.hasson\source\repos\LumixCamera\readme_files\*"; DestDir: "{app}\readme_files\"; +Source: "C:\Users\rober\Source\Repos\totoantibes\LumixCameraAscomDriver\readme_files\*"; DestDir: "{app}\readme_files\"; ; Only if driver is .NET diff --git a/LumixCamera/Driver.vb b/LumixCamera/Driver.vb index 3dc26f5..d898778 100644 --- a/LumixCamera/Driver.vb +++ b/LumixCamera/Driver.vb @@ -369,7 +369,8 @@ Public Class Camera Models.Add("GX9", "20.3") Models.Add("GF10", "16.0") Models.Add("GH5S", "10.2") - Models.Add("G9", "20.3") + Models.Add("G9", "20.0") + Models.Add("G90", "20.0") Models.Add("GH5", "20.3") Models.Add("GF9", "16.0") Models.Add("GX800", "16.0") @@ -379,7 +380,7 @@ Public Class Camera Models.Add("G85", "16.0") Models.Add("GX80", "16.0") Models.Add("GX85", "16.0") - Models.Add("G95", "20.3") + Models.Add("G95", "20.0") Models.Add("GF8", "16.0") Models.Add("GX8", "20.3") Models.Add("G7", "16.0") @@ -394,7 +395,11 @@ Public Class Camera Models.Add("G6", "16.05") Models.Add("GF6", "16.0") Models.Add("S1", "24.2") + Models.Add("S5", "24.2") Models.Add("S1R", "47.3") + Models.Add("S1H", "24.2") + Models.Add("BGH1", "10.2") + Models.Add("G100", "20.3") End If '"10.2", "12.1", "16.0", "16.05", "20.0", "20.3", "24.2", "47.3" @@ -424,14 +429,15 @@ Public Class Camera Resolutions(5)._Y = 3907 Resolutions(6)._resolution = "24.2" - Resolutions(6)._X = 6000 - Resolutions(6)._Y = 4000 + Resolutions(6)._X = 6026 + Resolutions(6)._Y = 4017 Resolutions(7)._resolution = "47.3" Resolutions(7)._X = 8368 Resolutions(7)._Y = 5584 + ResolutionsJPG(0)._resolution = "12.1" ResolutionsJPG(0)._X = 3991 ResolutionsJPG(0)._Y = 2998 @@ -441,8 +447,8 @@ Public Class Camera ResolutionsJPG(1)._Y = 3448 '3468 ResolutionsJPG(2)._resolution = "20.0" - ResolutionsJPG(2)._X = 5180 - ResolutionsJPG(2)._Y = 3890 + ResolutionsJPG(2)._X = 5184 + ResolutionsJPG(2)._Y = 3888 ResolutionsJPG(3)._resolution = "10.2" ResolutionsJPG(3)._X = 3680 @@ -497,6 +503,8 @@ Public Class Camera ResolutionsThumb(7)._resolution = "47.3" ResolutionsThumb(7)._X = 1440 ResolutionsThumb(7)._Y = 1080 + + 'TODO: Implement your additional construction here TL.LogMessage("Camera", "Completed initialisation") @@ -717,7 +725,7 @@ Public Class Camera Private sensormmy As Double = 13 Private pixelSize As Double = 1000 * sensormmx / ccdWidth '3.75 Constant for the pixel physical dimension - Private MFTresolutions = {{"10M", 3697, 2780}, {"12M", 4011, 3016}, {"16M", 4612, 3468}, {"20M", 5200, 3910}} '5200 x 3910 4011 x 3016 + ' Private MFTresolutions = {{"10M", 3697, 2780}, {"12M", 4011, 3016}, {"16M", 4612, 3468}, {"20M", 5200, 3910}} '5200 x 3910 4011 x 3016 Private Structure MFTResolution diff --git a/LumixCamera/My Project/AssemblyInfo.vb b/LumixCamera/My Project/AssemblyInfo.vb index 4bfce47..3264732 100644 --- a/LumixCamera/My Project/AssemblyInfo.vb +++ b/LumixCamera/My Project/AssemblyInfo.vb @@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices ' You can specify all the values or you can default the Build and Revision Numbers ' by using the '*' as shown below: - - + +