Merge pull request #26 from open-ephys-plugins/issue-23

Add enable/disable button to BNO055 interface

Author: bparks13

Source/Devices/Bno055.cpp

@@ -93,9 +93,11 @@ Bno055::~Bno055()
 
 int Bno055::configureDevice()
 {
-	oni_write_reg(ctx, deviceIdx, (uint32_t)Bno055Registers::ENABLE, (uint32_t)1);
+	int result = oni_write_reg(ctx, deviceIdx, (uint32_t)Bno055Registers::ENABLE, isEnabled() ? (oni_reg_val_t)1 : (oni_reg_val_t)0);
 
-	return 0;
+	if (result != ONI_ESUCCESS) LOGE(oni_error_str(result));
+
+	return result;
 }
 
 int Bno055::updateSettings()

Source/Devices/Neuropixels_1.cpp

@@ -303,7 +303,7 @@ int Neuropixels_1::configureDevice()
 
 	// Enable device streaming
 	const oni_reg_addr_t enable_device_stream = 0x8000;
-	errorCode = oni_write_reg(ctx, deviceIdx, enable_device_stream, 1);
+	errorCode = oni_write_reg(ctx, deviceIdx, enable_device_stream, isEnabled() ? (oni_reg_val_t)1 : (oni_reg_val_t)0);
 
 	if (errorCode) { LOGE(oni_error_str(errorCode)); return -2; }
 

Source/OnixSource.cpp

@@ -87,8 +87,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 	}
 	oni_set_opt(ctx, ONIX_OPT_PASSTHROUGH, &val, sizeof(val));
 
-	val = 1;
-	oni_set_opt(ctx, ONI_OPT_RESET, &val, sizeof(val));
+	context.issueReset();
 
 	// Examine device table
 	size_t num_devs_sz = sizeof(num_devs);
@@ -138,7 +137,6 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 	static const String probeLetters = "ABCDEFGHI";
 	const int bufferSizeInSeconds = 10;
 	int npxProbeIdx = 0;
-	int bnoIdx = 0;
 
 	for (size_t dev_idx = 0; dev_idx < num_devs; dev_idx++)
 	{
@@ -176,7 +174,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 		}
 		else if (devices[dev_idx].id == ONIX_BNO055)
 		{
-			auto bno = std::make_unique<Bno055>("BNO-" + String::charToString(probeLetters[bnoIdx]), devices[dev_idx].idx, ctx);
+			auto bno = std::make_unique<Bno055>("BNO055", devices[dev_idx].idx, ctx);
 
 			int result = bno->configureDevice();
 
@@ -189,8 +187,6 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			bno->addSourceBuffers(sourceBuffers);
 
 			sources.add(bno.release());
-
-			bnoIdx++;
 		}
 		else if (devices[dev_idx].id == ONIX_DS90UB9RAW)
 		{
@@ -225,8 +221,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 		}
 	}
 
-	val = 1;
-	oni_set_opt(ctx, ONI_OPT_RESET, &val, sizeof(val));
+	context.issueReset();
 
 	oni_size_t frame_size = 0;
 	size_t frame_size_sz = sizeof(frame_size);
@@ -490,9 +485,7 @@ bool OnixSource::stopAcquisition()
 			return false;
 		}
 
-		uint32_t val = 1;
-		oni_set_opt(context.get(), ONI_OPT_RESET, &val, sizeof(val));
-		oni_set_opt(context.get(), ONI_OPT_BLOCKREADSIZE, &block_read_size, sizeof(block_read_size));
+		context.issueReset();
 	}
 
 	for (auto source : sources)

Source/OnixSource.h

@@ -63,6 +63,12 @@ class Onix1
 
 	oni_ctx get() const { return ctx; }
 
+	int issueReset() const
+	{
+		int val = 1;
+		return oni_set_opt(ctx, ONI_OPT_RESET, &val, sizeof(val));
+	}
+
 private:
 
 	/** The ONI context object */
@@ -123,6 +129,8 @@ class OnixSource : public DataThread
 
 	void initializeContext();
 
+	int resetContext() { return context.issueReset(); }
+
 	void initializeDevices(bool updateStreamInfo = false);
 
 	void disconnectDevices(bool updateStreamInfo = false);

Source/OnixSourceCanvas.cpp

@@ -183,6 +183,11 @@ void OnixSourceCanvas::resized()
 	topLevelTabComponent->setBounds(0, -3, getWidth(), getHeight() + 3);
 }
 
+int OnixSourceCanvas::resetContext()
+{
+	return onixSource->resetContext();
+}
+
 void OnixSourceCanvas::startAcquisition()
 {
 	for (auto settingsInterface : settingsInterfaces)

Source/OnixSourceCanvas.h

@@ -137,6 +137,8 @@ class OnixSourceCanvas : public Visualizer
 
 	OwnedArray<SettingsInterface> settingsInterfaces;
 
+	int resetContext();
+
 private:
 
 	Array<OnixDevice*> dataSources;

Source/PortController.cpp

@@ -85,7 +85,7 @@ bool PortController::setVoltage(oni_ctx ctx, float voltage) const
 	sleep_for(std::chrono::milliseconds(500));
 
 	auto val = 1;
-	ONI_OK_RETURN_BOOL(oni_set_opt(ctx, ONI_OPT_RESET, &val, sizeof(val)));
+	oni_set_opt(ctx, ONI_OPT_RESET, &val, sizeof(val));
 
 	sleep_for(std::chrono::milliseconds(200));
 

Source/UI/Bno055Interface.cpp

@@ -24,19 +24,44 @@
 #include "Bno055Interface.h"
 
 Bno055Interface::Bno055Interface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c) :
-	SettingsInterface(d, e,c),
+	SettingsInterface(d, e, c),
 	device((Bno055*)d)
 {
 	if (device != nullptr)
 	{
-		// TODO: Show something in the canvas that indicates the device is connected
+		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
+		deviceEnableButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
+		deviceEnableButton->setRadius(3.0f);
+		deviceEnableButton->setBounds(35, 35, 100, 22);
+		deviceEnableButton->setClickingTogglesState(true);
+		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton->setTooltip("If disabled, BNO055 device will not stream data during acquisition");
+		deviceEnableButton->addListener(this);
+		addAndMakeVisible(deviceEnableButton.get());
 	}
 
 	type = SettingsInterface::Type::BNO055_SETTINGS_INTERFACE;
 }
 
-Bno055Interface::~Bno055Interface()
+void Bno055Interface::buttonClicked(Button* button)
 {
+	if (button == deviceEnableButton.get())
+	{
+		device->setEnabled(deviceEnableButton->getToggleState());
+		device->enableDevice();
+		canvas->resetContext();
+
+		if (device->isEnabled())
+		{
+			deviceEnableButton->setLabel("ENABLED");
+		}
+		else
+		{
+			deviceEnableButton->setLabel("DISABLED");
+		}
+
+		CoreServices::updateSignalChain(editor);
+	}
 }
 
 void Bno055Interface::startAcquisition()
@@ -54,7 +79,3 @@ void Bno055Interface::saveParameters(XmlElement* xml)
 void Bno055Interface::loadParameters(XmlElement* xml)
 {
 }
-
-void Bno055Interface::updateInfoString()
-{
-}

Source/UI/Bno055Interface.h

@@ -31,15 +31,13 @@
 
 #include "../Devices/Bno055.h"
 
-class Bno055Interface : public SettingsInterface
+class Bno055Interface : public SettingsInterface,
+	public Button::Listener
 {
 public:
 	/** Constructor */
 	Bno055Interface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c);
 
-	/** Destructor */
-	~Bno055Interface();
-
 	/** Disables buttons and starts animation if necessary */
 	void startAcquisition() override;
 
@@ -53,12 +51,16 @@ class Bno055Interface : public SettingsInterface
 	void loadParameters(XmlElement* xml) override;
 
 	/** Updates the info string on the right-hand side of the component */
-	void updateInfoString() override;
+	void updateInfoString() override {};
 
-	Bno055* device;
+	/** Listener methods*/
+	void buttonClicked(Button*) override;
 
 private:
 
+	Bno055* device;
+
+	std::unique_ptr<UtilityButton> deviceEnableButton;
 };
 
 #endif // !__BNO055INTERFACE_H__