From 1208554e06da8aec1b074932df488769572ffcfb Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 19 Dec 2019 18:01:01 +0200 Subject: Implemented auto thread loading. Implemented advanced settings for technician. Implemented thread loading on emulator. Removed PowerUpSelectedRML from settings. Now using LoadedRml settings for ThreadLoading and PowerUp. --- .../Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml | 47 ++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml new file mode 100644 index 000000000..98f2e1381 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml @@ -0,0 +1,47 @@ + + + + + + Thread Loading + + + + + The machine is ready for loading the thread. Please load the selected thread below and press 'continue'. + + + CONTINUE + + + + The machine is now loading the thread. please wait... + + + + + + + + + + + + + + -- cgit v1.3.1 From c6ca09b04ceb4024311b86aab409ca658fbee37e Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 22 Dec 2019 14:51:17 +0200 Subject: Improved CanPrint and IsPrinting detection on PPC. Added support for PowerUp and StandBy states. Made sync jobs false by default. --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../PMR/Messages/MachineStatus/MachineState.proto | 2 +- .../PPC Installer-cache/cacheIndex.txt | Bin 52 -> 52 bytes .../Advanced Installer Projects/PPC Installer.aip | 18 +++--------------- .../Views/MainView.xaml | 2 -- .../Tango.MachineStudio.UI/Views/MainView.xaml | 3 +++ .../AppButtons/StartPrintingButton.cs | 4 ++-- .../Tango.PPC.Packages.CefInstaller.csproj | 1 + .../PPC/Tango.PPC.Common/PPCSettings.cs | 2 +- .../Controls/MachineStatusControl.xaml | 3 +++ .../PPC/Tango.PPC.UI/Dialogs/PowerUpView.xaml | 2 +- .../Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml | 4 ++-- .../PPC/Tango.PPC.UI/Tango.PPC.UI.csproj | 3 ++- .../PPC/Tango.PPC.UI/Views/MainView.xaml | 3 +++ .../ExternalBridge/ExternalBridgeService.cs | 2 +- .../Tango.Integration/Operation/MachineOperator.cs | 15 +++++++-------- .../Tango.Integration/Operation/MachineStatuses.cs | 2 ++ .../Tango.PMR/MachineStatus/MachineState.cs | 10 +++++----- 21 files changed, 37 insertions(+), 39 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingView.xaml') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index 5badddf75..850314148 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index 970fecb23..8d5be3eab 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 502353550..3c21d39f4 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index be848ac71..760a829e1 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/PMR/Messages/MachineStatus/MachineState.proto b/Software/PMR/Messages/MachineStatus/MachineState.proto index 0e84b8aaf..14d71ee48 100644 --- a/Software/PMR/Messages/MachineStatus/MachineState.proto +++ b/Software/PMR/Messages/MachineStatus/MachineState.proto @@ -5,7 +5,7 @@ option java_package = "com.twine.tango.pmr.machinestatus"; enum MachineState { - Initializing = 0; + PowerUp = 0; Ready = 1; Sleep = 2; Error = 3; 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 ee0744fc9..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 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 @@ - @@ -178,21 +177,16 @@ - - - - - - + @@ -351,9 +345,9 @@ - + - + @@ -395,10 +389,7 @@ - - - @@ -408,9 +399,6 @@ - - - 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}"> - 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 @@ + + + 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 @@ {74e700b0-1156-4126-be40-ee450d3c3026} Tango.Transport + False {0be74eee-22cb-4dba-b896-793b9e1a3ac0} 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(); SupportedJobTypes = new List(); 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 @@ + + + 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 @@ Continue getting ready for: - + 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 @@ - 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'. - + CONTINUE 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)" - + \ 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 @@ + + + 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().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(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, -- cgit v1.3.1