Skip to content

Bringing repo up to date with thomas-v2 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schnuff-dev wants to merge 17 commits into
base: master
Choose a base branch
from
Open

Bringing repo up to date with thomas-v2 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
5330593
bitte die neue S7 1200 G2 einfügen, diese Serie kann ab Tia V20 progr…
SigiRab Nov 14, 2025
d3d960d
Merge pull request #75 from SigiRab/feature/newS7-1200G2
thomas-v2 Nov 14, 2025
38b00f2
Use double quote for string
thomas-v2 Nov 27, 2025
9f1864f
Alarms: Add method to read the active alarms without notification
thomas-v2 Nov 27, 2025
ce4c92c
Add files via upload
SigiRab Nov 28, 2025
9cfa84b
Update PlcTags.cs
SigiRab Nov 28, 2025
b9acd44
Update S7CommPlusConnection.cs
SigiRab Nov 28, 2025
b61c126
Update S7CommPlusConnection.cs
SigiRab Nov 28, 2025
450e23b
Merge pull request #77 from SigiRab/read/write-arrays
thomas-v2 Dec 3, 2025
b84fb52
Move Array-Tag classes into single PlcTags file
thomas-v2 Dec 3, 2025
ef73ef3
add function: support for S7-1507S F software controller(min FW:21.9)
allrightsreserved Mar 23, 2026
1a91c49
Revert "add function: support for S7-1507S F software controller(min …
allrightsreserved Mar 23, 2026
c4eb099
support for Software controllers as of firmware version V21.9.
allrightsreserved Mar 23, 2026
dbd61e4
Merge pull request #83 from allrightsreserved/feature/Support-for-Sof…
thomas-v2 Mar 24, 2026
d92ea69
Merge remote-tracking branch 'thomas-v2/master'
schnuff-dev Apr 22, 2026
b7e6057
White space and line endings fixes
schnuff-dev May 22, 2026
3e4a79a
Added return value to Disconnect()
schnuff-dev May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
350 changes: 175 additions & 175 deletions src/S7CommPlusDriver/Alarming/AlarmsHandler.cs
View file
Open in desktop

Large diffs are not rendered by default.

74 changes: 71 additions & 3 deletions src/S7CommPlusDriver/Alarming/BrowseAlarms.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,74 @@ private void GetTexts(byte[] tloa_1, byte[] tloa_2, byte[] tloa_3, byte[] tlsa,
}
}
}

/// <summary>
/// Reads the active program alarms from the Plc (single poll).
///
/// Call example:
/// CultureInfo ci = new CultureInfo("de-DE");
/// var alarmList = new List<AlarmsDai>();
/// conn.GetActiveAlarms(out alarmList, ci.LCID);
/// foreach (var a in alarmList)
/// {
/// Console.WriteLine(a.ToString());
/// }
/// </summary>
/// <param name="alarmList">Contains the alarms, empty if there is no active alarm</param>
/// <param name="languageId">Language id for retrieving the text entries, use language code e.g. 1031 for german</param>
/// <returns>0 on success</returns>
public int GetActiveAlarms(out List<AlarmsDai> alarmList, int languageId)
{
int res;

alarmList = new List<AlarmsDai>();

var exploreReq = new ExploreRequest(ProtocolVersion.V2);
exploreReq.ExploreId = Ids.NativeObjects_theAlarmSubsystem_Rid;
exploreReq.ExploreRequestId = Ids.AlarmSubsystem_itsUpdateRelevantDAI;
exploreReq.ExploreChildsRecursive = 1;
exploreReq.ExploreParents = 0;

// Add the requestes attributes.
// Request the same attributes we get from an alarm notification, so we can reuse other methods.
exploreReq.AddressList.Add(Ids.DAI_CPUAlarmID);
exploreReq.AddressList.Add(Ids.DAI_AllStatesInfo);
exploreReq.AddressList.Add(Ids.DAI_AlarmDomain);
exploreReq.AddressList.Add(Ids.DAI_Coming);
exploreReq.AddressList.Add(Ids.DAI_Going);
exploreReq.AddressList.Add(Ids.DAI_MessageType);
exploreReq.AddressList.Add(Ids.DAI_HmiInfo);
// Extra ones which we only need for compatibility with notification.
exploreReq.AddressList.Add(Ids.ObjectVariableTypeName);
exploreReq.AddressList.Add(Ids.DAI_SequenceCounter);
exploreReq.AddressList.Add(Ids.DAI_AlarmTexts_Rid);

res = SendS7plusFunctionObject(exploreReq);
if (res != 0)
{
return res;
}
m_LastError = 0;
WaitForNewS7plusReceived(m_ReadTimeout);
if (m_LastError != 0)
{
return m_LastError;
}

var exploreRes = ExploreResponse.DeserializeFromPdu(m_ReceivedPDU, true);
res = checkResponseWithIntegrity(exploreReq, exploreRes);
if (res != 0)
{
return res;
}

foreach (var obj in exploreRes.Objects)
{
alarmList.Add(AlarmsDai.FromNotificationObject(obj, languageId));
}

return 0;
}
}

public class AlarmData
Expand All @@ -345,10 +413,10 @@ public ulong GetCpuAlarmId()
{
return ((ulong)(RelationId) << 32) | ((ulong)(MultipleStai.Alid) << 16);
}

public uint RelationId;

public AlarmsMultipleStai MultipleStai;
public AlarmsMultipleStai MultipleStai;
public AlarmsAlarmTexts AlText = new AlarmsAlarmTexts();

public int Deserialize(Stream buffer)
Expand All @@ -364,7 +432,7 @@ public override string ToString()
string s = "";
s += "<AlarmData>" + Environment.NewLine;
s += "<CpuAlarmId>" + GetCpuAlarmId().ToString() + "</CpuAlarmId>" + Environment.NewLine;
s += "<RelationId>" + RelationId.ToString() + Environment.NewLine +"</RelationId>" + Environment.NewLine;
s += "<RelationId>" + RelationId.ToString() + Environment.NewLine + "</RelationId>" + Environment.NewLine;
s += "<MultipleStai>" + Environment.NewLine + MultipleStai.ToString() + "</MultipleStai>" + Environment.NewLine;
s += "<AlText>" + Environment.NewLine;
s += "<Infotext>" + AlText.Infotext + "</Infotext>" + Environment.NewLine;
Expand Down
Loading