Merge branch 'feature/add/risk' into develop

This commit is contained in:
Samuele Locatelli
2020-06-11 11:11:14 +02:00
3 changed files with 10 additions and 9 deletions
@@ -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)
+7 -6
View File
@@ -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<int, double>();
+1 -1
View File
@@ -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")]