- changed reporting example to use two different RCBs

- .net API: remove native callback in ReportControlBlock destructor

dotnet/IEC61850forCSharp/ReportControlBlock.cs

@@ -151,6 +151,9 @@ namespace IEC61850
 			static extern void IedConnection_installReportHandler (IntPtr connection, string rcbReference, string rptId, InternalReportHandler handler,
         		IntPtr handlerParameter);
 
+            [DllImport("iec61850", CallingConvention = CallingConvention.Cdecl)]
+            static extern void IedConnection_uninstallReportHandler(IntPtr connection, string rcbReference);
+
             [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 			private delegate void InternalReportHandler (IntPtr parameter, IntPtr report);
 
@@ -221,6 +224,16 @@ namespace IEC61850
 				this.objectReference = objectReference;
 			}
 
+            ~ReportControlBlock()
+            {
+                IedConnection_uninstallReportHandler(connection, objectReference);
+            }
+
+			public string GetObjectReference ()
+			{
+				return this.objectReference;
+			}
+		
             /// <summary>
             /// Installs the report handler.
             /// </summary>

dotnet/reporting/ReportingExample.cs

@@ -14,6 +14,8 @@ namespace reporting
 		{
 			Console.WriteLine ("Received report:\n----------------");
 
+			Console.WriteLine ("  for RCB: " + report.GetRcbReference());
+
 			if (report.HasTimestamp ())
 				Console.WriteLine ("  timestamp: " + MmsValue.MsTimeToDateTimeOffset (report.GetTimestamp ()).ToString ());
 
@@ -29,7 +31,7 @@ namespace reporting
 
 			ReportControlBlock rcb = (ReportControlBlock) parameter;
 
-			Console.WriteLine("Buffered: " + rcb.IsBuffered());
+			Console.WriteLine("  For RCB: " + rcb.GetObjectReference() + " Buffered: " + rcb.IsBuffered());
 
 		}
 
@@ -45,33 +47,45 @@ namespace reporting
 			if (args.Length > 0)
 				hostname = args [0];
 			else
-				//hostname = "localhost";
+				hostname = "localhost";
-				hostname = "172.23.44.10";
+
+            hostname = "10.0.2.2";
 
 			Console.WriteLine ("Connect to " + hostname);
 
 			try {
 				con.Connect (hostname, 102);
 
-				string rcbReference = "simpleIOGenericIO/LLN0.RP.EventsRCB01";
+				string rcbReference1 = "simpleIOGenericIO/LLN0.RP.EventsRCB01";
+				string rcbReference2 = "simpleIOGenericIO/LLN0.RP.EventsIndexed01";
 
-				ReportControlBlock rcb = con.GetReportControlBlock(rcbReference);
+				ReportControlBlock rcb1 = con.GetReportControlBlock(rcbReference1);
+				ReportControlBlock rcb2 = con.GetReportControlBlock(rcbReference2);
 
-				rcb.GetRCBValues();
+				rcb1.GetRCBValues();
 
 				// note: the second parameter is not required!
-				rcb.InstallReportHandler(reportHandler, rcb);
+				rcb1.InstallReportHandler(reportHandler, rcb1);
+
+				if (rcb1.IsBuffered())
+					Console.WriteLine ("RCB: " + rcbReference1 + " is buffered");
+
+				rcb1.SetTrgOps(TriggerOptions.DATA_CHANGED | TriggerOptions.INTEGRITY);				
+				rcb1.SetIntgPd(5000);
+				rcb1.SetRptEna(true);
+
+				rcb1.SetRCBValues();
+
+				rcb2.GetRCBValues();
 
-				if (rcb.IsBuffered())
+				rcb2.InstallReportHandler(reportHandler, rcb2);
-					Console.WriteLine ("RCB: " + rcbReference + " is buffered");
 
-				Console.WriteLine(rcb.GetDataSetReference());
+				rcb2.SetTrgOps(TriggerOptions.DATA_CHANGED | TriggerOptions.INTEGRITY);				
+				rcb2.SetIntgPd(2000);
+				rcb2.SetRptEna(true);
 
-				rcb.SetTrgOps(TriggerOptions.DATA_CHANGED | TriggerOptions.INTEGRITY);				
+				rcb2.SetRCBValues();
-				rcb.SetIntgPd(5000);
-				rcb.SetRptEna(true);
 
-				rcb.SetRCBValues();
 
 				/* run until Ctrl-C is pressed */
 				Console.CancelKeyPress += delegate(object sender, ConsoleCancelEventArgs e) {