From 54004083559a12f618cd1ff0ed7388929005b399 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 10 Jun 2020 19:21:36 +0200 Subject: [PATCH 1/3] start new versione (to check warmers config) --- Thermo.Active/Properties/AssemblyInfo.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Thermo.Active/Properties/AssemblyInfo.cs b/Thermo.Active/Properties/AssemblyInfo.cs index 90deca67..ecdca942 100644 --- a/Thermo.Active/Properties/AssemblyInfo.cs +++ b/Thermo.Active/Properties/AssemblyInfo.cs @@ -31,4 +31,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("0.5.4")] +[assembly: AssemblyVersion("0.6.0")] From f28cbfe2ec6d018a9078065aa27dad9186efa380 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 11 Jun 2020 11:10:15 +0200 Subject: [PATCH 2/3] fix board config: 16 channels --- Thermo.Active.Config/ServerConfigController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Thermo.Active.Config/ServerConfigController.cs b/Thermo.Active.Config/ServerConfigController.cs index 81d6bd39..f3172c2b 100644 --- a/Thermo.Active.Config/ServerConfigController.cs +++ b/Thermo.Active.Config/ServerConfigController.cs @@ -694,8 +694,8 @@ namespace Thermo.Active.Config // ciclo sulle resistenze foreach (var resistenza in riflettore.Resistenze) { - // cerco la scheda dato il canale... - currIdBoard = (resistenza.Canale - 1) / 8; + // cerco la scheda dato il canale... 16 ch x ogni scheda + currIdBoard = (resistenza.Canale - 1) / 16; // cerco se ho già la scheda var boardFound = RiskBoardConfig.Find(item => item.IdBoard == currIdBoard); if (boardFound == null) From 3a17e13224cf2dd6d48deed58dc9713bbb02c10d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 11 Jun 2020 11:10:39 +0200 Subject: [PATCH 3/3] fix div0 for VUMin and warmers config setup tested --- Thermo.Active.NC/NcAdapter.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index d9ed323a..dbd08eca 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -1984,11 +1984,7 @@ namespace Thermo.Active.NC // scrivo l'abilitazione dei canali... foreach (var item in RiskBoardConfig) { - // FIXME TODO hard limit a 64... da chiarire - if (item.IdBoard < 64) - { - newData.Add(item.IdBoard, item.NumChannels > 0 ? 1 : 0); - } + newData.Add(item.IdBoard, item.NumChannels > 0 ? 1 : 0); } cmsError = numericalControl.PLC_WWarmerConfBoardEnabl(newData); if (cmsError.IsError()) @@ -2005,10 +2001,15 @@ namespace Thermo.Active.NC return cmsError; // recupero parametro VUMin... - ushort VUMin = 1; + ushort VUMin = 1; cmsError = numericalControl.PLC_RWarmerConfVUMin(ref VUMin); if (cmsError.IsError()) return cmsError; + // check div0! + if (VUMin == 0) + { + VUMin = 1; + } // processo corrente minima! var newFloatTData = new Dictionary();