diff --git a/Thermo.Active.Config/Config/Recipes/template.json b/Thermo.Active.Config/Config/Recipes/template.json
index 2a884d8a..cb38ff29 100644
--- a/Thermo.Active.Config/Config/Recipes/template.json
+++ b/Thermo.Active.Config/Config/Recipes/template.json
@@ -311,7 +311,7 @@
"ChannelSetpoints": {
"7": 7,
"44": 44,
- "81": 84.0,
+ "81": 84,
"118": 51,
"155": 52,
"192": 53,
diff --git a/Thermo.Active.Config/LiveData.cs b/Thermo.Active.Config/LiveData.cs
index e729d7d3..e129a251 100644
--- a/Thermo.Active.Config/LiveData.cs
+++ b/Thermo.Active.Config/LiveData.cs
@@ -22,7 +22,7 @@ namespace Thermo.Active.Config
///
/// Dictionary of all channels and relative setpoints
///
- public Dictionary ChannelSetpoints;
+ public Dictionary ChannelSetpoints;
}
}
diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs
index dbd08eca..daae2a8f 100644
--- a/Thermo.Active.NC/NcAdapter.cs
+++ b/Thermo.Active.NC/NcAdapter.cs
@@ -1755,8 +1755,6 @@ namespace Thermo.Active.NC
currRecipe = new Dictionary();
DTORecipeParam currParam = new DTORecipeParam();
- RPRange currRange = new RPRange();
- RPStatus currStatus = new RPStatus();
// gestione errore
cmsError = ReadRecipeData(false, true, out currRecipe);
diff --git a/Thermo.Active/Controllers/WebApi/RecipeController.cs b/Thermo.Active/Controllers/WebApi/RecipeController.cs
index 689b7b9f..46497dee 100644
--- a/Thermo.Active/Controllers/WebApi/RecipeController.cs
+++ b/Thermo.Active/Controllers/WebApi/RecipeController.cs
@@ -321,7 +321,7 @@ namespace Thermo.Active.Controllers.WebApi
RecipeLiveData.RecipeParameters = currParams;
// carico i dati dei riscaldi...
- var currChSet = new Dictionary();
+ var currChSet = new Dictionary();
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 prevWarmers);
- if (cmsError.IsError())
- return BadRequest(cmsError.localizationKey);
- // save warmers to PLC
+ // process ch load setup...
+ Dictionary newRisk = new Dictionary();
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;
}