diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-12-22 14:51:17 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-12-22 14:51:17 +0200 |
| commit | c6ca09b04ceb4024311b86aab409ca658fbee37e (patch) | |
| tree | 28fbf57ba2f7ed1e480350288d6e3b1edfa18307 /Software/Visual_Studio | |
| parent | 1ee3c5e5cdacd6797fbcb87a7784b40fe5d6be7f (diff) | |
| download | Tango-c6ca09b04ceb4024311b86aab409ca658fbee37e.tar.gz Tango-c6ca09b04ceb4024311b86aab409ca658fbee37e.zip | |
Improved CanPrint and IsPrinting detection on PPC.
Added support for PowerUp and StandBy states.
Made sync jobs false by default.
Diffstat (limited to 'Software/Visual_Studio')
16 files changed, 36 insertions, 38 deletions
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 Binary files differindex ee0744fc9..a603ff06b 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip index 17bdd452f..6000cea68 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip @@ -42,7 +42,6 @@ <ROW Directory="Configurations_Dir" Directory_Parent="SQLExaminer_Dir" DefaultDir="CONFIG~1|Configurations" DirectoryOptions="3"/> <ROW Directory="DesktopFolder" Directory_Parent="TARGETDIR" DefaultDir="DESKTO~1|DesktopFolder" IsPseudoRoot="1"/> <ROW Directory="Packages_Dir" Directory_Parent="APPDIR" DefaultDir="Packages" DirectoryOptions="3"/> - <ROW Directory="ProtoCompilers_Dir" Directory_Parent="Packages_Dir" DefaultDir="PROTOC~1|ProtoCompilers" DirectoryOptions="3"/> <ROW Directory="SHORTCUTDIR" Directory_Parent="TARGETDIR" DefaultDir="SHORTC~1|SHORTCUTDIR" IsPseudoRoot="1"/> <ROW Directory="SQLExaminer_Dir" Directory_Parent="APPDIR" DefaultDir="SQLEXA~1|SQLExaminer" DirectoryOptions="3"/> <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/> @@ -178,21 +177,16 @@ <ROW Component="Tango.TFS.dll" ComponentId="{535E80F9-2DB0-4CD3-9110-ADA90EC92681}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.TFS.dll"/> <ROW Component="Tango.Touch.dll" ComponentId="{F9E2E4D3-3985-4142-AB35-E48740C2ECAE}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Touch.dll"/> <ROW Component="Tango.Transport.dll" ComponentId="{757E4901-D269-42C1-A70E-7B8DABB66024}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Transport.dll"/> - <ROW Component="Tango.Transport.dll.config" ComponentId="{C47C4C59-4AB8-4AD2-B39F-3070ED5FC9A1}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.Transport.dll.config_1" Type="0"/> - <ROW Component="Tango.Transport.dll_1" ComponentId="{5DAC7378-5EEF-44A0-BB1E-86F2A5A8798E}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.Transport.dll_1"/> <ROW Component="Tango.Web.dll" ComponentId="{131328BC-D68F-4CB8-8D8C-F89CF6F8486C}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.Web.dll"/> <ROW Component="Tango.WiFi.dll" ComponentId="{8082C9BD-5BDB-4C52-BCA6-E8604D4D232B}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.WiFi.dll"/> <ROW Component="mscoree.dll" ComponentId="{85F439D0-8FD0-4B99-888D-336C7A125E3D}" Directory_="APPDIR" Attributes="0" KeyPath="mscoree.dll"/> <ROW Component="msvcp140d.dll" ComponentId="{69E32675-9ACF-4C23-A495-300B78913B66}" Directory_="APPDIR" Attributes="0" KeyPath="msvcp140d.dll"/> - <ROW Component="protoc.exe" ComponentId="{45BA4A75-830C-4143-A5CC-DECA53246906}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc.exe"/> - <ROW Component="protoc1.0M4.jar" ComponentId="{DD781C80-2A2D-4C91-8EF8-B5976D8EBFAF}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protoc1.0M4.jar" Type="0"/> - <ROW Component="protocc.exe" ComponentId="{CF6FF28F-142D-4F8D-94B8-A5E5ABB265E8}" Directory_="ProtoCompilers_Dir" Attributes="0" KeyPath="protocc.exe"/> <ROW Component="ucrtbased.dll" ComponentId="{B8D025EA-CD16-4EE7-A3E7-713E2BE82BF3}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/> <ROW Component="vcruntime140.dll" ComponentId="{144594CC-D19B-45E4-A420-7A1BBB122EE3}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/> <ROW Component="vcruntime140d.dll" ComponentId="{7653420C-C6C3-4F31-97E8-D6DE417D3DF2}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140d.dll"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent"> - <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_ExePath ColorMine.dll CommandLine.dll CommandLine.xml ControlzEx.dll DocumentFormat.OpenXml.dll EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll Hyak.Common.dll ICSharpCode.AvalonEdit.dll Interop.MSDASC.dll Ionic.Zip.dll JWT.dll License.lic Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.Azure.Common.NetFramework.dll Microsoft.Azure.Common.dll Microsoft.Azure.ResourceManager.dll Microsoft.Data.Edm.dll Microsoft.Data.OData.dll Microsoft.Data.Services.Client.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.WITDataStore32.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll OverrideData.xml ProductInformation RazorEngine.dll SA.Binary.dll SA.CodeView.dll SA.CommonTypes.dll SA.CommonUI.dll SA.SCBaseProvider.dll SA.SQLDataExaminer.Engine.dll SA.SQLExaminer.Engine.dll SA.Utils.ErrorReporter.dll SHORTCUTDIR SQLDECmd.exe SQLECmd.exe SimpleValidator.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.IO.Compression.FileSystem.dll System.IdentityModel.Tokens.Jwt.dll System.Net.Http.Formatting.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Spatial.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Web.Razor.dll System.Windows.Interactivity.dll Tango.AdvancedInstaller.dll Tango.AnimatedGif.dll Tango.BL.dll Tango.CodeGeneration.dll Tango.ColorConversion.dll Tango.ColorLib_v1.dll Tango.ColorLib_v2.dll Tango.ColorLib_v3.dll Tango.Core.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Emulations.dll Tango.Explorer.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.PMR.dll Tango.PPC.BackupRestore.dll Tango.PPC.BootScreen.exe Tango.PPC.Browser.dll Tango.PPC.BugReporting.dll Tango.PPC.Common.dll Tango.PPC.Events.dll Tango.PPC.Jobs.dll Tango.PPC.MachineSettings.dll Tango.PPC.Maintenance.dll Tango.PPC.Packages.CefInstaller.dll Tango.PPC.Packages.SamplePostPackage.dll Tango.PPC.Packages.SamplePrePackage.dll Tango.PPC.Storage.dll Tango.PPC.Technician.dll Tango.PPC.UI.exe Tango.PPC.Updater.exe Tango.PPC.WatchDog.exe Tango.Pulse.dll Tango.SQLExaminer.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.TFS.dll Tango.Touch.dll Tango.Transport.dll Tango.Transport.dll.config Tango.Transport.dll_1 Tango.Web.dll Tango.WiFi.dll mscoree.dll msvcp140d.dll protoc.exe protoc1.0M4.jar protocc.exe ucrtbased.dll vcruntime140.dll vcruntime140d.dll"/> + <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AI_CustomARPName AI_ExePath ColorMine.dll CommandLine.dll CommandLine.xml ControlzEx.dll DocumentFormat.OpenXml.dll EFCache.dll EntityFramework.SqlServer.dll EntityFramework.dll FluentFTP.dll FontAwesome.WPF.dll Google.Protobuf.dll Hyak.Common.dll ICSharpCode.AvalonEdit.dll Interop.MSDASC.dll Ionic.Zip.dll JWT.dll License.lic Microsoft.Azure.ActiveDirectory.GraphClient.dll Microsoft.Azure.Common.NetFramework.dll Microsoft.Azure.Common.dll Microsoft.Azure.ResourceManager.dll Microsoft.Data.Edm.dll Microsoft.Data.OData.dll Microsoft.Data.Services.Client.dll Microsoft.IdentityModel.Clients.ActiveDirectory.Platform.dll Microsoft.IdentityModel.Clients.ActiveDirectory.dll Microsoft.ServiceBus.dll Microsoft.SqlServer.AzureStorageEnum.dll Microsoft.SqlServer.ConnectionInfo.dll Microsoft.SqlServer.Diagnostics.STrace.dll Microsoft.SqlServer.Dmf.Common.dll Microsoft.SqlServer.Management.Sdk.Sfc.dll Microsoft.SqlServer.ServiceBrokerEnum.dll Microsoft.SqlServer.Smo.dll Microsoft.SqlServer.SqlClrProvider.dll Microsoft.SqlServer.SqlEnum.dll Microsoft.TeamFoundation.Client.dll Microsoft.TeamFoundation.Common.dll Microsoft.TeamFoundation.Core.WebApi.dll Microsoft.TeamFoundation.Diff.dll Microsoft.TeamFoundation.Work.WebApi.dll Microsoft.TeamFoundation.WorkItemTracking.Client.DataStoreLoader.dll Microsoft.TeamFoundation.WorkItemTracking.Client.QueryLanguage.dll Microsoft.TeamFoundation.WorkItemTracking.Client.dll Microsoft.TeamFoundation.WorkItemTracking.Common.dll Microsoft.TeamFoundation.WorkItemTracking.Proxy.dll Microsoft.TeamFoundation.WorkItemTracking.WebApi.dll Microsoft.VisualStudio.Services.Client.Interactive.dll Microsoft.VisualStudio.Services.Common.dll Microsoft.VisualStudio.Services.WebApi.dll Microsoft.WITDataStore32.dll Microsoft.WindowsAzure.Storage.dll Newtonsoft.Json.dll OverrideData.xml ProductInformation RazorEngine.dll SA.Binary.dll SA.CodeView.dll SA.CommonTypes.dll SA.CommonUI.dll SA.SCBaseProvider.dll SA.SQLDataExaminer.Engine.dll SA.SQLExaminer.Engine.dll SA.Utils.ErrorReporter.dll SHORTCUTDIR SQLDECmd.exe SQLECmd.exe SimpleValidator.dll System.Data.SQLite.EF6.dll System.Data.SQLite.Linq.dll System.Data.SQLite.dll System.IO.Compression.FileSystem.dll System.IdentityModel.Tokens.Jwt.dll System.Net.Http.Formatting.dll System.Reactive.Core.dll System.Reactive.Interfaces.dll System.Reactive.Linq.dll System.Reactive.PlatformServices.dll System.Spatial.dll System.Web.Http.WebHost.dll System.Web.Http.dll System.Web.Razor.dll System.Windows.Interactivity.dll Tango.AdvancedInstaller.dll Tango.AnimatedGif.dll Tango.BL.dll Tango.CodeGeneration.dll Tango.ColorConversion.dll Tango.ColorLib_v1.dll Tango.ColorLib_v2.dll Tango.ColorLib_v3.dll Tango.Core.dll Tango.Documents.dll Tango.DragAndDrop.dll Tango.Emulations.dll Tango.Explorer.dll Tango.FirmwareUpdateLib.WPF.dll Tango.FirmwareUpdateLib.dll Tango.Hive.dll Tango.Integration.dll Tango.Logging.dll Tango.PMR.dll Tango.PPC.BackupRestore.dll Tango.PPC.BootScreen.exe Tango.PPC.Browser.dll Tango.PPC.BugReporting.dll Tango.PPC.Common.dll Tango.PPC.Events.dll Tango.PPC.Jobs.dll Tango.PPC.MachineSettings.dll Tango.PPC.Maintenance.dll Tango.PPC.Packages.CefInstaller.dll Tango.PPC.Packages.SamplePostPackage.dll Tango.PPC.Packages.SamplePrePackage.dll Tango.PPC.Storage.dll Tango.PPC.Technician.dll Tango.PPC.UI.exe Tango.PPC.Updater.exe Tango.PPC.WatchDog.exe Tango.Pulse.dll Tango.SQLExaminer.dll Tango.Scripting.dll Tango.Serialization.dll Tango.Settings.dll Tango.SharedUI.dll Tango.TFS.dll Tango.Touch.dll Tango.Transport.dll Tango.Web.dll Tango.WiFi.dll mscoree.dll msvcp140d.dll ucrtbased.dll vcruntime140.dll vcruntime140d.dll"/> <ATTRIBUTE name="CurrentFeature" value="MainFeature"/> </COMPONENT> <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent"> @@ -351,9 +345,9 @@ <ROW File="Tango.PPC.MachineSettings.pdb" Component_="Tango.PPC.MachineSettings.dll" FileName="TANGOP~7.PDB|Tango.PPC.MachineSettings.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.MachineSettings.pdb" SelfReg="false" NextFile="Tango.PPC.Storage.dll"/> <ROW File="Tango.PPC.Maintenance.dll" Component_="Tango.PPC.Maintenance.dll" FileName="TANGO~11.DLL|Tango.PPC.Maintenance.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Maintenance.dll" SelfReg="false" NextFile="Tango.PPC.Maintenance.dll.config"/> <ROW File="Tango.PPC.Maintenance.dll.config" Component_="CommandLine.xml" FileName="TANGO~13.CON|Tango.PPC.Maintenance.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Maintenance.dll.config" SelfReg="false" NextFile="Tango.PPC.Maintenance.pdb"/> - <ROW File="Tango.PPC.Maintenance.pdb" Component_="Tango.PPC.Maintenance.dll" FileName="TANGO~15.PDB|Tango.PPC.Maintenance.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Maintenance.pdb" SelfReg="false" NextFile="protoc1.0M4.jar"/> + <ROW File="Tango.PPC.Maintenance.pdb" Component_="Tango.PPC.Maintenance.dll" FileName="TANGO~15.PDB|Tango.PPC.Maintenance.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.PPC.Maintenance.pdb" SelfReg="false" NextFile="Tango.PPC.Packages.CefInstaller.dll"/> <ROW File="Tango.PPC.Packages.CefInstaller.dll" Component_="Tango.PPC.Packages.CefInstaller.dll" FileName="TANGOP~3.DLL|Tango.PPC.Packages.CefInstaller.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.CefInstaller.dll" SelfReg="false" NextFile="Tango.PPC.Packages.CefInstaller.pdb"/> - <ROW File="Tango.PPC.Packages.CefInstaller.pdb" Component_="Tango.PPC.Packages.CefInstaller.dll" FileName="TANGOP~3.PDB|Tango.PPC.Packages.CefInstaller.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.CefInstaller.pdb" SelfReg="false" NextFile="Tango.Transport.dll_1"/> + <ROW File="Tango.PPC.Packages.CefInstaller.pdb" Component_="Tango.PPC.Packages.CefInstaller.dll" FileName="TANGOP~3.PDB|Tango.PPC.Packages.CefInstaller.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.CefInstaller.pdb" SelfReg="false" NextFile="Tango.PPC.Browser.dll"/> <ROW File="Tango.PPC.Packages.SamplePostPackage.dll" Component_="Tango.PPC.Packages.SamplePostPackage.dll" FileName="TANGOP~1.DLL|Tango.PPC.Packages.SamplePostPackage.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.SamplePostPackage.dll" SelfReg="false" NextFile="Tango.PPC.Packages.SamplePostPackage.pdb"/> <ROW File="Tango.PPC.Packages.SamplePostPackage.pdb" Component_="Tango.PPC.Packages.SamplePostPackage.dll" FileName="TANGOP~1.PDB|Tango.PPC.Packages.SamplePostPackage.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.SamplePostPackage.pdb" SelfReg="false" NextFile="Tango.PPC.Packages.SamplePrePackage.dll"/> <ROW File="Tango.PPC.Packages.SamplePrePackage.dll" Component_="Tango.PPC.Packages.SamplePrePackage.dll" FileName="TANGOP~2.DLL|Tango.PPC.Packages.SamplePrePackage.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.SamplePrePackage.dll" SelfReg="false" NextFile="Tango.PPC.Packages.SamplePrePackage.pdb"/> @@ -395,10 +389,7 @@ <ROW File="Tango.Touch.pdb" Component_="Tango.Touch.dll" FileName="TANGOT~2.PDB|Tango.Touch.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Touch.pdb" SelfReg="false" NextFile="Tango.Transport.dll"/> <ROW File="Tango.Transport.dll" Component_="Tango.Transport.dll" FileName="TANGOT~3.DLL|Tango.Transport.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Transport.dll" SelfReg="false" NextFile="Tango.Transport.dll.config"/> <ROW File="Tango.Transport.dll.config" Component_="CommandLine.xml" FileName="TANGOT~3.CON|Tango.Transport.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Transport.dll.config" SelfReg="false" NextFile="Tango.Transport.pdb"/> - <ROW File="Tango.Transport.dll.config_1" Component_="Tango.Transport.dll.config" FileName="TANGOT~1.CON|Tango.Transport.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.Transport.dll.config" SelfReg="false" NextFile="Tango.Transport.pdb_1"/> - <ROW File="Tango.Transport.dll_1" Component_="Tango.Transport.dll_1" FileName="TANGOT~1.DLL|Tango.Transport.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.Transport.dll" SelfReg="false" NextFile="Tango.Transport.dll.config_1"/> <ROW File="Tango.Transport.pdb" Component_="Tango.Transport.dll" FileName="TANGOT~3.PDB|Tango.Transport.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Transport.pdb" SelfReg="false" NextFile="Tango.Web.dll"/> - <ROW File="Tango.Transport.pdb_1" Component_="Tango.Transport.dll_1" FileName="TANGOT~1.PDB|Tango.Transport.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.Transport.pdb" SelfReg="false" NextFile="Tango.PPC.Browser.dll"/> <ROW File="Tango.Web.dll" Component_="Tango.Web.dll" FileName="TANGOW~1.DLL|Tango.Web.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Web.dll" SelfReg="false" NextFile="Tango.Web.dll.config"/> <ROW File="Tango.Web.dll.config" Component_="CommandLine.xml" FileName="TANGOW~1.CON|Tango.Web.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Web.dll.config" SelfReg="false" NextFile="Tango.Web.pdb"/> <ROW File="Tango.Web.pdb" Component_="Tango.Web.dll" FileName="TANGOW~1.PDB|Tango.Web.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Web.pdb" SelfReg="false" NextFile="Tango.WiFi.dll"/> @@ -408,9 +399,6 @@ <ROW File="UpdateTwineDB.xml" Component_="OverrideData.xml" FileName="UPDATE~2.XML|UpdateTwineDB.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\SQLExaminer\Configurations\UpdateTwineDB.xml" SelfReg="false" NextFile="Interop.MSDASC.dll"/> <ROW File="mscoree.dll" Component_="mscoree.dll" FileName="mscoree.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\mscoree.dll" SelfReg="false" NextFile="msvcp140d.dll"/> <ROW File="msvcp140d.dll" Component_="msvcp140d.dll" FileName="MSVCP1~1.DLL|msvcp140d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\msvcp140d.dll" SelfReg="false" NextFile="Newtonsoft.Json.dll"/> - <ROW File="protoc.exe" Component_="protoc.exe" FileName="protoc.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\ProtoCompilers\protoc.exe" SelfReg="false" NextFile="Tango.PPC.Packages.CefInstaller.dll" DigSign="true"/> - <ROW File="protoc1.0M4.jar" Component_="protoc1.0M4.jar" FileName="PROTOC~1.JAR|protoc-1.0M4.jar" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\ProtoCompilers\protoc-1.0M4.jar" SelfReg="false" NextFile="protocc.exe"/> - <ROW File="protocc.exe" Component_="protocc.exe" FileName="protoc-c.exe" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\ProtoCompilers\protoc-c.exe" SelfReg="false" NextFile="protoc.exe" DigSign="true"/> <ROW File="ucrtbased.dll" Component_="ucrtbased.dll" FileName="UCRTBA~1.DLL|ucrtbased.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\ucrtbased.dll" SelfReg="false" NextFile="vcruntime140.dll"/> <ROW File="vcruntime140.dll" Component_="vcruntime140.dll" FileName="VCRUNT~1.DLL|vcruntime140.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\vcruntime140.dll" SelfReg="false" NextFile="vcruntime140d.dll"/> <ROW File="vcruntime140d.dll" Component_="vcruntime140d.dll" FileName="VCRUNT~2.DLL|vcruntime140d.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\vcruntime140d.dll" SelfReg="false" NextFile="JWT.dll"/> diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml index 53db8c11d..b580bd237 100644 --- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.ActionLogs/Views/MainView.xaml @@ -9,13 +9,11 @@ xmlns:vm="clr-namespace:Tango.MachineStudio.ActionLogs.ViewModels" xmlns:global="clr-namespace:Tango.MachineStudio.ActionLogs" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" - xmlns:localConverters="clr-namespace:Tango.MachineStudio.ActionLogs.Converters" mc:Ignorable="d" d:DesignHeight="1080" d:DesignWidth="1920" Background="Transparent" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> <UserControl.Resources> <sharedConverters:EnumToDescriptionConverter x:Key="EnumToDescriptionConverter" /> - <localConverters:ActionLogTypesToStringConverter x:Key="ActionLogTypesToStringConverter"/> </UserControl.Resources> <Grid IsEnabled="{Binding IsFree}"> <Grid.RowDefinitions> diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml index 3f1164526..020343ba0 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml @@ -368,6 +368,9 @@ <DataTrigger Binding="{Binding ApplicationManager.ConnectedMachine.Status}" Value="{x:Static operations:MachineStatuses.Disconnected}"> <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/machine_off_Anim.gif"></Setter> </DataTrigger> + <DataTrigger Binding="{Binding ApplicationManager.ConnectedMachine.Status}" Value="{x:Static operations:MachineStatuses.PowerUp}"> + <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/getting_ready_Anim.gif"></Setter> + </DataTrigger> <DataTrigger Binding="{Binding ApplicationManager.ConnectedMachine.Status}" Value="{x:Static operations:MachineStatuses.Standby}"> <Setter Property="gif:ImageBehavior.AnimatedSource" Value="/Images/Statuses/standby_Anim.gif"></Setter> </DataTrigger> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppButtons/StartPrintingButton.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppButtons/StartPrintingButton.cs index 001888c92..4d6050639 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppButtons/StartPrintingButton.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/AppButtons/StartPrintingButton.cs @@ -15,12 +15,12 @@ namespace Tango.PPC.Jobs.AppButtons { op.StatusChanged += Op_StatusChanged; - Op_StatusChanged(this, op.Status); + Op_StatusChanged(op, op.Status); } private void Op_StatusChanged(object sender, MachineStatuses status) { - IsEnabled = status == MachineStatuses.ReadyToDye; + IsEnabled = (sender as IMachineOperator).CanPrint; } } } diff --git a/Software/Visual_Studio/PPC/Packages/Tango.PPC.Packages.CefInstaller/Tango.PPC.Packages.CefInstaller.csproj b/Software/Visual_Studio/PPC/Packages/Tango.PPC.Packages.CefInstaller/Tango.PPC.Packages.CefInstaller.csproj index 4cab8bab9..9ade464ea 100644 --- a/Software/Visual_Studio/PPC/Packages/Tango.PPC.Packages.CefInstaller/Tango.PPC.Packages.CefInstaller.csproj +++ b/Software/Visual_Studio/PPC/Packages/Tango.PPC.Packages.CefInstaller/Tango.PPC.Packages.CefInstaller.csproj @@ -60,6 +60,7 @@ <ProjectReference Include="..\..\..\Tango.Transport\Tango.Transport.csproj"> <Project>{74e700b0-1156-4126-be40-ee450d3c3026}</Project> <Name>Tango.Transport</Name> + <Private>False</Private> </ProjectReference> <ProjectReference Include="..\..\Tango.PPC.Common\Tango.PPC.Common.csproj"> <Project>{0be74eee-22cb-4dba-b896-793b9e1a3ac0}</Project> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs index 96fe39a9b..3f11aaa13 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs @@ -264,7 +264,7 @@ namespace Tango.PPC.Common SupportedColorSpaces = new List<ColorSpaces>(); SupportedJobTypes = new List<JobTypes>(); PreviousApplicationVersion = "1.0.0.0"; - SynchronizeJobs = true; + SynchronizeJobs = false; SynchronizeDiagnostics = true; SynchronizationInterval = TimeSpan.FromMinutes(60); FirmwareVersion = "1.0.0.0"; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Controls/MachineStatusControl.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Controls/MachineStatusControl.xaml index d6114576d..3404c032a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Controls/MachineStatusControl.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Controls/MachineStatusControl.xaml @@ -17,6 +17,9 @@ <DataTrigger Binding="{Binding Status}" Value="{x:Static operations:MachineStatuses.Disconnected}"> <Setter Property="Source" Value="/Images/GlobalStatus/machine_off_Anim.gif"></Setter> </DataTrigger> + <DataTrigger Binding="{Binding Status}" Value="{x:Static operations:MachineStatuses.PowerUp}"> + <Setter Property="Source" Value="/Images/GlobalStatus/getting_ready_Anim.gif"></Setter> + </DataTrigger> <DataTrigger Binding="{Binding Status}" Value="{x:Static operations:MachineStatuses.Standby}"> <Setter Property="Source" Value="/Images/GlobalStatus/standby_Anim.gif"></Setter> </DataTrigger> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml index 28f922898..081778434 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml @@ -13,7 +13,7 @@ <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}" Margin="0 30 0 0">Continue getting ready for:</TextBlock> <DockPanel HorizontalAlignment="Center" Margin="0 40 0 0"> <touch:TouchRadioButton IsChecked="{Binding IsSelectedRml}" /> - <touch:TouchComboBox Margin="20 0 0 0" Width="300" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRml}" DisplayMemberPath="Name"></touch:TouchComboBox> + <touch:TouchComboBox Margin="20 0 0 0" Width="300" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRml}" DisplayMemberPath="Name" Title="Select thread type"></touch:TouchComboBox> </DockPanel> <DockPanel HorizontalAlignment="Left" Margin="0 40 0 0"> <touch:TouchRadioButton IsChecked="{Binding IsMinimalTemperature}" /> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml index 98f2e1381..f6fc7704a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml @@ -16,9 +16,9 @@ <Grid Height="283"> <StackPanel Visibility="{Binding IsFinalizing,Converter={StaticResource BooleanToVisibilityInverseConverter}}"> <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource TangoDefaultFontSize}" Margin="40 10 40 0" Foreground="{StaticResource TangoGrayTextBrush}" TextWrapping="Wrap" TextAlignment="Center"> - The machine is ready for loading the thread. Please load the selected thread below and press 'continue'. + The machine is ready for thread loading. Please load the thread as instructed and press 'continue'. </TextBlock> - <touch:TouchComboBox Margin="0 40 0 0" Width="300" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRml}" DisplayMemberPath="Name"></touch:TouchComboBox> + <touch:TouchComboBox Margin="0 40 0 0" Width="300" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRml}" DisplayMemberPath="Name" Title="Select thread type"></touch:TouchComboBox> <touch:TouchButton Command="{Binding ContinueCommand}" Margin="0 50 0 50" Style="{StaticResource TangoHollowButton}" HorizontalAlignment="Center" Padding="60 15" CornerRadius="25">CONTINUE</touch:TouchButton> </StackPanel> <StackPanel Visibility="{Binding IsFinalizing,Converter={StaticResource BooleanToVisibilityConverter}}"> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index 0dbabbf56..bac736d98 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -659,6 +659,7 @@ RD /S /Q "$(TargetDir)pt-BR\" RD /S /Q "$(TargetDir)roslyn\" RD /S /Q "$(TargetDir)ProtoCompilers\" +RD /S /Q "$(TargetDir)Packages\ProtoCompilers\" if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)x86\" if $(ConfigurationName) == Release RD /S /Q "$(TargetDir)x64\" @@ -681,7 +682,7 @@ if $(ConfigurationName) == Debug copy /Y "$(TargetDir)Packages" "$(TargetDir)"</ </PropertyGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml index 5be95ded4..185a5b7ce 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainView.xaml @@ -83,6 +83,9 @@ <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Disconnected}"> <Setter Property="Source" Value="/Images/GlobalStatus/machine-off.png"></Setter> </DataTrigger> + <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.PowerUp}"> + <Setter Property="Source" Value="/Images/GlobalStatus/getting-ready.png"></Setter> + </DataTrigger> <DataTrigger Binding="{Binding MachineProvider.MachineOperator.Status}" Value="{x:Static operations:MachineStatuses.Standby}"> <Setter Property="Source" Value="/Images/GlobalStatus/standby.png"></Setter> </DataTrigger> diff --git a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs index dfc8eb671..fef212316 100644 --- a/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs +++ b/Software/Visual_Studio/Tango.Integration/ExternalBridge/ExternalBridgeService.cs @@ -722,7 +722,7 @@ namespace Tango.Integration.ExternalBridge { throw new InvalidOperationException($"Job execution is disabled while session intent is '{SessionIntent}'."); } - if (MachineOperator.Status != MachineStatuses.ReadyToDye) + if (MachineOperator.IsPrinting) { throw new InvalidOperationException($"Could not execute job while machine operator status is '{MachineOperator.Status}'."); } diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 74c64930b..6d9a987cb 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -335,7 +335,7 @@ namespace Tango.Integration.Operation { get { - return Status == MachineStatuses.ReadyToDye; + return Status == MachineStatuses.ReadyToDye || Status == MachineStatuses.PowerUp || Status == MachineStatuses.Standby; } } @@ -921,8 +921,8 @@ namespace Tango.Integration.Operation switch (MachineStatus.State) { - case MachineState.Initializing: - //Status = MachineStatuses.Service; + case MachineState.PowerUp: + Status = MachineStatuses.PowerUp; break; //case MachineState.PreparingJob: // Status = MachineStatuses.GettingReady; @@ -1270,7 +1270,7 @@ namespace Tango.Integration.Operation ResumingJobEventArgs args = new ResumingJobEventArgs((job) => { - if (Status != MachineStatuses.ReadyToDye) + if (!CanPrint) { throw new InvalidOperationException("Could not print while status = " + Status); } @@ -1971,7 +1971,7 @@ namespace Tango.Integration.Operation { return Task.Factory.StartNew(() => { - if (Status != MachineStatuses.ReadyToDye) + if (!CanPrint) { throw new InvalidOperationException("Could not print while status = " + Status); } @@ -2418,7 +2418,7 @@ namespace Tango.Integration.Operation } } - if (Status != MachineStatuses.ReadyToDye) + if (!CanPrint) { throw new InvalidOperationException("Could not print while status = " + Status); } @@ -3093,7 +3093,7 @@ namespace Tango.Integration.Operation LogManager.Log("Starting firmware upgrade..."); LogManager.Log($"Firmware upgrade flags: {String.Join(", ", FirmwareUpgradeMode.GetFlags<FirmwareUpgradeModes>().Select(x => x.ToString()))}"); - if (Status != MachineStatuses.ReadyToDye) + if (!CanPrint) { throw LogManager.Log(new InvalidOperationException($"Could not perform firmware upgrade while operator status is '{Status}'.")); } @@ -3396,7 +3396,6 @@ namespace Tango.Integration.Operation { Thread.Sleep(2000); var r = SendRequest<AbortPowerDownRequest, AbortPowerDownResponse>(new AbortPowerDownRequest()).Result; - throw new InvalidOperationException(); })); Task.Factory.StartNew(() => diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs index 14774f73a..d9a5d9f3f 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineStatuses.cs @@ -11,6 +11,8 @@ namespace Tango.Integration.Operation { [Description("Disconnected")] Disconnected, + [Description("Getting Ready")] + PowerUp, [Description("Standby")] Standby, [Description("Ready To Dye")] diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs index 9e3725f20..8f421e04d 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs @@ -23,10 +23,10 @@ namespace Tango.PMR.MachineStatus { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChJNYWNoaW5lU3RhdGUucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz", - "KnEKDE1hY2hpbmVTdGF0ZRIQCgxJbml0aWFsaXppbmcQABIJCgVSZWFkeRAB", - "EgkKBVNsZWVwEAISCQoFRXJyb3IQAxIMCghQb3dlck9mZhAEEhAKDFByZXBh", - "cmluZ0pvYhAFEg4KClJ1bm5pbmdKb2IQBkIjCiFjb20udHdpbmUudGFuZ28u", - "cG1yLm1hY2hpbmVzdGF0dXNiBnByb3RvMw==")); + "KmwKDE1hY2hpbmVTdGF0ZRILCgdQb3dlclVwEAASCQoFUmVhZHkQARIJCgVT", + "bGVlcBACEgkKBUVycm9yEAMSDAoIUG93ZXJPZmYQBBIQCgxQcmVwYXJpbmdK", + "b2IQBRIOCgpSdW5uaW5nSm9iEAZCIwohY29tLnR3aW5lLnRhbmdvLnBtci5t", + "YWNoaW5lc3RhdHVzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.MachineStatus.MachineState), }, null)); @@ -36,7 +36,7 @@ namespace Tango.PMR.MachineStatus { } #region Enums public enum MachineState { - [pbr::OriginalName("Initializing")] Initializing = 0, + [pbr::OriginalName("PowerUp")] PowerUp = 0, [pbr::OriginalName("Ready")] Ready = 1, [pbr::OriginalName("Sleep")] Sleep = 2, [pbr::OriginalName("Error")] Error = 3, |
