From 0ddf0fb2892c33473aa7d9efeecbbdb6c5684719 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Tue, 27 Jun 2017 14:21:09 +0200 Subject: [PATCH] fix gestione speed override x OSAI --- MTC_Adapter/MTC_Adapter/AdapterGeneric.cs | 21 ++++++++++++++++++++- MTC_Adapter/MTC_Adapter/App.config | 2 ++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs index a5b5b8c..3f090a6 100644 --- a/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs +++ b/MTC_Adapter/MTC_Adapter/AdapterGeneric.cs @@ -2153,6 +2153,25 @@ namespace MTC_Adapter vettPath[currIdx].mPathSpindleOver_03.Value = dataVector[5] / 100; vettPath[currIdx].mPathSpindleOver_04.Value = dataVector[6] / 100; + // SE il processo è quello corrente... + string processo = string.Format("P{0}", currIdx + 1); + if (mProcSel.Value.ToString() == processo) + { + // se da conf richeisto salvo override globale come max tra i 4 letti... + if (utils.CRB("getMaxSpOver")) + { + int maxSpeedOver = 0; + maxSpeedOver = ((dataVector[3] / 100) > maxSpeedOver) ? dataVector[3] / 100 : maxSpeedOver; + maxSpeedOver = ((dataVector[4] / 100) > maxSpeedOver) ? dataVector[4] / 100 : maxSpeedOver; + maxSpeedOver = ((dataVector[5] / 100) > maxSpeedOver) ? dataVector[5] / 100 : maxSpeedOver; + maxSpeedOver = ((dataVector[6] / 100) > maxSpeedOver) ? dataVector[6] / 100 : maxSpeedOver; + + // includo lettura override spindle... è la massima tra quelle che ho letto (dai path) + SpeedRateOver = maxSpeedOver; + } + } + + // salvo stringa! sb.AppendLine(string.Format("P{0} - Override % Jog | Feed | Rapid: {1} | {2} | {3}", currIdx + 1, dataVector[0] / 100, dataVector[1] / 100, dataVector[2] / 100)); sb.AppendLine(string.Format("P{0} - Override % Spindle 1 | 2 | 3 | 4: {1} | {2} | {3} | {4}", currIdx + 1, dataVector[3] / 100, dataVector[4] / 100, dataVector[5] / 100, dataVector[6] / 100)); @@ -2482,7 +2501,7 @@ namespace MTC_Adapter vettUnOp[i].mUnOpLoad.Value = UnOpLoad; vettUnOp[i].mUnOpSpeedOverr.Value = SpeedRateOver; - sb.AppendLine(string.Format("UnOp_{0}: SpeedRate {1} rpm | Load {2} | SpOv: {3}", i + 1, SpeedRate, UnOpLoad, SpeedRateOver)); + sb.AppendLine(string.Format("UnOp_{0}: SpeedRate {1} rpm | Load {2} | SpOv: {3}", i + 1, locSpeedRate, UnOpLoad, SpeedRateOver)); } diff --git a/MTC_Adapter/MTC_Adapter/App.config b/MTC_Adapter/MTC_Adapter/App.config index caae0f3..c37662c 100644 --- a/MTC_Adapter/MTC_Adapter/App.config +++ b/MTC_Adapter/MTC_Adapter/App.config @@ -93,6 +93,8 @@ + +