From 6e13195f8b041d07308f74f199fb3e1d1cb346cf Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 27 Apr 2020 12:27:07 +0300 Subject: Fixed issue with firmware upgrade on Machine Studio. --- .../Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs | 1 + 1 file changed, 1 insertion(+) (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs index 365c1db49..7d2d8b401 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/FirmwareUpgradeViewVM.cs @@ -202,6 +202,7 @@ namespace Tango.MachineStudio.UI.ViewModels { IsFree = true; CanClose = true; + _stream?.Dispose(); UpgradeError = ex.FlattenMessage(); CurrentPage = 3; } -- cgit v1.3.1 From 0bd6c0244716df402af9f68bc7d15f0ac56ad506 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 27 Apr 2020 12:42:33 +0300 Subject: PPC: v1.1.13 MS v1.4.9 Added PPC publisher settings backup. --- .../Machine Studio Installer.aip | 6 +- .../PPC Installer-cache/cacheIndex.txt | Bin 52 -> 52 bytes .../Advanced Installer Projects/PPC Installer.aip | 6 +- .../Properties/AssemblyInfo.cs | 2 +- .../Tango.PPC.Publisher.UI.csproj | 1 + .../Tango.PPC.Publisher.UI.json | 164 +++++++++++++++++++++ .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- 8 files changed, 174 insertions(+), 9 deletions(-) create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.json (limited to 'Software/Visual_Studio/MachineStudio') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index 2adf45797..19b86bbbc 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -16,10 +16,10 @@ - + - + @@ -817,7 +817,7 @@ - + diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt index 9453b5c13..a603ff06b 100644 Binary files a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt and b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt differ diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index 5bfc34cf9..743de5900 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -18,10 +18,10 @@ - + - + @@ -468,7 +468,7 @@ - + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index e7fcaf8d6..26859b94a 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.1.8.0")] +[assembly: AssemblyVersion("4.1.9.0")] [assembly: ComVisible(false)] \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj index f40a4b338..f524d9151 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.csproj @@ -133,6 +133,7 @@ SettingsSingleFileGenerator Settings.Designer.cs + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.json b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.json new file mode 100644 index 000000000..19dea4781 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Publisher.UI/Tango.PPC.Publisher.UI.json @@ -0,0 +1,164 @@ +{ + "$type": "System.Collections.Generic.List`1[[Tango.Settings.SettingsBase, Tango.Settings]], mscorlib", + "$values": [ + { + "$type": "Tango.PPC.Common.PPCSettings, Tango.PPC.Common", + "ApplicationState": "PreSetup", + "MachineScanningTimeoutSeconds": 20, + "AutoConnectWiFiName": null, + "AutoConnectWiFiPassword": null, + "EmbeddedComPort": null, + "EmbeddedDeviceHint": "Tango USB Serial Port", + "EnableExternalBridge": false, + "ExternalBridgePassword": "Aa123456", + "EnableHotSpot": false, + "HotSpotPassword": "Aa123456", + "EnableRemoteAssistance": false, + "DeploymentSlot": "DEV", + "EnableWatchDog": true, + "EnableTechnicianModeByDefault": false, + "JobUploadStrategy": "JobDescriptionFile", + "EnableGradientGeneration": true, + "GradientGenerationResolution": 20, + "EnableLockScreen": false, + "LockScreenTimeout": "00:10:00", + "LockScreenPassword": "1111", + "EnableEmergencyNotifications": true, + "EmergencyComPort": "COM1", + "EnableJobLiquidQuantityValidation": true, + "JobUnitsMethod": "Device", + "LoadedRmlGuid": null, + "DefaultRmlGuid": null, + "SupportedColorSpaces": { + "$type": "System.Collections.Generic.List`1[[Tango.BL.Enumerations.ColorSpaces, Tango.BL]], mscorlib", + "$values": [] + }, + "SupportedJobTypes": { + "$type": "System.Collections.Generic.List`1[[Tango.BL.Enumerations.JobTypes, Tango.BL]], mscorlib", + "$values": [] + }, + "DefaultSpoolTypeGuid": null, + "DefaultSegmentLength": 100, + "PreviousApplicationVersion": "1.0.0.0", + "SynchronizeJobs": true, + "SynchronizeDiagnostics": true, + "SynchronizationInterval": "01:00:00", + "FirmwareVersion": "1.0.0.0", + "DisplayPowerUpScreen": true, + "PowerUpScreenTimeout": "00:00:20", + "AutoCheckForUpdates": true, + "AutoUpdateCheckInterval": "00:30:00", + "EnableAutomaticThreadLoading": true, + "DisplayAutomaticThreadLoadingScreen": true, + "EnableEmbeddedDebugLogs": true, + "TcpTransportAdapterWriteMode": "Interval", + "EnableExternalBridgeSignalR": true, + "ExternalBridgeSignalRHub": "ExternalBridgeHub", + "EnableRemoteDesktop": true, + "RemoteDesktopFrameRate": 5 + }, + { + "$type": "Tango.Core.CoreSettings, Tango.Core", + "DataSource": { + "$type": "Tango.Core.DataSource, Tango.Core", + "Type": "SQLServer", + "Address": "localhost\\SQLEXPRESS", + "Catalog": "Tango", + "IntegratedSecurity": true, + "UserName": "", + "Password": "", + "AccessToken": null, + "AccessTokenExpiration": "0001-01-01T00:00:00" + } + }, + { + "$type": "Tango.PPC.Publisher.UI.PublisherSettings, Tango.PPC.Publisher.UI", + "Options": { + "$type": "Tango.PPC.Common.Publish.PublishOptions, Tango.PPC.Common", + "BasePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Build\\PPC\\Debug\\..\\", + "BuildConfig": "Release", + "Email": "roy@twine-s.com", + "Password": "1Creativity", + "Comments": "Several bug fixes.", + "Environment": "TEST", + "MachineVersionGuid": "997a53b0-e752-474e-9618-7262c02d0127", + "TfpPath": "P:\\Software\\FirmwareUpgrade\\Version 1.4.6.20\\firmware_package.tfp", + "InstallerProject": "D:\\Development\\Tango\\Software\\Visual_Studio\\Advanced Installer Projects\\PPC Installer.aip", + "InstallerOutputFolder": "D:\\Development\\Tango\\Software\\Visual_Studio\\Build\\Installers\\PPC", + "Synchronization": { + "$type": "Tango.PPC.Common.Publish.SynchronizationOptions, Tango.PPC.Common", + "ProvisionSequenceItems": { + "$type": "System.Collections.ObjectModel.ObservableCollection`1[[Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common]], System", + "$values": [ + { + "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", + "Type": "Schema", + "Direction": "SourceToTarget", + "Index": 0, + "Name": "Synchronizing schema", + "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\Schema.xml", + "RequiresSerialNumber": false, + "FileName": "Schema.xml" + }, + { + "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", + "Type": "Data", + "Direction": "SourceToTarget", + "Index": 1, + "Name": "Synchronizing collections", + "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\OverrideData.xml", + "RequiresSerialNumber": false, + "FileName": "OverrideData.xml" + }, + { + "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", + "Type": "Data", + "Direction": "SourceToTarget", + "Index": 2, + "Name": "Configuring machine", + "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\ProvisionMachine.xml", + "RequiresSerialNumber": true, + "FileName": "ProvisionMachine.xml" + } + ] + }, + "UpdateSequenceItems": { + "$type": "System.Collections.ObjectModel.ObservableCollection`1[[Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common]], System", + "$values": [ + { + "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", + "Type": "Schema", + "Direction": "SourceToTarget", + "Index": 0, + "Name": "Updating schema", + "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\Schema.xml", + "RequiresSerialNumber": false, + "FileName": "Schema.xml" + }, + { + "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", + "Type": "Data", + "Direction": "SourceToTarget", + "Index": 1, + "Name": "Updating collections", + "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\OverrideData.xml", + "RequiresSerialNumber": false, + "FileName": "OverrideData.xml" + }, + { + "$type": "Tango.PPC.Common.Publish.SequenceItem, Tango.PPC.Common", + "Type": "Data", + "Direction": "SourceToTarget", + "Index": 2, + "Name": "Updating machine", + "FilePath": "D:\\Development\\Tango\\Software\\Visual_Studio\\Tango.SQLExaminer\\SQLExaminer\\Configurations\\UpdateMachine.xml", + "RequiresSerialNumber": true, + "FileName": "UpdateMachine.xml" + } + ] + } + } + } + } + ] +} \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 34465c81e..b51937fa2 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.1.12.0")] +[assembly: AssemblyVersion("1.1.13.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + -- cgit v1.3.1