Merge pull request #220 from open-ephys/issue-191

jonnew · web-flow · commit 3563597bd51f · 2024-08-20T13:06:27.000-04:00
Implement ConfigureNeuropixelV1/2eBno055.Enable
diff --git a/OpenEphys.Onix1/ConfigureNeuropixelsV1eBno055.cs b/OpenEphys.Onix1/ConfigureNeuropixelsV1eBno055.cs
@@ -51,7 +51,7 @@ public override IObservable<ContextTask> Process(IObservable<ContextTask> source
                 var device = context.GetPassthroughDeviceContext(deviceAddress, typeof(DS90UB9x));
                 ConfigureDeserializer(device);
                 ConfigureBno055(device);
-                var deviceInfo = new DeviceInfo(context, DeviceType, deviceAddress);
+                var deviceInfo = new NeuropixelsV1eBno055DeviceInfo(context, DeviceType, deviceAddress, enable);
                 return DeviceManager.RegisterDevice(deviceName, deviceInfo);
             });
         }
@@ -91,4 +91,15 @@ public NameConverter()
             }
         }
     }
+
+    class NeuropixelsV1eBno055DeviceInfo : DeviceInfo
+    {
+        public NeuropixelsV1eBno055DeviceInfo(ContextTask context, Type deviceType, uint deviceAddress, bool enable)
+            : base(context, deviceType, deviceAddress)
+        {
+            Enable = enable;
+        }
+
+        public bool Enable { get; }
+    }
 }
diff --git a/OpenEphys.Onix1/ConfigureNeuropixelsV2eBno055.cs b/OpenEphys.Onix1/ConfigureNeuropixelsV2eBno055.cs
@@ -51,7 +51,7 @@ public override IObservable<ContextTask> Process(IObservable<ContextTask> source
                 var device = context.GetPassthroughDeviceContext(deviceAddress, typeof(DS90UB9x));
                 ConfigureDeserializer(device);
                 ConfigureBno055(device);
-                var deviceInfo = new DeviceInfo(context, DeviceType, deviceAddress);
+                var deviceInfo = new NeuropixelsV2eBno055DeviceInfo(context, DeviceType, deviceAddress, enable);
                 return DeviceManager.RegisterDevice(deviceName, deviceInfo);
             });
         }
@@ -91,4 +91,15 @@ public NameConverter()
             }
         }
     }
+
+    class NeuropixelsV2eBno055DeviceInfo : DeviceInfo
+    {
+        public NeuropixelsV2eBno055DeviceInfo(ContextTask context, Type deviceType, uint deviceAddress, bool enable)
+            : base(context, deviceType, deviceAddress)
+        {
+            Enable = enable;
+        }
+
+        public bool Enable { get; }
+    }
 }
diff --git a/OpenEphys.Onix1/NeuropixelsV1eBno055Data.cs b/OpenEphys.Onix1/NeuropixelsV1eBno055Data.cs
@@ -39,32 +39,37 @@ public override IObservable<Bno055DataFrame> Generate()
         public unsafe IObservable<Bno055DataFrame> Generate<TSource>(IObservable<TSource> source)
         {
             return DeviceManager.GetDevice(DeviceName).SelectMany(
-                deviceInfo => Observable.Create<Bno055DataFrame>(observer =>
+                deviceInfo =>
                 {
-                    var device = deviceInfo.GetDeviceContext(typeof(NeuropixelsV1eBno055));
-                    var passthrough = device.GetPassthroughDeviceContext(typeof(DS90UB9x));
-                    var i2c = new I2CRegisterContext(passthrough, NeuropixelsV1eBno055.BNO055Address);
-
-                    return source.SubscribeSafe(observer, _ =>
+                return !((NeuropixelsV1eBno055DeviceInfo)deviceInfo).Enable
+                    ? Observable.Empty<Bno055DataFrame>()
+                    : Observable.Create<Bno055DataFrame>(observer =>
                     {
-                        Bno055DataFrame frame = default;
-                        device.Context.EnsureContext(() =>
+                        var device = deviceInfo.GetDeviceContext(typeof(NeuropixelsV1eBno055));
+                        var passthrough = device.GetPassthroughDeviceContext(typeof(DS90UB9x));
+                        var i2c = new I2CRegisterContext(passthrough, NeuropixelsV1eBno055.BNO055Address);
+
+                        return source.SubscribeSafe(observer, _ =>
                         {
-                            var data = i2c.ReadBytes(NeuropixelsV1eBno055.DataAddress, sizeof(Bno055DataPayload));
-                            ulong clock = passthrough.ReadRegister(DS90UB9x.LASTI2CL);
-                            clock += (ulong)passthrough.ReadRegister(DS90UB9x.LASTI2CH) << 32;
-                            fixed (byte* dataPtr = data)
+                            Bno055DataFrame frame = default;
+                            device.Context.EnsureContext(() =>
+                            {
+                                var data = i2c.ReadBytes(NeuropixelsV1eBno055.DataAddress, sizeof(Bno055DataPayload));
+                                ulong clock = passthrough.ReadRegister(DS90UB9x.LASTI2CL);
+                                clock += (ulong)passthrough.ReadRegister(DS90UB9x.LASTI2CH) << 32;
+                                fixed (byte* dataPtr = data)
+                                {
+                                    frame = new Bno055DataFrame(clock, (Bno055DataPayload*)dataPtr);
+                                }
+                            });
+
+                            if (frame != null)
                             {
-                                frame = new Bno055DataFrame(clock, (Bno055DataPayload*)dataPtr);
+                                observer.OnNext(frame);
                             }
                         });
-
-                        if (frame != null)
-                        {
-                            observer.OnNext(frame);
-                        }
                     });
-                }));
+                });
         }
     }
 }
diff --git a/OpenEphys.Onix1/NeuropixelsV2eBno055Data.cs b/OpenEphys.Onix1/NeuropixelsV2eBno055Data.cs
@@ -39,32 +39,37 @@ public override IObservable<Bno055DataFrame> Generate()
         public unsafe IObservable<Bno055DataFrame> Generate<TSource>(IObservable<TSource> source)
         {
             return DeviceManager.GetDevice(DeviceName).SelectMany(
-                deviceInfo => Observable.Create<Bno055DataFrame>(observer =>
+                deviceInfo =>
                 {
-                    var device = deviceInfo.GetDeviceContext(typeof(NeuropixelsV2eBno055));
-                    var passthrough = device.GetPassthroughDeviceContext(typeof(DS90UB9x));
-                    var i2c = new I2CRegisterContext(passthrough, NeuropixelsV2eBno055.BNO055Address);
-
-                    return source.SubscribeSafe(observer, _ =>
-                    {
-                        Bno055DataFrame frame = default;
-                        device.Context.EnsureContext(() =>
+                    return !((NeuropixelsV2eBno055DeviceInfo)deviceInfo).Enable
+                        ? Observable.Empty<Bno055DataFrame>()
+                        : Observable.Create<Bno055DataFrame>(observer =>
                         {
-                            var data = i2c.ReadBytes(NeuropixelsV2eBno055.DataAddress, sizeof(Bno055DataPayload));
-                            ulong clock = passthrough.ReadRegister(DS90UB9x.LASTI2CL);
-                            clock += (ulong)passthrough.ReadRegister(DS90UB9x.LASTI2CH) << 32;
-                            fixed (byte* dataPtr = data)
+                            var device = deviceInfo.GetDeviceContext(typeof(NeuropixelsV2eBno055));
+                            var passthrough = device.GetPassthroughDeviceContext(typeof(DS90UB9x));
+                            var i2c = new I2CRegisterContext(passthrough, NeuropixelsV2eBno055.BNO055Address);
+
+                            return source.SubscribeSafe(observer, _ =>
                             {
-                                frame = new Bno055DataFrame(clock, (Bno055DataPayload*)dataPtr);
-                            }
-                        });
+                                Bno055DataFrame frame = default;
+                                device.Context.EnsureContext(() =>
+                                {
+                                    var data = i2c.ReadBytes(NeuropixelsV2eBno055.DataAddress, sizeof(Bno055DataPayload));
+                                    ulong clock = passthrough.ReadRegister(DS90UB9x.LASTI2CL);
+                                    clock += (ulong)passthrough.ReadRegister(DS90UB9x.LASTI2CH) << 32;
+                                    fixed (byte* dataPtr = data)
+                                    {
+                                        frame = new Bno055DataFrame(clock, (Bno055DataPayload*)dataPtr);
+                                    }
+                                });
 
-                        if (frame != null)
-                        {
-                            observer.OnNext(frame);
-                        }
-                    });
-                }));
+                                if (frame != null)
+                                {
+                                    observer.OnNext(frame);
+                                }
+                            });
+                        });
+                });
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public override IObservable<ContextTask> Process(IObservable<ContextTask> source`
`51`	`51`	`var device = context.GetPassthroughDeviceContext(deviceAddress, typeof(DS90UB9x));`
`52`	`52`	`ConfigureDeserializer(device);`
`53`	`53`	`ConfigureBno055(device);`
`54`		`- var deviceInfo = new DeviceInfo(context, DeviceType, deviceAddress);`
	`54`	`+ var deviceInfo = new NeuropixelsV1eBno055DeviceInfo(context, DeviceType, deviceAddress, enable);`
`55`	`55`	`return DeviceManager.RegisterDevice(deviceName, deviceInfo);`
`56`	`56`	`});`
`57`	`57`	`}`
`@@ -91,4 +91,15 @@ public NameConverter()`
`91`	`91`	`}`
`92`	`92`	`}`
`93`	`93`	`}`
	`94`	`+`
	`95`	`+ class NeuropixelsV1eBno055DeviceInfo : DeviceInfo`
	`96`	`+ {`
	`97`	`+ public NeuropixelsV1eBno055DeviceInfo(ContextTask context, Type deviceType, uint deviceAddress, bool enable)`
	`98`	`+ : base(context, deviceType, deviceAddress)`
	`99`	`+ {`
	`100`	`+ Enable = enable;`
	`101`	`+ }`
	`102`	`+`
	`103`	`+ public bool Enable { get; }`
	`104`	`+ }`
`94`	`105`	`}`