Merge pull request #553 from open-ephys/fix-merge-issue

bparks13 · web-flow · commit b451d0247d7e · 2025-11-18T09:42:13.000-05:00
Correct method call for Rhs2116Trigger
diff --git a/OpenEphys.Onix1/ConfigureRhs2116Trigger.cs b/OpenEphys.Onix1/ConfigureRhs2116Trigger.cs
@@ -147,7 +147,7 @@ public string ProbeInterfaceLoadFileName
                     if (string.IsNullOrEmpty(probeInterfaceFileName))
                         return new Rhs2116ProbeGroup();
 
-                    return ProbeInterfaceHelper.LoadExternalProbeInterfaceFile<Rhs2116ProbeGroup>(probeInterfaceFileName);
+                    return ProbeInterfaceHelper.LoadExternalProbeInterfaceFile(probeInterfaceFileName, typeof(Rhs2116ProbeGroup)) as Rhs2116ProbeGroup;
                 });
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public string ProbeInterfaceLoadFileName`
`147`	`147`	`if (string.IsNullOrEmpty(probeInterfaceFileName))`
`148`	`148`	`return new Rhs2116ProbeGroup();`
`149`	`149`
`150`		`- return ProbeInterfaceHelper.LoadExternalProbeInterfaceFile<Rhs2116ProbeGroup>(probeInterfaceFileName);`
	`150`	`+ return ProbeInterfaceHelper.LoadExternalProbeInterfaceFile(probeInterfaceFileName, typeof(Rhs2116ProbeGroup)) as Rhs2116ProbeGroup;`
`151`	`151`	`});`
`152`	`152`	`}`
`153`	`153`	`}`