From af2f6e0aff929df42b7409042a4c3f497e7e5902 Mon Sep 17 00:00:00 2001 From: Ronen Sberlo Date: Tue, 5 Jan 2021 15:43:16 +0200 Subject: in BTSR left dancer tension gets from exit tension insted of winder tension --- .../Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 40748b0ee..697f1bd5d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -1114,12 +1114,6 @@ uint32_t ThreadPrepareState(void *JobDetails) PrepareWaitCount = 0; - status = ThreadPrepare_Tension (HARDWARE_DANCER_TYPE__LeftDancer, windertension); - ReportWithPackageFilter(ThreadFilter,"ThreadPrepare_Tension Winder",__FILE__,HARDWARE_DANCER_TYPE__LeftDancer,PrepareWaitCount,RpWarning,(int)windertension,0); -#ifndef BTSR_NO_PULLER_TFU - status = ThreadPrepare_Tension (HARDWARE_DANCER_TYPE__MiddleDancer, pullertension); - ReportWithPackageFilter(ThreadFilter,"ThreadPrepare_Tension Puller",__FILE__,HARDWARE_DANCER_TYPE__MiddleDancer,PrepareWaitCount,RpWarning,(int)pullertension,0); -#endif #ifdef UFEEDER_BTSR status = ThreadPrepare_Tension (HARDWARE_DANCER_TYPE__LeftDancer, JobTicket->btsrparameters->exittension); ReportWithPackageFilter(ThreadFilter,"ThreadPrepare_Tension Winder",__FILE__,HARDWARE_DANCER_TYPE__LeftDancer,PrepareWaitCount,RpWarning,(int)JobTicket->btsrparameters->exittension,0); @@ -1128,10 +1122,16 @@ uint32_t ThreadPrepareState(void *JobDetails) BTSR_Read_Length(RUFeeder1, HIGHEST); ReportWithPackageFilter(ThreadFilter,"ThreadPrepare_Tension BTSR",__FILE__,application,type,RpError,tension,tension_err); #else + status = ThreadPrepare_Tension (HARDWARE_DANCER_TYPE__LeftDancer, windertension); + ReportWithPackageFilter(ThreadFilter,"ThreadPrepare_Tension Winder",__FILE__,HARDWARE_DANCER_TYPE__LeftDancer,PrepareWaitCount,RpWarning,(int)windertension,0); +#endif +#ifndef BTSR_NO_PULLER_TFU + status = ThreadPrepare_Tension (HARDWARE_DANCER_TYPE__MiddleDancer, pullertension); + ReportWithPackageFilter(ThreadFilter,"ThreadPrepare_Tension Puller",__FILE__,HARDWARE_DANCER_TYPE__MiddleDancer,PrepareWaitCount,RpWarning,(int)pullertension,0); +#endif #ifndef BTSR_NO_FEEDER_TFU status = ThreadPrepare_Tension (HARDWARE_DANCER_TYPE__RightDancer, feedertension); ReportWithPackageFilter(ThreadFilter,"ThreadPrepare_Tension Feeder",__FILE__,HARDWARE_DANCER_TYPE__RightDancer,PrepareWaitCount,RpWarning,(int)feedertension,0); -#endif #endif FirstCalcInJob = true; -- cgit v1.3.1 From a9f6f542b73e33e981d0f9167c5ae37ece7fb924 Mon Sep 17 00:00:00 2001 From: Ronen Sberlo Date: Tue, 5 Jan 2021 16:40:14 +0200 Subject: log print fix --- Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c index 5cf4f5872..44f1ffe78 100644 --- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c +++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/MCU_E2Prom.c @@ -449,8 +449,8 @@ uint32_t BtsrReadParamsFromEeprom(void *Data) BtsrPrameters->spooltension = data; status |= MCU_E2PromReadFloat(EEPROM_BTSR_EXIT_TENSION, &data); BtsrPrameters->exittension = data; - Report("BtsrReadParamsFromEeprom",__FILE__,__LINE__,(int)(BtsrPrameters->feedingtension*1000),RpWarning,(int)(BtsrPrameters->tensionerror*1000),(int)(BtsrPrameters->exittension*1000)); - Report("BtsrReadParamsFromEeprom",__FILE__,__LINE__,(int)(BtsrPrameters->btsrapplicationtype),RpWarning,(int)(BtsrPrameters->btsryarntype),(int)(BtsrPrameters->threadlengthfactor*1000)); + Report("BtsrReadParamsFromEeprom",__FILE__,(int)(BtsrPrameters->feedingtension*1000),(int)(BtsrPrameters->tensionerror*1000),RpWarning,(int)(BtsrPrameters->exittension*1000), 0); + Report("BtsrReadParamsFromEeprom",__FILE__,BtsrPrameters->btsrapplicationtype,BtsrPrameters->btsryarntype,RpWarning,(int)(BtsrPrameters->threadlengthfactor*1000), 0); return status; } -- cgit v1.3.1 From 89362e80c31118e6da63c8d0a0a98e201dbd2a72 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Tue, 5 Jan 2021 17:25:46 +0200 Subject: Assign job first brush stop to catalog type of job.. --- .../PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs index fe831587c..afbce995d 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobsViewVM.cs @@ -537,7 +537,19 @@ namespace Tango.PPC.Jobs.ViewModels if (colorProfile == null) { - job.AddSolidSegment(Settings.DefaultSegmentLength > 0 ? Settings.DefaultSegmentLength : 100); + var segment = job.AddSolidSegment(Settings.DefaultSegmentLength > 0 ? Settings.DefaultSegmentLength : 100); + + try + { + if (vm.SelectedColorSpace == ColorSpaces.Catalog) + { + segment.BrushStops[0].ColorCatalogGuid = catalogVM.SelectedCatalog.Guid; + } + } + catch (Exception ex) + { + LogManager.Log(ex, $"Error setting first segment brush stop color catalog guide."); + } } else { -- cgit v1.3.1 From e8578185b85e3957adc627c414d9ab3cc9bda463 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Tue, 5 Jan 2021 22:44:30 +0200 Subject: smal fixes from 1.5.3.6 --- Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c | 2 +- Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c | 4 ++-- .../Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index e6c596d15..5bce161ae 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -263,7 +263,7 @@ uint32_t CartridgeStateUpdate(CartridgeSlot Slot, int32_t index, CartridgeState CartridgeStatus.has_state = true; CartridgeStatus.state = State; CartridgeStatus.cartridge = &CartData; - if (percentage>1) + //if (percentage>0.1) { CartridgeStatus.has_progresspercentage = true; CartridgeStatus.progresspercentage = percentage; diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index b8f7024fb..374977065 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -274,9 +274,9 @@ bool RdWasteTankOverFlowSensor() return 0; } -int WHS_GetCartridgeFillPercent() +float WHS_GetCartridgeFillPercent() { - return (((wasteLevel - wasteLevelEmpty) * 100) / WASTE_CARTRIDGE_SIZE); + return (100 - (((wasteLevel - wasteLevelEmpty) * 100) / WASTE_CARTRIDGE_SIZE)); } int WHS_GetCartridgeFill() { diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c index 06dac8fdc..a5440db21 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c @@ -784,13 +784,13 @@ uint32_t PowerUpUpdate(MACHINE_STATE_STAGES_ENUM stage) response.state = POWER_UP_STATE__BuiltInTest; response.progresspercentage = 15.0; response.message = "Built In Test"; + response.message = "Built In Test failed"; + Error = ERROR_CODE__POWER_UP_BUILT_IN_FAILED; break; case MACHINE_STATE_BUILT_IN_TEST: response.state = POWER_UP_STATE__BuiltInTest; response.progresspercentage = 15.0; response.message = "Built In Test"; - //response.message = "Built In Test failed"; - //Error = ERROR_CODE__POWER_UP_BUILT_IN_FAILED; break; case MACHINE_STATE_INITIAL_BLOWER_ACTIVATION: response.state = POWER_UP_STATE__InitialBlowerActivation; -- cgit v1.3.1 From 906c89155cc8869a9067fe962f206841f3e89109 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Wed, 6 Jan 2021 01:15:24 +0200 Subject: Reset color catalog item when catalog changed. --- Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) 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/BrushStop.cs b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs index 69b3e7aad..7af38e66f 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/BrushStop.cs @@ -726,6 +726,16 @@ namespace Tango.BL.Entities } } + protected override void OnColorCatalogChanged(ColorCatalog colorcatalog) + { + if (ColorCatalogsItem != null) + { + ColorCatalogsItem = null; + } + + base.OnColorCatalogChanged(colorcatalog); + } + #endregion #region Properties Changed -- cgit v1.3.1 From df75a54ce026aeefabb007c2caee7c4f2c2d6302 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Wed, 6 Jan 2021 01:21:25 +0200 Subject: Environment display hidden on BETA environment. Added environment display to Technician Module => System. --- .../PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml | 14 ++++++++++++++ .../Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml | 3 +++ 2 files changed, 17 insertions(+) diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml index 52abfc239..6ac4cfe80 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Technician/Views/SystemView.xaml @@ -131,6 +131,20 @@ + + + + Environment: + + + + + + + + + + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml index 3e1f50e41..5a1af11e6 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -56,6 +56,9 @@ + + + -- cgit v1.3.1 From 8c27e951f6f11503e328109ab5fc877d94c06648 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 6 Jan 2021 01:19:34 +0200 Subject: PPC_v1.3.4 --- .../PPC Installer-cache/cacheIndex.txt | Bin 52 -> 52 bytes .../Advanced Installer Projects/PPC Installer.aip | 6 +++--- .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs | 2 +- Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- 4 files changed, 5 insertions(+), 5 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 index 9453b5c13..5fe5afe5a 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 7feba98b0..2a56385d0 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 @@ - + - + @@ -505,7 +505,7 @@ - + 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 38cf3efd8..66858dbf6 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.3.3.0")] +[assembly: AssemblyVersion("1.3.4.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