Bringing repo up to date with thomas-v2

src/DriverTest/Program.cs

@@ -38,9 +38,9 @@ static void Main(string[] args)
             Console.WriteLine("Main - Versuche Verbindungsaufbau zu: " + HostIp);
 
             S7CommPlusConnection conn = new S7CommPlusConnection();
-            res = conn.Connect(HostIp, Password, Username);
-            if (res == 0)
+            try
             {
+                conn.Connect(HostIp, Password, Username);
                 Console.WriteLine("Main - Connect fertig");
 
                 #region Variablenhaushalt browsen
@@ -95,7 +95,7 @@ static void Main(string[] args)
                 List<object> values = new List<object>();
                 List<UInt64> errors = new List<UInt64>();
 
-                
+
                 // Fehlerhafte Variable setzen
                 //readlist[2].LID[0] = 123;
                 res = conn.ReadValues(readlist, out values, out errors);
@@ -112,7 +112,7 @@ static void Main(string[] args)
                     string formatstring = "{0,-80}{1,-30}{2,-20}{3,-20}";
                     Console.WriteLine(String.Format(formatstring, "SYMBOLIC-NAME", "ACCESS-SEQUENCE", "TYP", "VALUE"));
                     for (int i = 0; i < vars.Count; i++)
-                    { 
+                    {
                         string s = String.Format(formatstring, vars[i].Name, vars[i].AccessSequence, Softdatatype.Types[vars[i].Softdatatype], values[i]);
                         Console.WriteLine(s);
                     }
@@ -167,12 +167,12 @@ static void Main(string[] args)
                 conn.SetPlcOperatingState(3);
                 #endregion
                 */
-                conn.Disconnect();
             }
-            else
+            catch (Exception e)
             {
-                Console.WriteLine("Main - Connect fehlgeschlagen!");
+                Console.WriteLine("Main - " + e.ToString());
             }
+            conn.Disconnect();
             Console.WriteLine("Main - ENDE. Bitte Taste drücken.");
             Console.ReadKey();
         }

src/S7CommPlusDriver/Alarming/BrowseAlarms.cs

@@ -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