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

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_core_library into develop

Browse Source
This commit is contained in:
ext_luca.pansa@cms.it
2020-11-12 10:54:02 +01:00
parent 6e10822743 857a5888b9
commit 7edd78584b
2 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Library/NcThermo.cs
+7
View File
@@ -764,6 +764,13 @@ namespace CMS_CORE_Library
/// <param name="gaugeData">Reference to the value of the gauge data</param>
public abstract CmsError PLC_RGaugeData(ref ThermoModels.LiveProdDataModel gaugeData);
/// <summary>
/// Set Keyboard softkey ID
/// </summary>
/// <param name="idKey1">Softkey ID of the first button</param>
/// <param name="idKey2">Softkey ID of the second button</param>
/// <returns></returns>
public abstract CmsError PLC_WKeyboardSoftkey(ushort idKey1, ushort idKey2);
/// <summary>
/// Get current Production Info data
/// </summary>
/// <param name="currProdInfo"></param>
CMS_CORE_Library/S7Net/Nc_S7Net.cs
+19 -1
View File
@@ -2445,7 +2445,6 @@ namespace CMS_CORE_Library.S7Net
return NO_ERROR;
}
/// <summary>
/// Get gauge data
/// </summary>
@@ -2470,10 +2469,28 @@ namespace CMS_CORE_Library.S7Net
return NO_ERROR;
}
/// <summary>
/// Set Keyboard softkey ID
/// </summary>
/// <param name="idKey1">Softkey ID of the first button</param>
/// <param name="idKey2">Softkey ID of the second button</param>
/// <returns></returns>
public override CmsError PLC_WKeyboardSoftkey(ushort idKey1, ushort idKey2)
{
List<ushort> currMem = new List<ushort>();
currMem.Add(idKey1);
currMem.Add(idKey2);
CmsError libraryError = MEM_RWWordList(W, 0, KEYBOARD_STAR_MEMORY.MemType, KEYBOARD_STAR_MEMORY.Address, KEYBOARD_STAR_MEMORY.SubAddress, KEYBOARD_STAR_MEMORY.Size, ref currMem);
if (libraryError.IsError())
return libraryError;
return NO_ERROR;
}
/// <summary>
/// Get current Production Info data
/// </summary>
/// <param name="currProdInfo"></param>
/// <returns></returns>
///
public override CmsError PLC_RProdInfo(ref ThermoModels.ProdInfoModel currProdInfo)
{
List<byte> currMem = new List<byte>();
@@ -5376,6 +5393,7 @@ namespace CMS_CORE_Library.S7Net
internal static MEMORY_CELL M156_INPUT_STROBE = new MEMORY_CELL(MEMORY_TYPE.Siemens_DB, TABLE, 6772, 1);
internal static MEMORY_CELL M156_INPUT_ID_LIST = new MEMORY_CELL(MEMORY_TYPE.Siemens_DB, TABLE, 6774, 2);
internal static MEMORY_CELL M156_RESPONSE_MEMORY = new MEMORY_CELL(MEMORY_TYPE.Siemens_DB, TABLE, 6776, 4);
internal static MEMORY_CELL KEYBOARD_STAR_MEMORY = new MEMORY_CELL(MEMORY_TYPE.Siemens_DB, TABLE, 6780, 2);
internal static MEMORY_CELL M154_ACK = new MEMORY_CELL(MEMORY_TYPE.Siemens_DB, TABLE, 3042, 1);
internal static MEMORY_CELL M154_STROBE = new MEMORY_CELL(MEMORY_TYPE.Siemens_DB, TABLE, 3043, 1);