Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix recipe load / save with warmers

Browse Source
This commit is contained in:
Samuele Locatelli
2020-06-11 13:17:33 +02:00
parent c7b96e4d78
commit 1d77adc01c
4 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Thermo.Active.Config/Config/Recipes/template.json
+1 -1
View File
@@ -311,7 +311,7 @@
"ChannelSetpoints": {
"7": 7,
"44": 44,
"81": 84.0,
"81": 84,
"118": 51,
"155": 52,
"192": 53,
Thermo.Active.Config/LiveData.cs
+1 -1
View File
@@ -22,7 +22,7 @@ namespace Thermo.Active.Config
/// <summary>
/// Dictionary of all channels and relative setpoints
/// </summary>
public Dictionary<int, double> ChannelSetpoints;
public Dictionary<int, int> ChannelSetpoints;
}
}
Thermo.Active.NC/NcAdapter.cs
-2
View File
@@ -1755,8 +1755,6 @@ namespace Thermo.Active.NC
currRecipe = new Dictionary<string, DTORecipeParam>();
DTORecipeParam currParam = new DTORecipeParam();
RPRange currRange = new RPRange();
RPStatus currStatus = new RPStatus();
// gestione errore
cmsError = ReadRecipeData(false, true, out currRecipe);
Thermo.Active/Controllers/WebApi/RecipeController.cs
+11 -22
View File
@@ -321,7 +321,7 @@ namespace Thermo.Active.Controllers.WebApi
RecipeLiveData.RecipeParameters = currParams;
// carico i dati dei riscaldi...
var currChSet = new Dictionary<int, double>();
var currChSet = new Dictionary<int, int>();
foreach (var item in currWarmers)
{
currChSet.Add(item.Key, item.Value.SetpointRecipe);
@@ -388,32 +388,21 @@ namespace Thermo.Active.Controllers.WebApi
// write to PLC
checkError = ncAdapter.WriteRecipeParams(updtRecipe);
// FIXME TODO warmers to be completed!!!
#if false
// reading warmers data...
cmsError = ncAdapter.ReadWarmers(out Dictionary<int, DTOWarmers> prevWarmers);
if (cmsError.IsError())
return BadRequest(cmsError.localizationKey);
// save warmers to PLC
// process ch load setup...
Dictionary<int, int> newRisk = new Dictionary<int, int>();
foreach (var item in RecipeLiveData.ChannelSetpoints)
{
//if (prevRecipe.ContainsKey(item.Key))
//{
// // aggiorno il valore HMI nel parametro
// var currParam = prevRecipe[item.Key];
// currParam.SetpointHMI = item.Value;
// // salvo (1 parametro, potrei fare N...)
// updtRecipe.Add(item.Key, currParam);
//}
//else
//{
// return NotFound();
//}
newRisk.Add(item.Key, item.Value);
}
// write to PLC
ncAdapter.WriteRecipeWarmers(updtRecipe);
#endif
checkError = ncAdapter.WriteRecipeWarmChSetpHMI(newRisk);
// enable recipe! scrivo sul PLC il comando conferma!
CmsError cmsError = ncAdapter.ConfirmRecipeData(true);
if (cmsError.IsError())
return checkError;
}
return checkError;
}