Egalware/cms-core-active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/S7Net' into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2020-10-30 10:22:43 +01:00
parent 777205905e d9ad3c099a
commit 55fcc95f20
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Library/S7Net/Nc_S7Net.cs
+3 -3
View File
@@ -2022,7 +2022,7 @@ namespace CMS_CORE_Library.S7Net
CmsError libraryError = NO_ERROR;
// Call ack for config request RISK
libraryError = PLC_WAck(true, REQ_CONF_ACK, REQ_CONF_STROBE, 12);
libraryError = PLC_WAck(true, REQ_CONF_ACK, REQ_CONF_STROBE, 13);
if (libraryError.IsError())
return libraryError;
@@ -2339,13 +2339,13 @@ namespace CMS_CORE_Library.S7Net
return libraryError;
}
/// <summary>
/// Confirm FLIR image acquired and copied to PLC
/// Confirm FLIR image acquired and copied to PLC (STR from server)
/// </summary>
/// <returns></returns>
public override CmsError PLC_WStrFlirAcquired()
{
// Call confirm update
CmsError libraryError = PLC_WStrobe(true, PARAMETER_EDIT_ACK, PARAMETER_EDIT_STROBE, 13);
CmsError libraryError = PLC_WStrobe(true, PARAMETER_EDIT_ACK, PARAMETER_EDIT_STROBE, 14);
if (libraryError.IsError())
return libraryError;