diff --git a/CMS_CORE_Library/NcThermo.cs b/CMS_CORE_Library/NcThermo.cs
index bb125ad..2e2f572 100644
--- a/CMS_CORE_Library/NcThermo.cs
+++ b/CMS_CORE_Library/NcThermo.cs
@@ -685,17 +685,29 @@ namespace CMS_CORE_Library
///
public abstract CmsError PLC_WWarmerChSetpHmi(Dictionary newData);
///
- /// Set current Warmers Channels ThermocamSetpoints (°C)
+ /// Set current Warmers Channels Temperature Set as reference (°C)
///
///
///
- public abstract CmsError PLC_WWarmerChTCamSetp(Dictionary newData);
+ public abstract CmsError PLC_WWarmerChTCamTempSet(Dictionary newData);
///
- /// Set current Warmers Channels Thermocam read (actual) value (°C)
+ /// Set current Warmers Channels Thermocam LAST READ value (°C)
///
///
///
- public abstract CmsError PLC_WWarmerChTCamActual(Dictionary newData);
+ public abstract CmsError PLC_WWarmerChTCamTempAct(Dictionary newData);
+ ///
+ /// Set current Warmers Channels as enabled/disabled for working with thermo camera data
+ ///
+ ///
+ ///
+ public abstract CmsError PLC_WWarmerChTCamEnab(Dictionary newData);
+ ///
+ /// Set ThermoCamera mode
+ ///
+ ///
+ ///
+ public abstract CmsError PLC_WTCamMode(bool enableTCam);
///
/// Set current Warmers Channels reflector's data
///
diff --git a/CMS_CORE_Library/S7Net/Nc_S7Net.cs b/CMS_CORE_Library/S7Net/Nc_S7Net.cs
index 41073c7..8a5780a 100644
--- a/CMS_CORE_Library/S7Net/Nc_S7Net.cs
+++ b/CMS_CORE_Library/S7Net/Nc_S7Net.cs
@@ -2373,7 +2373,7 @@ namespace CMS_CORE_Library.S7Net
refreshRiscTermoCamTempAct();
// refresh temp canale impostata x thermoCam | Write
refreshRiscTermoCamTempSet();
- }
+ }
// copio lista act in output
currWarmerChannelList = ThermoWarmChannels;
@@ -3129,7 +3129,7 @@ namespace CMS_CORE_Library.S7Net
else
{
libraryError = S7_PLC_EMPTY_READ;
- }
+ }
}
///
/// Refresh Canali Riscaldi: SetPoint HMI
@@ -3355,7 +3355,7 @@ namespace CMS_CORE_Library.S7Net
///
///
///
- public override CmsError PLC_WWarmerChTCamSetp(Dictionary newData)
+ public override CmsError PLC_WWarmerChTCamTempSet(Dictionary newData)
{
// FIXME TODO serve nuova area termocamera
#if false
@@ -3390,7 +3390,7 @@ namespace CMS_CORE_Library.S7Net
///
///
///
- public override CmsError PLC_WWarmerChTCamActual(Dictionary newData)
+ public override CmsError PLC_WWarmerChTCamTempAct(Dictionary newData)
{
// FIXME TODO serve nuova area termocamera
#if false
@@ -3420,6 +3420,59 @@ namespace CMS_CORE_Library.S7Net
return NO_ERROR;
}
+
+
+ ///
+ /// Set current Warmers Channels as enabled/disabled for working with thermo camera data
+ ///
+ ///
+ ///
+ public override CmsError PLC_WWarmerChTCamEnab(Dictionary newData)
+ {
+ // FIXME TODO serve nuova area termocamera
+#if false
+ // memory area
+ byte[] newMem = new byte[newData.Count];
+ List currMem = new List();
+
+ // read actual data on memory...
+ CmsError libraryError = MEM_RWByteList(R, 0, RISC_CHP_DATA.MemType, RISC_CHP_DATA.Address, RISC_CHP_DATA.SubAddress, 0, RISC_CHP_DATA.Size, ref currMem);
+ if (libraryError.IsError())
+ return libraryError;
+
+ newMem = currMem.ToArray();
+
+ // update only given data...
+ foreach (var item in newData)
+ {
+ newMem[item.Key - 1] = (byte)item.Value;
+ }
+ // return as list...
+ currMem = newMem.ToList();
+ // scrivo sul PLC array di byte...
+ libraryError = MEM_RWByteList(W, 0, RISC_CHP_DATA.MemType, RISC_CHP_DATA.Address, RISC_CHP_DATA.SubAddress, 0, RISC_CHP_DATA.Size, ref currMem);
+ if (libraryError.IsError())
+ return libraryError;
+#endif
+
+ return NO_ERROR;
+ }
+
+
+ ///
+ /// Set ThermoCamera mode
+ ///
+ ///
+ ///
+ public override CmsError PLC_WTCamMode(bool enableTCam)
+ {
+#if false
+
+#endif
+
+ return NO_ERROR;
+ }
+
///
/// Set current Warmers Channels reflector's data
///