Merge pull request #77 from neurogears/api-refactor

glopesdev · web-flow · commit 1fd49781e277 · 2024-05-14T09:44:04.000+01:00
Rename hub clock to hub sync counter
diff --git a/OpenEphys.Onix/OpenEphys.Onix/Bno055DataFrame.cs b/OpenEphys.Onix/OpenEphys.Onix/Bno055DataFrame.cs
@@ -14,7 +14,7 @@ public unsafe Bno055DataFrame(oni.Frame frame)
         internal unsafe Bno055DataFrame(ulong clock, Bno055Payload* payload)
             : this(clock, &payload->Data)
         {
-            HubClock = payload->HubClock;
+            HubSyncCounter = payload->HubSyncCounter;
         }
 
         internal unsafe Bno055DataFrame(ulong clock, Bno055DataPayload* payload)
@@ -43,7 +43,7 @@ internal unsafe Bno055DataFrame(ulong clock, Bno055DataPayload* payload)
 
         public ulong Clock { get; }
 
-        public ulong HubClock { get; }
+        public ulong HubSyncCounter { get; }
 
         public Vector3 EulerAngle { get; }
 
@@ -61,7 +61,7 @@ internal unsafe Bno055DataFrame(ulong clock, Bno055DataPayload* payload)
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     unsafe struct Bno055Payload
     {
-        public ulong HubClock;
+        public ulong HubSyncCounter;
         public Bno055DataPayload Data;
     }
 
diff --git a/OpenEphys.Onix/OpenEphys.Onix/HarpSyncInputDataFrame.cs b/OpenEphys.Onix/OpenEphys.Onix/HarpSyncInputDataFrame.cs
@@ -8,21 +8,21 @@ public unsafe HarpSyncInputDataFrame(oni.Frame frame)
         {
             Clock = frame.Clock;
             var payload = (HarpSyncInputPayload*)frame.Data.ToPointer();
-            HubClock = payload->HubClock;
+            HubSyncCounter = payload->HubSyncCounter;
             HarpTime = payload->HarpTime;
         }
 
         public ulong Clock { get; }
 
-        public ulong HubClock { get; }
+        public ulong HubSyncCounter { get; }
 
         public uint HarpTime { get; }
     }
 
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct HarpSyncInputPayload
     {
-        public ulong HubClock;
+        public ulong HubSyncCounter;
         public uint HarpTime;
     }
 }
diff --git a/OpenEphys.Onix/OpenEphys.Onix/MemoryUsageDataFrame.cs b/OpenEphys.Onix/OpenEphys.Onix/MemoryUsageDataFrame.cs
@@ -11,7 +11,7 @@ public unsafe MemoryUsageDataFrame(oni.Frame frame, uint totalMemory)
 
             FrameClock = frame.Clock;
             DeviceAddress = frame.DeviceAddress;
-            HubClock = payload->HubClock;
+            HubSyncCounter = payload->HubSyncCounter;
             PercentUsed = 100.0 * payload->Usage / totalMemory;
             BytesUsed = payload->Usage * 4;
 
@@ -21,7 +21,7 @@ public unsafe MemoryUsageDataFrame(oni.Frame frame, uint totalMemory)
 
         public uint DeviceAddress { get; private set; }
 
-        public ulong HubClock { get; }
+        public ulong HubSyncCounter { get; }
 
         public double PercentUsed { get; }
 
@@ -31,7 +31,7 @@ public unsafe MemoryUsageDataFrame(oni.Frame frame, uint totalMemory)
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct MemoryUsagePayload
     {
-        public ulong HubClock;
+        public ulong HubSyncCounter;
         public uint Usage;
     }
 }
diff --git a/OpenEphys.Onix/OpenEphys.Onix/NeuropixelsV2eBetaData.cs b/OpenEphys.Onix/OpenEphys.Onix/NeuropixelsV2eBetaData.cs
@@ -34,27 +34,27 @@ public unsafe override IObservable<NeuropixelsV2eBetaDataFrame> Generate()
                         var sampleIndex = 0;
                         var amplifierBuffer = new ushort[NeuropixelsV2eBeta.ChannelCount, bufferSize];
                         var frameCounter = new int[NeuropixelsV2eBeta.FramesPerSuperFrame * bufferSize];
-                        var hubClockBuffer = new ulong[bufferSize];
+                        var hubSyncCounterBuffer = new ulong[bufferSize];
                         var clockBuffer = new ulong[bufferSize];
 
                         var frameObserver = Observer.Create<oni.Frame>(
                             frame =>
                             {
                                 var payload = (NeuropixelsV2BetaPayload*)frame.Data.ToPointer();
                                 NeuropixelsV2eBetaDataFrame.CopyAmplifierBuffer(payload->SuperFrame, amplifierBuffer, frameCounter, sampleIndex);
-                                hubClockBuffer[sampleIndex] = payload->HubClock;
+                                hubSyncCounterBuffer[sampleIndex] = payload->HubSyncCounter;
                                 clockBuffer[sampleIndex] = frame.Clock;
                                 if (++sampleIndex >= bufferSize)
                                 {
                                     var amplifierData = Mat.FromArray(amplifierBuffer);
                                     var dataFrame = new NeuropixelsV2eBetaDataFrame(
                                         clockBuffer,
-                                        hubClockBuffer,
+                                        hubSyncCounterBuffer,
                                         amplifierData,
                                         frameCounter);
                                     observer.OnNext(dataFrame);
                                     frameCounter = new int[NeuropixelsV2eBeta.FramesPerSuperFrame * bufferSize];
-                                    hubClockBuffer = new ulong[bufferSize];
+                                    hubSyncCounterBuffer = new ulong[bufferSize];
                                     clockBuffer = new ulong[bufferSize];
                                     sampleIndex = 0;
                                 }
diff --git a/OpenEphys.Onix/OpenEphys.Onix/NeuropixelsV2eBetaDataFrame.cs b/OpenEphys.Onix/OpenEphys.Onix/NeuropixelsV2eBetaDataFrame.cs
@@ -5,17 +5,17 @@ namespace OpenEphys.Onix
 {
     public class NeuropixelsV2eBetaDataFrame
     {
-        public NeuropixelsV2eBetaDataFrame(ulong[] clock, ulong[] hubClock, Mat amplifierData, int[] frameCounter)
+        public NeuropixelsV2eBetaDataFrame(ulong[] clock, ulong[] hubSyncCounter, Mat amplifierData, int[] frameCounter)
         {
             Clock = clock;
-            HubClock = hubClock;
+            HubSyncCounter = hubSyncCounter;
             AmplifierData = amplifierData;
             FrameCounter = frameCounter;
         }
 
         public ulong[] Clock { get; }
 
-        public ulong[] HubClock { get; }
+        public ulong[] HubSyncCounter { get; }
 
         public Mat AmplifierData { get; }
 
@@ -81,7 +81,7 @@ internal static unsafe void CopyAmplifierBuffer(ushort* superFrame, ushort[,] am
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     unsafe struct NeuropixelsV2BetaPayload
     {
-        public ulong HubClock;
+        public ulong HubSyncCounter;
         public ushort ProbeIndex;
         public uint Reserved;
         public fixed ushort SuperFrame[NeuropixelsV2eBeta.FramesPerSuperFrame * NeuropixelsV2eBeta.FrameWords];
diff --git a/OpenEphys.Onix/OpenEphys.Onix/NeuropixelsV2eData.cs b/OpenEphys.Onix/OpenEphys.Onix/NeuropixelsV2eData.cs
@@ -33,21 +33,21 @@ public unsafe override IObservable<NeuropixelsV2eDataFrame> Generate()
                     {
                         var sampleIndex = 0;
                         var amplifierBuffer = new ushort[NeuropixelsV2e.ChannelCount, bufferSize];
-                        var hubClockBuffer = new ulong[bufferSize];
+                        var hubSyncCounterBuffer = new ulong[bufferSize];
                         var clockBuffer = new ulong[bufferSize];
 
                         var frameObserver = Observer.Create<oni.Frame>(
                             frame =>
                             {
                                 var payload = (NeuropixelsV2Payload*)frame.Data.ToPointer();
                                 NeuropixelsV2eDataFrame.CopyAmplifierBuffer(payload->AmplifierData, amplifierBuffer, sampleIndex);
-                                hubClockBuffer[sampleIndex] = payload->HubClock;
+                                hubSyncCounterBuffer[sampleIndex] = payload->HubSyncCounter;
                                 clockBuffer[sampleIndex] = frame.Clock;
                                 if (++sampleIndex >= bufferSize)
                                 {
                                     var amplifierData = Mat.FromArray(amplifierBuffer);
-                                    observer.OnNext(new NeuropixelsV2eDataFrame(clockBuffer, hubClockBuffer, amplifierData));
-                                    hubClockBuffer = new ulong[bufferSize];
+                                    observer.OnNext(new NeuropixelsV2eDataFrame(clockBuffer, hubSyncCounterBuffer, amplifierData));
+                                    hubSyncCounterBuffer = new ulong[bufferSize];
                                     clockBuffer = new ulong[bufferSize];
                                     sampleIndex = 0;
                                 }
diff --git a/OpenEphys.Onix/OpenEphys.Onix/NeuropixelsV2eDataFrame.cs b/OpenEphys.Onix/OpenEphys.Onix/NeuropixelsV2eDataFrame.cs
@@ -5,16 +5,16 @@ namespace OpenEphys.Onix
 {
     public class NeuropixelsV2eDataFrame
     {
-        public NeuropixelsV2eDataFrame(ulong[] clock, ulong[] hubClock, Mat amplifierData)
+        public NeuropixelsV2eDataFrame(ulong[] clock, ulong[] hubSyncCounter, Mat amplifierData)
         {
             Clock = clock;
-            HubClock = hubClock;
+            HubSyncCounter = hubSyncCounter;
             AmplifierData = amplifierData;
         }
 
         public ulong[] Clock { get; }
 
-        public ulong[] HubClock { get; }
+        public ulong[] HubSyncCounter { get; }
 
         public Mat AmplifierData { get; }
 
@@ -93,7 +93,7 @@ internal static unsafe void CopyAmplifierBuffer(ushort* amplifierData, ushort[,]
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     unsafe struct NeuropixelsV2Payload
     {
-        public ulong HubClock;
+        public ulong HubSyncCounter;
         public ushort ProbeIndex;
         public ulong Reserved;
         public fixed ushort AmplifierData[NeuropixelsV2e.ChannelCount];
diff --git a/OpenEphys.Onix/OpenEphys.Onix/Rhd2164Data.cs b/OpenEphys.Onix/OpenEphys.Onix/Rhd2164Data.cs
@@ -28,7 +28,7 @@ public unsafe override IObservable<Rhd2164DataFrame> Generate()
                         var device = deviceInfo.GetDeviceContext(typeof(Rhd2164));
                         var amplifierBuffer = new short[Rhd2164.AmplifierChannelCount * bufferSize];
                         var auxBuffer = new short[Rhd2164.AuxChannelCount * bufferSize];
-                        var hubClockBuffer = new ulong[bufferSize];
+                        var hubSyncCounterBuffer = new ulong[bufferSize];
                         var clockBuffer = new ulong[bufferSize];
 
                         var frameObserver = Observer.Create<oni.Frame>(
@@ -37,14 +37,14 @@ public unsafe override IObservable<Rhd2164DataFrame> Generate()
                                 var payload = (Rhd2164Payload*)frame.Data.ToPointer();
                                 Marshal.Copy(new IntPtr(payload->AmplifierData), amplifierBuffer, sampleIndex * Rhd2164.AmplifierChannelCount, Rhd2164.AmplifierChannelCount);
                                 Marshal.Copy(new IntPtr(payload->AuxData), auxBuffer, sampleIndex * Rhd2164.AuxChannelCount, Rhd2164.AuxChannelCount);
-                                hubClockBuffer[sampleIndex] = payload->HubClock;
+                                hubSyncCounterBuffer[sampleIndex] = payload->HubSyncCounter;
                                 clockBuffer[sampleIndex] = frame.Clock;
                                 if (++sampleIndex >= bufferSize)
                                 {
                                     var amplifierData = BufferHelper.CopyBuffer(amplifierBuffer, bufferSize, Rhd2164.AmplifierChannelCount, Depth.U16);
                                     var auxData = BufferHelper.CopyBuffer(auxBuffer, bufferSize, Rhd2164.AuxChannelCount, Depth.U16);
-                                    observer.OnNext(new Rhd2164DataFrame(clockBuffer, hubClockBuffer, amplifierData, auxData));
-                                    hubClockBuffer = new ulong[bufferSize];
+                                    observer.OnNext(new Rhd2164DataFrame(clockBuffer, hubSyncCounterBuffer, amplifierData, auxData));
+                                    hubSyncCounterBuffer = new ulong[bufferSize];
                                     clockBuffer = new ulong[bufferSize];
                                     sampleIndex = 0;
                                 }
diff --git a/OpenEphys.Onix/OpenEphys.Onix/Rhd2164DataFrame.cs b/OpenEphys.Onix/OpenEphys.Onix/Rhd2164DataFrame.cs
@@ -5,17 +5,17 @@ namespace OpenEphys.Onix
 {
     public class Rhd2164DataFrame
     {
-        public Rhd2164DataFrame(ulong[] clock, ulong[] hubClock, Mat amplifierData, Mat auxData)
+        public Rhd2164DataFrame(ulong[] clock, ulong[] hubSyncCounter, Mat amplifierData, Mat auxData)
         {
             Clock = clock;
-            HubClock = hubClock;
+            HubSyncCounter = hubSyncCounter;
             AmplifierData = amplifierData;
             AuxData = auxData;
         }
 
         public ulong[] Clock { get; }
 
-        public ulong[] HubClock { get; }
+        public ulong[] HubSyncCounter { get; }
 
         public Mat AmplifierData { get; }
 
@@ -25,7 +25,7 @@ public Rhd2164DataFrame(ulong[] clock, ulong[] hubClock, Mat amplifierData, Mat
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     unsafe struct Rhd2164Payload
     {
-        public ulong HubClock;
+        public ulong HubSyncCounter;
         public fixed ushort AmplifierData[Rhd2164.AmplifierChannelCount];
         public fixed ushort AuxData[Rhd2164.AuxChannelCount];
     }
diff --git a/OpenEphys.Onix/OpenEphys.Onix/TS4231DataFrame.cs b/OpenEphys.Onix/OpenEphys.Onix/TS4231DataFrame.cs
@@ -8,15 +8,15 @@ public unsafe TS4231DataFrame(oni.Frame frame)
         {
             Clock = frame.Clock;
             var payload = (TS4231Payload*)frame.Data.ToPointer();
-            HubClock = payload->HubClock;
+            HubSyncCounter = payload->HubSyncCounter;
             SensorIndex = payload->SensorIndex;
             EnvelopeWidth = payload->EnvelopeWidth;
             EnvelopeType = payload->EnvelopeType;
         }
 
         public ulong Clock { get; }
 
-        public ulong HubClock { get; }
+        public ulong HubSyncCounter { get; }
 
         public int SensorIndex { get; }
 
@@ -28,7 +28,7 @@ public unsafe TS4231DataFrame(oni.Frame frame)
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct TS4231Payload
     {
-        public ulong HubClock;
+        public ulong HubSyncCounter;
         public ushort SensorIndex;
         public uint EnvelopeWidth;
         public TS4231Envelope EnvelopeType;
diff --git a/OpenEphys.Onix/OpenEphys.Onix/Test0Data.cs b/OpenEphys.Onix/OpenEphys.Onix/Test0Data.cs
@@ -36,7 +36,7 @@ public unsafe override IObservable<Test0DataFrame> Generate()
                     var sampleIndex = 0;
                     var dummyBuffer = new short[dummyWords * bufferSize];
                     var messageBuffer = new short[bufferSize];
-                    var hubClockBuffer = new ulong[bufferSize];
+                    var hubSyncCounterBuffer = new ulong[bufferSize];
                     var clockBuffer = new ulong[bufferSize];
 
                     var frameObserver = Observer.Create<oni.Frame>(
@@ -45,14 +45,14 @@ public unsafe override IObservable<Test0DataFrame> Generate()
                             var payload = (Test0PayloadHeader*)frame.Data.ToPointer();
                             Marshal.Copy(new IntPtr(payload + 1), dummyBuffer, sampleIndex * dummyWords, dummyWords);
                             messageBuffer[sampleIndex] = payload->Message;
-                            hubClockBuffer[sampleIndex] = payload->HubClock;
+                            hubSyncCounterBuffer[sampleIndex] = payload->HubSyncCounter;
                             clockBuffer[sampleIndex] = frame.Clock;
                             if (++sampleIndex >= bufferSize)
                             {
                                 var dummy = BufferHelper.CopyBuffer(dummyBuffer, bufferSize, dummyWords, Depth.S16);
                                 var message = BufferHelper.CopyBuffer(messageBuffer, bufferSize, 1, Depth.S16);
-                                observer.OnNext(new Test0DataFrame(clockBuffer, hubClockBuffer, message, dummy));
-                                hubClockBuffer = new ulong[bufferSize];
+                                observer.OnNext(new Test0DataFrame(clockBuffer, hubSyncCounterBuffer, message, dummy));
+                                hubSyncCounterBuffer = new ulong[bufferSize];
                                 clockBuffer = new ulong[bufferSize];
                                 sampleIndex = 0;
                             }
diff --git a/OpenEphys.Onix/OpenEphys.Onix/Test0DataFrame.cs b/OpenEphys.Onix/OpenEphys.Onix/Test0DataFrame.cs
@@ -5,17 +5,17 @@ namespace OpenEphys.Onix
 {
     public class Test0DataFrame
     {
-        public Test0DataFrame(ulong[] clock, ulong[] hubClock, Mat message, Mat dummy)
+        public Test0DataFrame(ulong[] clock, ulong[] hubSyncCounter, Mat message, Mat dummy)
         {
             Clock = clock;
-            HubClock = hubClock;
+            HubSyncCounter = hubSyncCounter;
             Message = message;
             Dummy = dummy;
         }
 
         public ulong[] Clock { get; }
 
-        public ulong[] HubClock { get; }
+        public ulong[] HubSyncCounter { get; }
 
         public Mat Message { get; }
 
@@ -25,7 +25,7 @@ public Test0DataFrame(ulong[] clock, ulong[] hubClock, Mat message, Mat dummy)
     [StructLayout(LayoutKind.Sequential, Pack = 1)]
     struct Test0PayloadHeader
     {
-        public ulong HubClock;
+        public ulong HubSyncCounter;
         public short Message;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public unsafe Bno055DataFrame(oni.Frame frame)`
`14`	`14`	`internal unsafe Bno055DataFrame(ulong clock, Bno055Payload* payload)`
`15`	`15`	`: this(clock, &payload->Data)`
`16`	`16`	`{`
`17`		`- HubClock = payload->HubClock;`
	`17`	`+ HubSyncCounter = payload->HubSyncCounter;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`internal unsafe Bno055DataFrame(ulong clock, Bno055DataPayload* payload)`
`@@ -43,7 +43,7 @@ internal unsafe Bno055DataFrame(ulong clock, Bno055DataPayload* payload)`
`43`	`43`
`44`	`44`	`public ulong Clock { get; }`
`45`	`45`
`46`		`- public ulong HubClock { get; }`
	`46`	`+ public ulong HubSyncCounter { get; }`
`47`	`47`
`48`	`48`	`public Vector3 EulerAngle { get; }`
`49`	`49`
`@@ -61,7 +61,7 @@ internal unsafe Bno055DataFrame(ulong clock, Bno055DataPayload* payload)`
`61`	`61`	`[StructLayout(LayoutKind.Sequential, Pack = 1)]`
`62`	`62`	`unsafe struct Bno055Payload`
`63`	`63`	`{`
`64`		`- public ulong HubClock;`
	`64`	`+ public ulong HubSyncCounter;`
`65`	`65`	`public Bno055DataPayload Data;`
`66`	`66`	`}`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -8,21 +8,21 @@ public unsafe HarpSyncInputDataFrame(oni.Frame frame)`
`8`	`8`	`{`
`9`	`9`	`Clock = frame.Clock;`
`10`	`10`	`var payload = (HarpSyncInputPayload*)frame.Data.ToPointer();`
`11`		`- HubClock = payload->HubClock;`
	`11`	`+ HubSyncCounter = payload->HubSyncCounter;`
`12`	`12`	`HarpTime = payload->HarpTime;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public ulong Clock { get; }`
`16`	`16`
`17`		`- public ulong HubClock { get; }`
	`17`	`+ public ulong HubSyncCounter { get; }`
`18`	`18`
`19`	`19`	`public uint HarpTime { get; }`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`[StructLayout(LayoutKind.Sequential, Pack = 1)]`
`23`	`23`	`struct HarpSyncInputPayload`
`24`	`24`	`{`
`25`		`- public ulong HubClock;`
	`25`	`+ public ulong HubSyncCounter;`
`26`	`26`	`public uint HarpTime;`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public unsafe MemoryUsageDataFrame(oni.Frame frame, uint totalMemory)`
`11`	`11`
`12`	`12`	`FrameClock = frame.Clock;`
`13`	`13`	`DeviceAddress = frame.DeviceAddress;`
`14`		`- HubClock = payload->HubClock;`
	`14`	`+ HubSyncCounter = payload->HubSyncCounter;`
`15`	`15`	`PercentUsed = 100.0 * payload->Usage / totalMemory;`
`16`	`16`	`BytesUsed = payload->Usage * 4;`
`17`	`17`
`@@ -21,7 +21,7 @@ public unsafe MemoryUsageDataFrame(oni.Frame frame, uint totalMemory)`
`21`	`21`
`22`	`22`	`public uint DeviceAddress { get; private set; }`
`23`	`23`
`24`		`- public ulong HubClock { get; }`
	`24`	`+ public ulong HubSyncCounter { get; }`
`25`	`25`
`26`	`26`	`public double PercentUsed { get; }`
`27`	`27`
`@@ -31,7 +31,7 @@ public unsafe MemoryUsageDataFrame(oni.Frame frame, uint totalMemory)`
`31`	`31`	`[StructLayout(LayoutKind.Sequential, Pack = 1)]`
`32`	`32`	`struct MemoryUsagePayload`
`33`	`33`	`{`
`34`		`- public ulong HubClock;`
	`34`	`+ public ulong HubSyncCounter;`
`35`	`35`	`public uint Usage;`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,17 @@ namespace OpenEphys.Onix`
`5`	`5`	`{`
`6`	`6`	`public class NeuropixelsV2eBetaDataFrame`
`7`	`7`	`{`
`8`		`- public NeuropixelsV2eBetaDataFrame(ulong[] clock, ulong[] hubClock, Mat amplifierData, int[] frameCounter)`
	`8`	`+ public NeuropixelsV2eBetaDataFrame(ulong[] clock, ulong[] hubSyncCounter, Mat amplifierData, int[] frameCounter)`
`9`	`9`	`{`
`10`	`10`	`Clock = clock;`
`11`		`- HubClock = hubClock;`
	`11`	`+ HubSyncCounter = hubSyncCounter;`
`12`	`12`	`AmplifierData = amplifierData;`
`13`	`13`	`FrameCounter = frameCounter;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public ulong[] Clock { get; }`
`17`	`17`
`18`		`- public ulong[] HubClock { get; }`
	`18`	`+ public ulong[] HubSyncCounter { get; }`
`19`	`19`
`20`	`20`	`public Mat AmplifierData { get; }`
`21`	`21`
`@@ -81,7 +81,7 @@ internal static unsafe void CopyAmplifierBuffer(ushort* superFrame, ushort[,] am`
`81`	`81`	`[StructLayout(LayoutKind.Sequential, Pack = 1)]`
`82`	`82`	`unsafe struct NeuropixelsV2BetaPayload`
`83`	`83`	`{`
`84`		`- public ulong HubClock;`
	`84`	`+ public ulong HubSyncCounter;`
`85`	`85`	`public ushort ProbeIndex;`
`86`	`86`	`public uint Reserved;`
`87`	`87`	`public fixed ushort SuperFrame[NeuropixelsV2eBeta.FramesPerSuperFrame * NeuropixelsV2eBeta.FrameWords];`
Original file line number	Diff line number	Diff line change
`@@ -5,16 +5,16 @@ namespace OpenEphys.Onix`
`5`	`5`	`{`
`6`	`6`	`public class NeuropixelsV2eDataFrame`
`7`	`7`	`{`
`8`		`- public NeuropixelsV2eDataFrame(ulong[] clock, ulong[] hubClock, Mat amplifierData)`
	`8`	`+ public NeuropixelsV2eDataFrame(ulong[] clock, ulong[] hubSyncCounter, Mat amplifierData)`
`9`	`9`	`{`
`10`	`10`	`Clock = clock;`
`11`		`- HubClock = hubClock;`
	`11`	`+ HubSyncCounter = hubSyncCounter;`
`12`	`12`	`AmplifierData = amplifierData;`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public ulong[] Clock { get; }`
`16`	`16`
`17`		`- public ulong[] HubClock { get; }`
	`17`	`+ public ulong[] HubSyncCounter { get; }`
`18`	`18`
`19`	`19`	`public Mat AmplifierData { get; }`
`20`	`20`
`@@ -93,7 +93,7 @@ internal static unsafe void CopyAmplifierBuffer(ushort* amplifierData, ushort[,]`
`93`	`93`	`[StructLayout(LayoutKind.Sequential, Pack = 1)]`
`94`	`94`	`unsafe struct NeuropixelsV2Payload`
`95`	`95`	`{`
`96`		`- public ulong HubClock;`
	`96`	`+ public ulong HubSyncCounter;`
`97`	`97`	`public ushort ProbeIndex;`
`98`	`98`	`public ulong Reserved;`
`99`	`99`	`public fixed ushort AmplifierData[NeuropixelsV2e.ChannelCount];`
Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,17 @@ namespace OpenEphys.Onix`
`5`	`5`	`{`
`6`	`6`	`public class Rhd2164DataFrame`
`7`	`7`	`{`
`8`		`- public Rhd2164DataFrame(ulong[] clock, ulong[] hubClock, Mat amplifierData, Mat auxData)`
	`8`	`+ public Rhd2164DataFrame(ulong[] clock, ulong[] hubSyncCounter, Mat amplifierData, Mat auxData)`
`9`	`9`	`{`
`10`	`10`	`Clock = clock;`
`11`		`- HubClock = hubClock;`
	`11`	`+ HubSyncCounter = hubSyncCounter;`
`12`	`12`	`AmplifierData = amplifierData;`
`13`	`13`	`AuxData = auxData;`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public ulong[] Clock { get; }`
`17`	`17`
`18`		`- public ulong[] HubClock { get; }`
	`18`	`+ public ulong[] HubSyncCounter { get; }`
`19`	`19`
`20`	`20`	`public Mat AmplifierData { get; }`
`21`	`21`
`@@ -25,7 +25,7 @@ public Rhd2164DataFrame(ulong[] clock, ulong[] hubClock, Mat amplifierData, Mat`
`25`	`25`	`[StructLayout(LayoutKind.Sequential, Pack = 1)]`
`26`	`26`	`unsafe struct Rhd2164Payload`
`27`	`27`	`{`
`28`		`- public ulong HubClock;`
	`28`	`+ public ulong HubSyncCounter;`
`29`	`29`	`public fixed ushort AmplifierData[Rhd2164.AmplifierChannelCount];`
`30`	`30`	`public fixed ushort AuxData[Rhd2164.AuxChannelCount];`
`31`	`31`	`}`