From a3d3b71369e0a29821540b05b694daae0b577b27 Mon Sep 17 00:00:00 2001 From: Roy Date: Tue, 2 May 2023 12:56:54 +0300 Subject: Fixed ability to select environment on setup. --- .../Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs | 6 +- .../PPC/Tango.PPC.UI/Views/MainEurekaView.xaml | 36 +-- .../Controls/TouchPanelEurekaNoKeyboard.cs | 25 ++ .../Controls/TouchPanelEurekaNoKeyboard.xaml | 330 +++++++++++++++++++++ .../Visual_Studio/Tango.Touch/Tango.Touch.csproj | 7 +- .../Visual_Studio/Tango.Touch/Themes/Generic.xaml | 1 + 6 files changed, 380 insertions(+), 25 deletions(-) create mode 100644 Software/Visual_Studio/Tango.Touch/Controls/TouchPanelEurekaNoKeyboard.cs create mode 100644 Software/Visual_Studio/Tango.Touch/Controls/TouchPanelEurekaNoKeyboard.xaml (limited to 'Software') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs index fa78430bd..fd93b6108 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs @@ -432,7 +432,7 @@ namespace Tango.PPC.Jobs.ViewModels { await Task.Delay(200); } - var selectedRmlGuid = Settings.DefaultRmlGuid; + var selectedRmlGuid = Settings.DefaultRmlGuid ?? _rmls.First().Guid; Job job = new Job(); job.LastUpdated = DateTime.UtcNow; job.JobSource = JobSource.Local; @@ -715,8 +715,8 @@ namespace Tango.PPC.Jobs.ViewModels using (ObservablesContext db = ObservablesContext.CreateDefault()) { _catalogs = await new CatalogsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).BuildAsync(); - //_rmls = await new RmlsCollectionBuilder(db).SetAll().WithSpools().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync(); - _rmls = (await new RmlsCollectionBuilder(db).SetAll().WithSpools().BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection(); + _rmls = (await new RmlsCollectionBuilder(db).SetAll().WithSpools().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection(); + //_rmls = (await new RmlsCollectionBuilder(db).SetAll().WithSpools().BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection(); _spoolTypes = db.SpoolTypes.ToObservableCollection(); } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainEurekaView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainEurekaView.xaml index 9bd5df3e8..1646cf6dd 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainEurekaView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MainEurekaView.xaml @@ -29,29 +29,23 @@ + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanelEurekaNoKeyboard.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanelEurekaNoKeyboard.cs new file mode 100644 index 000000000..75dcba67f --- /dev/null +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanelEurekaNoKeyboard.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace Tango.Touch.Controls +{ + public class TouchPanelEurekaNoKeyboard : TouchPanelEureka + { + static TouchPanelEurekaNoKeyboard() + { + DefaultStyleKeyProperty.OverrideMetadata(typeof(TouchPanelEurekaNoKeyboard), new FrameworkPropertyMetadata(typeof(TouchPanelEurekaNoKeyboard))); + } + } +} diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchPanelEurekaNoKeyboard.xaml b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanelEurekaNoKeyboard.xaml new file mode 100644 index 000000000..e25e96e60 --- /dev/null +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchPanelEurekaNoKeyboard.xaml @@ -0,0 +1,330 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CANCEL + OK + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CANCEL + OK + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj index 1096ec112..e9145b27c 100644 --- a/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj +++ b/Software/Visual_Studio/Tango.Touch/Tango.Touch.csproj @@ -72,6 +72,7 @@ + @@ -149,6 +150,10 @@ Designer MSBuild:Compile + + MSBuild:Compile + Designer + Designer MSBuild:Compile @@ -502,7 +507,7 @@ - + \ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml b/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml index 8b49ccc6b..0f9e77059 100644 --- a/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml +++ b/Software/Visual_Studio/Tango.Touch/Themes/Generic.xaml @@ -67,6 +67,7 @@ + -- cgit v1.3.1 From bcec28b0d2d80d26513b0415519f26d83f25c51c Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Tue, 2 May 2023 13:07:53 +0300 Subject: Released versions --- .../Eureka Installer.aip | 7 ++-- .../Advanced Installer Projects/FSE Installer.aip | 46 +++++++-------------- .../TwineRSM Installer.aip | 6 +-- .../Help/proc-doc.chm | Bin 335559 -> 368013 bytes .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- .../Properties/PublishProfiles/Staging.pubxml | 44 ++++++++++++++++++++ 6 files changed, 67 insertions(+), 38 deletions(-) create mode 100644 Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Staging.pubxml (limited to 'Software') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip index e67457871..0f5d18e4d 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Eureka Installer.aip @@ -15,10 +15,10 @@ - + - + @@ -439,6 +439,7 @@ + @@ -447,7 +448,7 @@ - + diff --git a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip index dcaf734e4..5442fc1bc 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/FSE Installer.aip @@ -29,10 +29,10 @@ - + - + @@ -515,11 +515,13 @@ + + + + - - @@ -1181,28 +1183,10 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + @@ -1217,7 +1201,7 @@ - + @@ -1312,8 +1296,6 @@ - - @@ -1840,8 +1822,10 @@ - - + + + + diff --git a/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip index c53d5187e..ca88f458d 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/TwineRSM Installer.aip @@ -25,10 +25,10 @@ - + - + @@ -1138,7 +1138,7 @@ - + diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm index 8a46edb90..62f67be57 100644 Binary files a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm and b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures.Documentation/Help/proc-doc.chm differ 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 56e42453f..1a7c11764 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("2.0.0.0")] +[assembly: AssemblyVersion("2.0.1.0")] diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Staging.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Staging.pubxml new file mode 100644 index 000000000..3ea713203 --- /dev/null +++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Staging.pubxml @@ -0,0 +1,44 @@ + + + + + MSDeploy + /subscriptions/10c8aa60-3b15-4e0d-b412-6aeef90e5e91/resourceGroups/Tango/providers/Microsoft.Web/sites/machineservice/slots/MachineService-TEST + Tango + AzureWebSite + Release + Any CPU + http://machineservice-machineservice-stage.azurewebsites.net + True + False + machineservice-machineservice-stage.scm.azurewebsites.net:443 + machineservice__MachineService-STAGE + + True + False + WMSVC + True + $machineservice__MachineService-STAGE + <_SavePWD>True + <_DestinationType>AzureWebSite + + + + + + + + + + + + + + + + <_ConnectionStringsToInsert Include="Tango.BL.ObservablesContext" /> + + \ No newline at end of file -- cgit v1.3.1 From a42e9713125bc9675b2978031244918c11c6e956 Mon Sep 17 00:00:00 2001 From: Roy Date: Tue, 2 May 2023 17:24:55 +0300 Subject: Eureka Added more baud rates + some bug fixes. --- .../Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs | 4 ++-- .../ViewModels/MainViewVM.cs | 27 ++++------------------ .../Connection/DefaultMachineProvider.cs | 10 ++++---- .../PPC/Tango.PPC.Common/PPCSettings.cs | 12 ++++++++++ .../PPC/Tango.PPC.Common/Tango.PPC.Common.csproj | 19 +++++++++++++++ .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- .../Visual_Studio/Tango.BL/Entities/Machine.cs | 20 ++++++++++++++++ .../Tango.Transport/Adapters/UsbSerialBaudRates.cs | 6 +++++ Software/Visual_Studio/Tango.sln | 20 ++++++++-------- 9 files changed, 79 insertions(+), 41 deletions(-) (limited to 'Software') diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs index fd93b6108..0e4ec8fa4 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs @@ -442,7 +442,7 @@ namespace Tango.PPC.Jobs.ViewModels job.CreationDate = DateTime.UtcNow; job.JobStatus = JobStatuses.Draft; - var selectedSpoolTypeGuid = Settings.SpoolTypeGuid; + var selectedSpoolTypeGuid = Settings.SpoolTypeGuid ?? _spoolTypes.First().Guid; if (BuildProvider.IsEureka) { @@ -717,7 +717,7 @@ namespace Tango.PPC.Jobs.ViewModels _catalogs = await new CatalogsCollectionBuilder(db).SetAll().ForSite(MachineProvider.Machine.SiteGuid).BuildAsync(); _rmls = (await new RmlsCollectionBuilder(db).SetAll().WithSpools().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection(); //_rmls = (await new RmlsCollectionBuilder(db).SetAll().WithSpools().BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection(); - _spoolTypes = db.SpoolTypes.ToObservableCollection(); + _spoolTypes = await MachineProvider.Machine.GetSiteSpoolTypes(db); } MachineDataSynchronizer.SynchronizationEnded += MachineDataSynchronizer_SynchronizationEnded; diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs index 36d1824a0..6787136be 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs @@ -323,7 +323,7 @@ namespace Tango.PPC.MachineSettings.ViewModels { Settings.SupportedJobTypes = SelectedJobTypes.SynchedSource.ToList(); Settings.SupportedColorSpaces = SelectedColorSpaces.SynchedSource.ToList(); - + Machine.MapPropertiesTo(MachineProvider.Machine, MappingFlags.NoReferenceTypes); Settings.EnableHotSpot = EnableHotSpot; @@ -502,26 +502,7 @@ namespace Tango.PPC.MachineSettings.ViewModels using (ObservablesContext db = ObservablesContext.CreateDefault()) { Rmls = (await new RmlsCollectionBuilder(db).SetAll().ForHeadType(MachineProvider.Machine.MachineHeadType).ForSite(MachineProvider.Machine.SiteGuid).BuildAsync()).OrderBy(x => x.FinalName).ToObservableCollection(); - - try - { - SpoolTypes = (await db.SitesSpoolTypes.Where(x => x.SiteGuid == MachineProvider.Machine.SiteGuid).Include(x => x.SpoolType).Select(x => x.SpoolType).ToListAsync()).OrderBy(x => x.LastUpdated).ToObservableCollection(); - - if (SpoolTypes.Count == 0) - { - SpoolTypes = new ObservableCollection(); - var standardSpool = await db.SpoolTypes.FirstOrDefaultAsync(x => x.Code == (int)BL.Enumerations.SpoolTypes.StandardSpool); - if (standardSpool != null) - { - SpoolTypes.Add(standardSpool); - } - } - - } - catch (Exception ex) - { - LogManager.Log(ex, "Error getting machine site spool types."); - } + SpoolTypes = await MachineProvider.Machine.GetSiteSpoolTypes(db); } } @@ -555,8 +536,8 @@ namespace Tango.PPC.MachineSettings.ViewModels SelectedJobTypes = new SelectedObjectCollection(Enum.GetValues(typeof(JobTypes)).Cast().ToObservableCollection(), Settings.SupportedJobTypes.ToObservableCollection()); SelectedColorSpaces = new SelectedObjectCollection(Enum.GetValues(typeof(ColorSpaces)).Cast().Where(x => x.IsUserSpace()).ToObservableCollection(), Settings.SupportedColorSpaces.ToObservableCollection()); - TabsColorSpaces = new ObservableCollection(Enum.GetValues(typeof(ColorSpaces)).Cast().Where(x => x!= ColorSpaces.Volume /*&& x!= ColorSpaces.HSB*/).ToObservableCollection()); - DefaultTabColorSpace = Settings.DefaultTabColorSpace == null? ColorSpaces.CMYK : TabsColorSpaces.SingleOrDefault(x => x == Settings.DefaultTabColorSpace); + TabsColorSpaces = new ObservableCollection(Enum.GetValues(typeof(ColorSpaces)).Cast().Where(x => x != ColorSpaces.Volume /*&& x!= ColorSpaces.HSB*/).ToObservableCollection()); + DefaultTabColorSpace = Settings.DefaultTabColorSpace == null ? ColorSpaces.CMYK : TabsColorSpaces.SingleOrDefault(x => x == Settings.DefaultTabColorSpace); DefaultRML = Rmls.SingleOrDefault(x => x.Guid == Settings.DefaultRmlGuid); SelectedSpoolType = SpoolTypes.SingleOrDefault(x => x.Guid == Settings.SpoolTypeGuid); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs index bef18e15b..a5fb92959 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs @@ -186,7 +186,7 @@ namespace Tango.PPC.Common.Connection TimeSpan timeout = TimeSpan.FromSeconds(SettingsManager.Default.GetOrCreate().MachineScanningTimeoutSeconds); LogManager.Log("Scanning for machine on available serial ports...", LogCategory.Info); - Transport.Discovery.UsbCommunicationScanner scanner = new Transport.Discovery.UsbCommunicationScanner(UsbSerialBaudRates.BR_115200); + Transport.Discovery.UsbCommunicationScanner scanner = new Transport.Discovery.UsbCommunicationScanner(settings.EmbeddedBaudRate); var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, settings.EmbeddedDeviceHint, timeout); LogManager.Log("Machine discovered on port: " + response.Adapter.Address, LogCategory.Info); @@ -224,7 +224,7 @@ namespace Tango.PPC.Common.Connection //Perform a pre-test to not overload the log file when machine is off for a long time. using (SerialPort preCheckSerialPort = new SerialPort(settings.EmbeddedComPort)) { - preCheckSerialPort.BaudRate = UsbSerialBaudRates.BR_115200.ToInt32(); + preCheckSerialPort.BaudRate = settings.EmbeddedBaudRate.ToInt32(); preCheckSerialPort.Open(); preCheckSerialPort.Close(); fileLoggingDisabled = false; @@ -233,7 +233,7 @@ namespace Tango.PPC.Common.Connection LogManager.Log($"Connecting to machine on {settings.EmbeddedComPort}...", LogCategory.Info); - UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, UsbSerialBaudRates.BR_115200); + UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, settings.EmbeddedBaudRate); MachineOperator.Adapter = adapter; MachineOperator.JobHandlingMode = JobHandlerModes.SettingUp; try @@ -393,7 +393,7 @@ namespace Tango.PPC.Common.Connection onProgress?.Invoke("Scanning for the machine..."); LogManager.Default.Log("Scanning for machine on available serial ports..."); - Transport.Discovery.UsbCommunicationScanner scanner = new Transport.Discovery.UsbCommunicationScanner(UsbSerialBaudRates.BR_115200); + Transport.Discovery.UsbCommunicationScanner scanner = new Transport.Discovery.UsbCommunicationScanner(settings.EmbeddedBaudRate); var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, timeout); onProgress?.Invoke("Machine discovered on port: " + response.Adapter.Address); @@ -413,7 +413,7 @@ namespace Tango.PPC.Common.Connection LogManager.Default.Log($"Connecting to machine on {settings.EmbeddedComPort}..."); onProgress?.Invoke($"Connecting to machine on {settings.EmbeddedComPort}..."); - UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, UsbSerialBaudRates.BR_115200); + UsbTransportAdapter adapter = new UsbTransportAdapter(settings.EmbeddedComPort, settings.EmbeddedBaudRate); machineOperator.Adapter = adapter; machineOperator.JobHandlingMode = JobHandlerModes.SettingUp; await machineOperator.Connect(); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs index c45aad51e..8a5c04588 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs @@ -49,6 +49,11 @@ namespace Tango.PPC.Common /// public String EmbeddedComPort { get; set; } + /// + /// Gets or sets the embedded USB serial baud rate when using USB and Eureka. + /// + public UsbSerialBaudRates EmbeddedBaudRate { get; set; } + /// /// Gets or sets the embedded device scanning hint. /// @@ -376,6 +381,13 @@ namespace Tango.PPC.Common GradientGenerationResolution = 40; MachineScanningTimeoutSeconds = 20; EmbeddedComPort = "COM10"; + +#if Eureka + EmbeddedBaudRate = UsbSerialBaudRates.BR_1000000; +#else + EmbeddedBaudRate = UsbSerialBaudRates.BR_115200; +#endif + EmbeddedDeviceHint = "Tango USB Serial Port"; ExternalBridgePassword = "Aa123456"; HotSpotPassword = "Aa123456"; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj index fa8aadf9a..e598c6fe4 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj @@ -47,6 +47,25 @@ prompt 4 + + AnyCPU + true + full + false + ..\..\Build\PPC\Eureka_Debug\ + TRACE;DEBUG;Eureka + prompt + 4 + + + AnyCPU + pdbonly + true + ..\..\Build\PPC\Eureka\ + TRACE;Eureka + prompt + 4 + ..\..\packages\CommandLineParser.1.9.71\lib\net45\CommandLine.dll diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 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. --> - + diff --git a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs index 4e998bdc9..01e17cfde 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/Machine.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/Machine.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.ComponentModel.DataAnnotations.Schema; +using System.Data.Entity; using System.Linq; using System.Reflection; using System.Text; @@ -176,5 +177,24 @@ namespace Tango.BL.Entities { } + + public async Task> GetSiteSpoolTypes(ObservablesContext db) + { + ObservableCollection spoolTypes = new ObservableCollection(); + + spoolTypes = (await db.SitesSpoolTypes.Where(x => x.SiteGuid == SiteGuid).Include(x => x.SpoolType).Select(x => x.SpoolType).ToListAsync()).OrderBy(x => x.LastUpdated).ToObservableCollection(); + + if (spoolTypes.Count == 0) + { + spoolTypes = new ObservableCollection(); + var standardSpool = await db.SpoolTypes.FirstOrDefaultAsync(x => x.Code == (int)BL.Enumerations.SpoolTypes.StandardSpool); + if (standardSpool != null) + { + spoolTypes.Add(standardSpool); + } + } + + return spoolTypes; + } } } diff --git a/Software/Visual_Studio/Tango.Transport/Adapters/UsbSerialBaudRates.cs b/Software/Visual_Studio/Tango.Transport/Adapters/UsbSerialBaudRates.cs index 23ae054d4..c92d0f13a 100644 --- a/Software/Visual_Studio/Tango.Transport/Adapters/UsbSerialBaudRates.cs +++ b/Software/Visual_Studio/Tango.Transport/Adapters/UsbSerialBaudRates.cs @@ -24,7 +24,13 @@ namespace Tango.Transport.Adapters [Description("1000000")] BR_1000000 = 1000000, + [Description("2500000")] + BR_2500000 = 2500000, + [Description("4000000")] BR_4000000 = 4000000, + + [Description("5000000")] + BR_5000000 = 5000000, } } diff --git a/Software/Visual_Studio/Tango.sln b/Software/Visual_Studio/Tango.sln index ef04ccc12..674867a7c 100644 --- a/Software/Visual_Studio/Tango.sln +++ b/Software/Visual_Studio/Tango.sln @@ -7175,8 +7175,8 @@ Global {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Debug|x64.Build.0 = Debug|Any CPU {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Debug|x86.ActiveCfg = Debug|Any CPU {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Debug|x86.Build.0 = Debug|Any CPU - {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka_Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka_Debug|Any CPU.Build.0 = Debug|Any CPU + {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka_Debug|Any CPU.ActiveCfg = Eureka_Debug|Any CPU + {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka_Debug|Any CPU.Build.0 = Eureka_Debug|Any CPU {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka_Debug|ARM.ActiveCfg = Debug|Any CPU {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka_Debug|ARM.Build.0 = Debug|Any CPU {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka_Debug|ARM64.ActiveCfg = Debug|Any CPU @@ -7185,8 +7185,8 @@ Global {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka_Debug|x64.Build.0 = Debug|Any CPU {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka_Debug|x86.ActiveCfg = Debug|Any CPU {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka_Debug|x86.Build.0 = Debug|Any CPU - {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka|Any CPU.ActiveCfg = Release|Any CPU - {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka|Any CPU.Build.0 = Release|Any CPU + {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka|Any CPU.ActiveCfg = Eureka|Any CPU + {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka|Any CPU.Build.0 = Eureka|Any CPU {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka|ARM.ActiveCfg = Release|Any CPU {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka|ARM.Build.0 = Release|Any CPU {0BE74EEE-22CB-4DBA-B896-793B9E1A3AC0}.Eureka|ARM64.ActiveCfg = Release|Any CPU @@ -21665,12 +21665,12 @@ Global {7A30B35F-94DC-4A9C-B9D2-CB5CAA735788} = {4EE6DBA1-71BC-49E2-8DC7-266487E61050} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} - BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear - BuildVersion_UpdateAssemblyVersion = True - BuildVersion_UpdateFileVersion = False - BuildVersion_StartDate = 2000/1/1 - BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs BuildVersion_UseGlobalSettings = False + BuildVersion_AssemblyInfoFilename = Properties\AssemblyInfo.cs + BuildVersion_StartDate = 2000/1/1 + BuildVersion_UpdateFileVersion = False + BuildVersion_UpdateAssemblyVersion = True + BuildVersion_BuildVersioningStyle = None.None.Increment.DeltaBaseYearDayOfYear + SolutionGuid = {7986F7F4-A86A-4994-B1B6-0988D7F057B6} EndGlobalSection EndGlobal -- cgit v1.3.1