From 75db2b20800ba3856b3f2a984533f329fd89cb7b Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Fri, 7 Mar 2025 12:18:39 -0500
Subject: [PATCH 01/25] Add MemoryMonitor device and interface

---
 Source/Devices/Bno055.cpp            |   3 +-
 Source/Devices/DeviceList.h          |   1 +
 Source/Devices/MemoryMonitor.cpp     | 149 +++++++++++++++++++++++++++
 Source/Devices/MemoryMonitor.h       |  98 ++++++++++++++++++
 Source/Devices/Neuropixels_1.cpp     |   3 +-
 Source/OnixDevice.h                  |   5 +-
 Source/OnixSource.cpp                |  33 +++++-
 Source/OnixSourceCanvas.cpp          |   8 ++
 Source/UI/InterfaceList.h            |   3 +-
 Source/UI/MemoryMonitorInterface.cpp | 144 ++++++++++++++++++++++++++
 Source/UI/MemoryMonitorInterface.h   |  76 ++++++++++++++
 Source/UI/SettingsInterface.h        |   1 +
 12 files changed, 516 insertions(+), 8 deletions(-)
 create mode 100644 Source/Devices/MemoryMonitor.cpp
 create mode 100644 Source/Devices/MemoryMonitor.h
 create mode 100644 Source/UI/MemoryMonitorInterface.cpp
 create mode 100644 Source/UI/MemoryMonitorInterface.h

diff --git a/Source/Devices/Bno055.cpp b/Source/Devices/Bno055.cpp
index 61d6cca..659212c 100644
--- a/Source/Devices/Bno055.cpp
+++ b/Source/Devices/Bno055.cpp
@@ -105,6 +105,8 @@ int Bno055::updateSettings()
 
 void Bno055::startAcquisition()
 {
+	currentFrame = 0;
+	sampleNumber = 0;
 }
 
 void Bno055::stopAcquisition()
@@ -197,7 +199,6 @@ void Bno055::processFrames()
 		{
 			shouldAddToBuffer = true;
 			currentFrame = 0;
-			sampleNumber = 0;
 		}
 
 		if (shouldAddToBuffer)
diff --git a/Source/Devices/DeviceList.h b/Source/Devices/DeviceList.h
index 228ff3c..5e5b61a 100644
--- a/Source/Devices/DeviceList.h
+++ b/Source/Devices/DeviceList.h
@@ -3,3 +3,4 @@
 #include "HeadStageEEPROM.h"
 #include "Neuropixels_1.h"
 #include "Neuropixels2e.h"
+#include "MemoryMonitor.h"
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
new file mode 100644
index 0000000..b127955
--- /dev/null
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -0,0 +1,149 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "MemoryMonitor.h"
+
+MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
+	: OnixDevice(name, OnixDeviceType::MEMORYMONITOR, deviceIdx_, ctx_)
+{
+	StreamInfo percentUsedStream;
+	percentUsedStream.name = name + "-PercentUsed";
+	percentUsedStream.description = "Percent of available memory that is currently used";
+	percentUsedStream.identifier = "onix-memorymonitor.data.percentused";
+	percentUsedStream.numChannels = 1;
+	percentUsedStream.sampleRate = samplesPerSecond;
+	percentUsedStream.channelPrefix = "Percent";
+	//percentUsedStream.bitVolts = 0.195f; // Is this needed?
+	percentUsedStream.channelType = ContinuousChannel::Type::AUX;
+	streams.add(percentUsedStream);
+
+	StreamInfo bytesUsedStream;
+	bytesUsedStream.name = name + "-BytesUsed";
+	bytesUsedStream.description = "Number of bytes that are currently used";
+	bytesUsedStream.identifier = "onix-memorymonitor.data.bytesused";
+	bytesUsedStream.numChannels = 1;
+	bytesUsedStream.sampleRate = samplesPerSecond;
+	bytesUsedStream.channelPrefix = "Bytes";
+	//bytesUsedStream.bitVolts = 0.195f; // Is this needed?
+	bytesUsedStream.channelType = ContinuousChannel::Type::AUX;
+	streams.add(bytesUsedStream);
+
+	for (int i = 0; i < numFrames; i++)
+		eventCodes[i] = 0;
+}
+
+MemoryMonitor::~MemoryMonitor()
+{
+}
+
+int MemoryMonitor::enableDevice()
+{
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (uint32_t)MemoryMonitorRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0)));
+
+	return 0;
+}
+
+int MemoryMonitor::updateSettings()
+{
+	oni_reg_val_t clkHz;
+
+	ONI_OK_RETURN_INT(oni_read_reg(ctx, deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::CLK_HZ, &clkHz));
+
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::CLK_DIV, clkHz / samplesPerSecond));
+
+	ONI_OK_RETURN_INT(oni_read_reg(ctx, deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::TOTAL_MEM, &totalMemory));
+
+	return 0;
+}
+
+void MemoryMonitor::startAcquisition()
+{
+	currentFrame = 0;
+	sampleNumber = 0;
+}
+
+void MemoryMonitor::stopAcquisition()
+{
+	while (!frameArray.isEmpty())
+	{
+		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+		oni_destroy_frame(frameArray.removeAndReturn(0));
+	}
+
+	currentFrame = 0;
+	sampleNumber = 0;
+}
+
+void MemoryMonitor::addFrame(oni_frame_t* frame)
+{
+	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+	frameArray.add(frame);
+}
+
+void MemoryMonitor::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
+{
+	for (StreamInfo streamInfo : streams)
+	{
+		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
+
+		if (streamInfo.channelPrefix.equalsIgnoreCase("Percent"))
+			percentUsedBuffer = sourceBuffers.getLast();
+		else if (streamInfo.channelPrefix.equalsIgnoreCase("Bytes"))
+			bytesUsedBuffer = sourceBuffers.getLast();
+	}
+}
+
+void MemoryMonitor::processFrames()
+{
+	while (!frameArray.isEmpty())
+	{
+		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+		oni_frame_t* frame = frameArray.removeAndReturn(0);
+
+		int16_t* dataPtr = (int16_t*)frame->data;
+
+		timestamps[currentFrame] = *(uint64_t*)frame->data;
+
+		percentUsedSamples[currentFrame] = 100.0f * float(*(dataPtr + 4)) / totalMemory;
+		bytesUsedSamples[currentFrame] = float(*(dataPtr + 4)) * 4.0f;
+
+		oni_destroy_frame(frame);
+
+		sampleNumbers[currentFrame] = sampleNumber++;
+
+		currentFrame++;
+
+		if (currentFrame >= numFrames)
+		{
+			shouldAddToBuffer = true;
+			currentFrame = 0;
+		}
+
+		if (shouldAddToBuffer)
+		{
+			shouldAddToBuffer = false;
+			percentUsedBuffer->addToBuffer(percentUsedSamples, sampleNumbers, timestamps, eventCodes, numFrames);
+			bytesUsedBuffer->addToBuffer(bytesUsedSamples, sampleNumbers, timestamps, eventCodes, numFrames);
+		}
+	}
+}
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
new file mode 100644
index 0000000..a262899
--- /dev/null
+++ b/Source/Devices/MemoryMonitor.h
@@ -0,0 +1,98 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef MEMORYMONITOR_H_DEFINED
+#define MEMORYMONITOR_H_DEFINED
+
+#include "../OnixDevice.h"
+
+enum class MemoryMonitorRegisters : uint32_t
+{
+	ENABLE = 0,
+	CLK_DIV = 1,
+	CLK_HZ = 2,
+	TOTAL_MEM = 3
+};
+
+/*
+	Streams data from a MemoryMonitor device on a Breakout Board
+*/
+class MemoryMonitor : public OnixDevice
+{
+public:
+	MemoryMonitor(String name, const oni_dev_idx_t, const oni_ctx);
+
+	~MemoryMonitor();
+
+	/** Enables the device so that it is ready to stream with default settings */
+	int enableDevice() override;
+
+	/** Update the settings of the device */
+	int updateSettings() override;
+
+	/** Starts probe data streaming */
+	void startAcquisition() override;
+
+	/** Stops probe data streaming*/
+	void stopAcquisition() override;
+
+	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
+	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override;
+
+	void addFrame(oni_frame_t*) override;
+
+	void processFrames() override;
+
+	uint32_t getSamplesPerSecond() const { return samplesPerSecond; }
+
+	void setSamplesPerSecond(uint32_t samplesPerSecond_) { samplesPerSecond = samplesPerSecond_; }
+
+	DataBuffer* percentUsedBuffer = deviceBuffer;
+	DataBuffer* bytesUsedBuffer;
+
+private:
+
+	static const int numFrames = 2;
+
+	Array<oni_frame_t*, CriticalSection, numFrames> frameArray;
+
+	unsigned short currentFrame = 0;
+	int sampleNumber = 0;
+	
+	/** The frequency at which memory use is recorded in Hz. */
+	uint32_t samplesPerSecond = 10;
+
+	/** The total amount of memory, in 32-bit words, on the hardware that is available for data buffering*/
+	uint32_t totalMemory;
+
+	bool shouldAddToBuffer = false;
+
+	float percentUsedSamples[numFrames];
+	float bytesUsedSamples[numFrames];
+
+	double timestamps[numFrames];
+	int64 sampleNumbers[numFrames];
+	uint64 eventCodes[numFrames];
+};
+
+#endif
\ No newline at end of file
diff --git a/Source/Devices/Neuropixels_1.cpp b/Source/Devices/Neuropixels_1.cpp
index 79a7cfb..146f644 100644
--- a/Source/Devices/Neuropixels_1.cpp
+++ b/Source/Devices/Neuropixels_1.cpp
@@ -424,8 +424,7 @@ void Neuropixels_1::processFrames()
 		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
-		uint16_t* dataPtr;
-		dataPtr = (uint16_t*)frame->data;
+		uint16_t* dataPtr = (uint16_t*)frame->data;
 
 		auto dataclock = (unsigned char*)frame->data + 936;
 		uint64 hubClock = ((uint64_t)(*(uint16_t*)dataclock) << 48) |
diff --git a/Source/OnixDevice.h b/Source/OnixDevice.h
index 5c372a6..48bfd35 100644
--- a/Source/OnixDevice.h
+++ b/Source/OnixDevice.h
@@ -39,7 +39,7 @@
 
 #define ONI_OK(exp) {int res = exp; if (res != ONI_ESUCCESS){LOGD(oni_error_str(res));}}
 #define ONI_OK_RETURN_BOOL(exp) {int res = exp; if (res != ONI_ESUCCESS){LOGD(oni_error_str(res));return false;}}
-#define ONI_OK_RETURN_INT(exp, val) {int res = exp; if (res != ONI_ESUCCESS){LOGD(oni_error_str(res));return val;}}
+#define ONI_OK_RETURN_INT(exp) {int res = exp; if (res != ONI_ESUCCESS){LOGD(oni_error_str(res));return res;}}
 
 using namespace std::chrono;
 
@@ -54,7 +54,8 @@ enum class OnixDeviceType {
 	BNO,
 	NEUROPIXELS_1,
 	NEUROPIXELS_2,
-	ADC
+	ADC,
+	MEMORYMONITOR,
 };
 
 struct StreamInfo {
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 7d8b710..13fea05 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -30,10 +30,11 @@ OnixSource::OnixSource(SourceNode* sn) :
 	editor(NULL),
 	context()
 {
+	// TODO: Add these parameters in the registerParameters() override?
 	addBooleanParameter(Parameter::PROCESSOR_SCOPE, "passthroughA", "Passthrough", "Enables passthrough mode for e-variant headstages on Port A", false, true);
 	addBooleanParameter(Parameter::PROCESSOR_SCOPE, "passthroughB", "Passthrough", "Enables passthrough mode for e-variant headstages on Port B", false, true);
 
-	addBooleanParameter(Parameter::PROCESSOR_SCOPE, "connected", "Connect", "Connect to Onix hardware", false, true);
+	addBooleanParameter(Parameter::PROCESSOR_SCOPE, "connected", "Connect", "Connect to Onix hardware", false, true); 
 
 	if (!context.isInitialized()) { LOGE("Failed to initialize context."); return; }
 }
@@ -223,6 +224,22 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				sources.add(np2.release());
 			}
 		}
+		else if (devices[dev_idx].id == ONIX_MEMUSAGE)
+		{
+			auto memoryMonitor = std::make_unique<MemoryMonitor>("MemoryMonitor", devices[dev_idx].idx, ctx);
+
+			int result = memoryMonitor->enableDevice();
+
+			if (result != 0)
+			{
+				LOGE("Device Idx: ", devices[dev_idx].idx, " Error enabling device stream.");
+				continue;
+			}
+
+			memoryMonitor->addSourceBuffers(sourceBuffers);
+
+			sources.add(memoryMonitor.release());
+		}
 	}
 
 	val = 1;
@@ -375,13 +392,25 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 				DeviceInfo::Settings deviceSettings{
 					source->getName(),
 					"Neuropixels 2.0 Probe",
-					"neuropixels1.probe",
+					"neuropixels2.probe",
 					"0000000",
 					"imec"
 				};
 
 				deviceInfos->add(new DeviceInfo(deviceSettings));
 			}
+			else if (source->type == OnixDeviceType::MEMORYMONITOR)
+			{
+				DeviceInfo::Settings deviceSettings{
+					source->getName(),
+					"Memory Monitor",
+					"memorymonitor",
+					"0000000",
+					""
+				};
+
+				deviceInfos->add(new DeviceInfo(deviceSettings));
+			}
 
 			// add data streams and channels
 			for (StreamInfo streamInfo : source->streams)
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index ee42914..a208ec6 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -97,6 +97,14 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 			settingsInterfaces.add((SettingsInterface*)bno055Interface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(bno055Interface), true);
 
+			portTabIndex.add(portTabNumber++);
+		}
+		else if (source->type == OnixDeviceType::MEMORYMONITOR)
+		{
+			MemoryMonitorInterface* memoryMonitorInterface = new MemoryMonitorInterface(source, editor, this);
+			settingsInterfaces.add((SettingsInterface*)memoryMonitorInterface);
+			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(memoryMonitorInterface), true);
+
 			portTabIndex.add(portTabNumber++);
 		}
 	}
diff --git a/Source/UI/InterfaceList.h b/Source/UI/InterfaceList.h
index d5ac14d..1319798 100644
--- a/Source/UI/InterfaceList.h
+++ b/Source/UI/InterfaceList.h
@@ -1,3 +1,4 @@
 #include "CustomViewport.h"
 #include "NeuropixV1Interface.h"
-#include "Bno055Interface.h"
\ No newline at end of file
+#include "Bno055Interface.h"
+#include "MemoryMonitorInterface.h"
diff --git a/Source/UI/MemoryMonitorInterface.cpp b/Source/UI/MemoryMonitorInterface.cpp
new file mode 100644
index 0000000..7688f7c
--- /dev/null
+++ b/Source/UI/MemoryMonitorInterface.cpp
@@ -0,0 +1,144 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "MemoryMonitorInterface.h"
+
+MemoryMonitorInterface::MemoryMonitorInterface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c) :
+	SettingsInterface(d, e, c),
+	device((MemoryMonitor*)d)
+{
+	if (device != nullptr)
+	{
+		nameLabel = std::make_unique<Label>("MAIN", "NAME");
+		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
+		nameLabel->setBounds(625, 40, 370, 45);
+		addAndMakeVisible(nameLabel.get());
+
+		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
+		deviceEnableButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
+		deviceEnableButton->setRadius(3.0f);
+		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
+		deviceEnableButton->setClickingTogglesState(true);
+		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
+		deviceEnableButton->addListener(this);
+		addAndMakeVisible(deviceEnableButton.get());
+
+		infoLabel = std::make_unique<Label>("INFO", "INFO");
+		infoLabel->setFont(FontOptions(15.0f));
+		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
+		infoLabel->setJustificationType(Justification::topLeft);
+		addAndMakeVisible(infoLabel.get());
+
+		sampleRateLabel = std::make_unique<Label>("sampleRateLabel", "Sample Rate [Hz]");
+		sampleRateLabel->setBounds(infoLabel->getX(), infoLabel->getBottom() + 10, 130, 20);
+		addAndMakeVisible(sampleRateLabel.get());
+
+		sampleRateValue = std::make_unique<Label>("sampleRateValue", String(device->getSamplesPerSecond()));
+		sampleRateValue->setEditable(true);
+		sampleRateValue->setBounds(sampleRateLabel->getRight() + 3, sampleRateLabel->getY(), 50, 20);
+		sampleRateValue->setTooltip("Sets the sample rate of the Memory Monitor device in Hz. Must be between 1 and 1000 Hz.");
+		sampleRateValue->setColour(Label::ColourIds::backgroundColourId, Colours::lightgrey);
+		sampleRateValue->setJustificationType(Justification::centred);
+		sampleRateValue->addListener(this);
+		addAndMakeVisible(sampleRateValue.get());
+
+		updateInfoString();
+	}
+
+	type = SettingsInterface::Type::MEMORYMONITOR_SETTINGS_INTERFACE;
+}
+
+MemoryMonitorInterface::~MemoryMonitorInterface()
+{
+}
+
+void MemoryMonitorInterface::buttonClicked(Button* button)
+{
+	if (button == deviceEnableButton.get())
+	{
+		device->setEnabled(deviceEnableButton->getToggleState());
+		device->enableDevice();
+		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
+
+		if (device->isEnabled())
+		{
+			deviceEnableButton->setLabel("ENABLED");
+		}
+		else
+		{
+			deviceEnableButton->setLabel("DISABLED");
+		}
+
+		CoreServices::updateSignalChain(editor);
+	}
+}
+
+void MemoryMonitorInterface::labelTextChanged(Label* l)
+{
+	if (l == sampleRateValue.get())
+	{
+		int rate = l->getText().getIntValue();
+
+		if (rate < 1 || rate > 1000)
+		{
+			l->setText(String(device->getSamplesPerSecond()), dontSendNotification);
+			return;
+		}
+
+		device->setSamplesPerSecond((uint32_t)rate);
+	}
+}
+
+void MemoryMonitorInterface::startAcquisition()
+{
+}
+
+void MemoryMonitorInterface::stopAcquisition()
+{
+}
+
+void MemoryMonitorInterface::saveParameters(XmlElement* xml)
+{
+}
+
+void MemoryMonitorInterface::loadParameters(XmlElement* xml)
+{
+}
+
+void MemoryMonitorInterface::updateInfoString()
+{
+	String nameString, infoString;
+
+	nameString = "Breakout Board";
+
+	if (device != nullptr)
+	{
+		infoString = "Device: Memory Monitor";
+		infoString += "\n";
+		infoString += "\n";
+	}
+
+	infoLabel->setText(infoString, dontSendNotification);
+	nameLabel->setText(nameString, dontSendNotification);
+}
diff --git a/Source/UI/MemoryMonitorInterface.h b/Source/UI/MemoryMonitorInterface.h
new file mode 100644
index 0000000..32d5a73
--- /dev/null
+++ b/Source/UI/MemoryMonitorInterface.h
@@ -0,0 +1,76 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef MEMORYMONITORINTERFACE_H
+#define MEMORYMONITORINTERFACE_H
+
+#include <VisualizerEditorHeaders.h>
+
+#include "../OnixSourceEditor.h"
+#include "../OnixSourceCanvas.h"
+
+#include "../Devices/MemoryMonitor.h"
+
+class MemoryMonitorInterface : public SettingsInterface,
+	public Label::Listener,
+	public Button::Listener
+{
+public:
+
+	MemoryMonitorInterface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c);
+
+	~MemoryMonitorInterface();
+
+	/** Disables buttons and starts animation if necessary */
+	void startAcquisition() override;
+
+	/** Enables buttons and start animation if necessary */
+	void stopAcquisition() override;
+
+	/** Save parameters to XML */
+	void saveParameters(XmlElement* xml) override;
+
+	/** Load parameters from XML */
+	void loadParameters(XmlElement* xml) override;
+
+	/** Updates the info string on the right-hand side of the component */
+	void updateInfoString() override;
+
+	/** Listener methods*/
+	void buttonClicked(Button*) override;
+	void labelTextChanged(Label* l) override;
+
+	MemoryMonitor* device;
+
+private:
+
+	std::unique_ptr<Label> nameLabel;
+	std::unique_ptr<Label> infoLabel;
+
+	std::unique_ptr<Label> sampleRateLabel;
+	std::unique_ptr<Label> sampleRateValue;
+
+	std::unique_ptr<UtilityButton> deviceEnableButton;
+};
+
+#endif
diff --git a/Source/UI/SettingsInterface.h b/Source/UI/SettingsInterface.h
index 727b1fd..bc00792 100644
--- a/Source/UI/SettingsInterface.h
+++ b/Source/UI/SettingsInterface.h
@@ -45,6 +45,7 @@ class SettingsInterface : public Component
     {
         PROBE_SETTINGS_INTERFACE,
         BNO055_SETTINGS_INTERFACE,
+        MEMORYMONITOR_SETTINGS_INTERFACE,
         UNKNOWN_SETTINGS_INTERFACE
     };
 

From 86297575ce1cb2578e2054b874336b42dfcf2a79 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Mon, 10 Mar 2025 14:10:25 -0400
Subject: [PATCH 02/25] Fix merge error - Renamed enableDevice to
 configureDevice

---
 Source/Devices/MemoryMonitor.cpp     | 2 +-
 Source/Devices/MemoryMonitor.h       | 2 +-
 Source/OnixSource.cpp                | 2 +-
 Source/UI/MemoryMonitorInterface.cpp | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index b127955..abeff55 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -56,7 +56,7 @@ MemoryMonitor::~MemoryMonitor()
 {
 }
 
-int MemoryMonitor::enableDevice()
+int MemoryMonitor::configureDevice()
 {
 	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (uint32_t)MemoryMonitorRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0)));
 
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index a262899..ac0ea0e 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -45,7 +45,7 @@ class MemoryMonitor : public OnixDevice
 	~MemoryMonitor();
 
 	/** Enables the device so that it is ready to stream with default settings */
-	int enableDevice() override;
+	int configureDevice() override;
 
 	/** Update the settings of the device */
 	int updateSettings() override;
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index a992ff5..1288799 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -228,7 +228,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 		{
 			auto memoryMonitor = std::make_unique<MemoryMonitor>("MemoryMonitor", devices[dev_idx].idx, ctx);
 
-			int result = memoryMonitor->enableDevice();
+			int result = memoryMonitor->configureDevice();
 
 			if (result != 0)
 			{
diff --git a/Source/UI/MemoryMonitorInterface.cpp b/Source/UI/MemoryMonitorInterface.cpp
index 7688f7c..a2ac820 100644
--- a/Source/UI/MemoryMonitorInterface.cpp
+++ b/Source/UI/MemoryMonitorInterface.cpp
@@ -78,7 +78,7 @@ void MemoryMonitorInterface::buttonClicked(Button* button)
 	if (button == deviceEnableButton.get())
 	{
 		device->setEnabled(deviceEnableButton->getToggleState());
-		device->enableDevice();
+		device->configureDevice();
 		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
 
 		if (device->isEnabled())

From d54612ca996977222f0993fe404c4a8c5035318e Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Mon, 10 Mar 2025 17:06:48 -0400
Subject: [PATCH 03/25] Plot the memory usage as a LevelMonitor in the editor -
 Update the pointers to be vectors of smart pointers. See issue-5 for more
 details

---
 Source/Devices/MemoryMonitor.cpp     |  50 +++++++++-
 Source/Devices/MemoryMonitor.h       |  27 ++++++
 Source/FrameReader.cpp               |   4 +-
 Source/FrameReader.h                 |   4 +-
 Source/OnixSource.cpp                |  38 ++++----
 Source/OnixSource.h                  |   6 +-
 Source/OnixSourceCanvas.cpp          |  20 ++--
 Source/OnixSourceEditor.cpp          |  34 ++++++-
 Source/OnixSourceEditor.h            |   3 +
 Source/UI/Bno055Interface.cpp        |   5 +-
 Source/UI/Bno055Interface.h          |   4 +-
 Source/UI/MemoryMonitorInterface.cpp |  15 +--
 Source/UI/MemoryMonitorInterface.h   |   4 +-
 Source/UI/NeuropixV1Interface.cpp    | 137 +++++++++++++++------------
 Source/UI/NeuropixV1Interface.h      |   4 +-
 Source/UI/ProbeBrowser.cpp           |  54 +++++++----
 Source/UI/SettingsInterface.h        |   6 +-
 17 files changed, 267 insertions(+), 148 deletions(-)

diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index abeff55..1244d4e 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -23,6 +23,42 @@
 
 #include "MemoryMonitor.h"
 
+MemoryMonitorUsage::MemoryMonitorUsage(GenericProcessor* p)
+	: LevelMonitor(p)
+{
+	device = nullptr;
+}
+
+MemoryMonitorUsage::~MemoryMonitorUsage()
+{
+}
+
+void MemoryMonitorUsage::timerCallback()
+{
+	if (device != nullptr)
+	{
+		setFillPercentage(device->getLastPercentUsedValue() / 100.0f);
+		repaint();
+	}
+}
+
+void MemoryMonitorUsage::setMemoryMonitor(std::shared_ptr<MemoryMonitor> memoryMonitor)
+{
+	device = memoryMonitor;
+}
+
+void MemoryMonitorUsage::startAcquisition()
+{
+	startTimerHz(10);
+}
+
+void MemoryMonitorUsage::stopAcquisition()
+{
+	stopTimer(); 
+	setFillPercentage(0.0f);
+	repaint();
+}
+
 MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
 	: OnixDevice(name, OnixDeviceType::MEMORYMONITOR, deviceIdx_, ctx_)
 {
@@ -33,7 +69,7 @@ MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, const
 	percentUsedStream.numChannels = 1;
 	percentUsedStream.sampleRate = samplesPerSecond;
 	percentUsedStream.channelPrefix = "Percent";
-	//percentUsedStream.bitVolts = 0.195f; // Is this needed?
+	percentUsedStream.bitVolts = 1.0f;
 	percentUsedStream.channelType = ContinuousChannel::Type::AUX;
 	streams.add(percentUsedStream);
 
@@ -44,7 +80,7 @@ MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, const
 	bytesUsedStream.numChannels = 1;
 	bytesUsedStream.sampleRate = samplesPerSecond;
 	bytesUsedStream.channelPrefix = "Bytes";
-	//bytesUsedStream.bitVolts = 0.195f; // Is this needed?
+	bytesUsedStream.bitVolts = 1.0f;
 	bytesUsedStream.channelType = ContinuousChannel::Type::AUX;
 	streams.add(bytesUsedStream);
 
@@ -80,6 +116,7 @@ void MemoryMonitor::startAcquisition()
 {
 	currentFrame = 0;
 	sampleNumber = 0;
+	lastPercentUsedValue = 0.0f;
 }
 
 void MemoryMonitor::stopAcquisition()
@@ -120,12 +157,15 @@ void MemoryMonitor::processFrames()
 		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
-		int16_t* dataPtr = (int16_t*)frame->data;
+		uint32_t* dataPtr = (uint32_t*)frame->data;
 
 		timestamps[currentFrame] = *(uint64_t*)frame->data;
 
-		percentUsedSamples[currentFrame] = 100.0f * float(*(dataPtr + 4)) / totalMemory;
-		bytesUsedSamples[currentFrame] = float(*(dataPtr + 4)) * 4.0f;
+		percentUsedSamples[currentFrame] = 100.0f * float(*(dataPtr + 2)) / totalMemory;
+
+		lastPercentUsedValue = percentUsedSamples[currentFrame];
+
+		bytesUsedSamples[currentFrame] = float(*(dataPtr + 2)) * 4.0f;
 
 		oni_destroy_frame(frame);
 
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index ac0ea0e..0908626 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -70,6 +70,8 @@ class MemoryMonitor : public OnixDevice
 	DataBuffer* percentUsedBuffer = deviceBuffer;
 	DataBuffer* bytesUsedBuffer;
 
+	float getLastPercentUsedValue() { return lastPercentUsedValue; }
+
 private:
 
 	static const int numFrames = 2;
@@ -93,6 +95,31 @@ class MemoryMonitor : public OnixDevice
 	double timestamps[numFrames];
 	int64 sampleNumbers[numFrames];
 	uint64 eventCodes[numFrames];
+
+	std::atomic<float> lastPercentUsedValue = 0.0f;
+};
+
+/*
+	Tracks the MemoryMonitor usage while data acquisition is running
+*/
+class MemoryMonitorUsage : public LevelMonitor
+{
+public:
+	MemoryMonitorUsage(GenericProcessor*);
+
+	~MemoryMonitorUsage();
+
+	void timerCallback() override;
+
+	void setMemoryMonitor(std::shared_ptr<MemoryMonitor> memoryMonitor);
+
+	void startAcquisition();
+
+	void stopAcquisition();
+
+private:
+
+	std::shared_ptr<MemoryMonitor> device;
 };
 
 #endif
\ No newline at end of file
diff --git a/Source/FrameReader.cpp b/Source/FrameReader.cpp
index 6b902bb..c6c2349 100644
--- a/Source/FrameReader.cpp
+++ b/Source/FrameReader.cpp
@@ -23,7 +23,7 @@
 
 #include "FrameReader.h"
 
-FrameReader::FrameReader(OwnedArray<OnixDevice>& sources_, oni_ctx ctx_)
+FrameReader::FrameReader(std::vector<std::shared_ptr<OnixDevice>> sources_, oni_ctx ctx_)
 	: Thread("FrameReader"),
 	sources(sources_),
 	ctx(ctx_)
@@ -56,7 +56,7 @@ void FrameReader::run()
 
 		bool destroyFrame = true;
 
-		for (auto source : sources)
+		for (const auto& source : sources)
 		{
 			if (frame->dev_idx == source->getDeviceIdx())
 			{
diff --git a/Source/FrameReader.h b/Source/FrameReader.h
index db21fdf..18572a4 100644
--- a/Source/FrameReader.h
+++ b/Source/FrameReader.h
@@ -32,7 +32,7 @@
 class FrameReader : public Thread
 {
 public:
-	FrameReader(OwnedArray<OnixDevice>& sources_, oni_ctx ctx_);
+	FrameReader(std::vector<std::shared_ptr<OnixDevice>> sources_, oni_ctx ctx_);
 
 	~FrameReader();
 
@@ -40,7 +40,7 @@ class FrameReader : public Thread
 
 private:
 
-	OwnedArray<OnixDevice>& sources;
+	std::vector<std::shared_ptr<OnixDevice>> sources;
 	oni_ctx ctx;
 };
 
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 1288799..4a29b3d 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -55,7 +55,7 @@ std::unique_ptr<GenericEditor> OnixSource::createEditor(SourceNode* sn)
 void OnixSource::disconnectDevices(bool updateStreamInfo)
 {
 	sourceBuffers.clear(true);
-	sources.clear(true);
+	sources.clear();
 	devicesFound = false;
 
 	if (updateStreamInfo) CoreServices::updateSignalChain(editor);
@@ -145,7 +145,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 	{
 		if (devices[dev_idx].id == ONIX_NEUROPIX1R0)
 		{
-			auto np1 = std::make_unique<Neuropixels_1>("Probe-" + String::charToString(probeLetters[npxProbeIdx]), this, devices[dev_idx].idx, ctx);
+			auto np1 = std::make_shared<Neuropixels_1>("Probe-" + String::charToString(probeLetters[npxProbeIdx]), this, devices[dev_idx].idx, ctx);
 
 			int res = np1->configureDevice();
 
@@ -171,13 +171,13 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 
 			np1->addSourceBuffers(sourceBuffers);
 
-			sources.add(np1.release());
+			sources.push_back(np1);
 
 			npxProbeIdx++;
 		}
 		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_shared<Bno055>("BNO-" + String::charToString(probeLetters[bnoIdx]), devices[dev_idx].idx, ctx);
 
 			int result = bno->configureDevice();
 
@@ -189,7 +189,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 
 			bno->addSourceBuffers(sourceBuffers);
 
-			sources.add(bno.release());
+			sources.push_back(bno);
 
 			bnoIdx++;
 		}
@@ -206,7 +206,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			LOGD("Detected headstage ", hsid);
 			if (hsid == 8) //Npix2.0e headstage, constant needs to be added to onix.h
 			{
-				auto np2 = std::make_unique<Neuropixels2e>("Probe-" + String::charToString(probeLetters[npxProbeIdx]), devices[dev_idx].idx, ctx);
+				auto np2 = std::make_shared<Neuropixels2e>("Probe-" + String::charToString(probeLetters[npxProbeIdx]), devices[dev_idx].idx, ctx);
 				int res = np2->configureDevice();
 				if (res != 0)
 				{
@@ -221,12 +221,12 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 
 				np2->addSourceBuffers(sourceBuffers);
 
-				sources.add(np2.release());
+				sources.push_back(np2);
 			}
 		}
 		else if (devices[dev_idx].id == ONIX_MEMUSAGE)
 		{
-			auto memoryMonitor = std::make_unique<MemoryMonitor>("MemoryMonitor", devices[dev_idx].idx, ctx);
+			auto memoryMonitor = std::make_shared<MemoryMonitor>("MemoryMonitor", devices[dev_idx].idx, ctx);
 
 			int result = memoryMonitor->configureDevice();
 
@@ -238,7 +238,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 
 			memoryMonitor->addSourceBuffers(sourceBuffers);
 
-			sources.add(memoryMonitor.release());
+			sources.push_back(memoryMonitor);
 		}
 	}
 
@@ -262,13 +262,13 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 	LOGD("All devices initialized.");
 }
 
-Array<OnixDevice*> OnixSource::getDataSources()
+std::vector<std::shared_ptr<OnixDevice>> OnixSource::getDataSources()
 {
-	Array<OnixDevice*> devices;
+	std::vector<std::shared_ptr<OnixDevice>> devices;
 
-	for (auto source : sources)
+	for (const auto& source : sources)
 	{
-		devices.add(source);
+		devices.push_back(source);
 	}
 
 	return devices;
@@ -278,7 +278,7 @@ void OnixSource::updateSourceBuffers()
 {
 	sourceBuffers.clear(true);
 
-	for (auto source : sources)
+	for (const auto& source : sources)
 	{
 		if (source->isEnabled())
 		{
@@ -358,7 +358,7 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 
 	if (devicesFound)
 	{
-		for (auto source : sources)
+		for (const auto& source : sources)
 		{
 			if (!source->isEnabled()) continue;
 
@@ -458,7 +458,7 @@ bool OnixSource::isReady()
 	if (editor->isHeadstageSelected(PortName::PortA) && !portA.checkLinkState(context.get())) return false;
 	if (editor->isHeadstageSelected(PortName::PortB) && !portB.checkLinkState(context.get())) return false;
 
-	for (auto source : sources)
+	for (const auto& source : sources)
 	{
 		if (!source->isEnabled()) continue;
 
@@ -489,7 +489,7 @@ bool OnixSource::startAcquisition()
 	frameReader = std::make_unique<FrameReader>(sources, context.get());
 	frameReader->startThread();
 
-	for (auto source : sources)
+	for (const auto& source : sources)
 	{
 		if (!source->isEnabled()) continue;
 
@@ -524,7 +524,7 @@ bool OnixSource::stopAcquisition()
 		oni_set_opt(context.get(), ONI_OPT_BLOCKREADSIZE, &block_read_size, sizeof(block_read_size));
 	}
 
-	for (auto source : sources)
+	for (const auto& source : sources)
 	{
 		if (!source->isEnabled()) continue;
 
@@ -539,7 +539,7 @@ bool OnixSource::stopAcquisition()
 
 bool OnixSource::updateBuffer()
 {
-	for (auto source : sources)
+	for (const auto& source : sources)
 	{
 		if (!source->isEnabled()) continue;
 
diff --git a/Source/OnixSource.h b/Source/OnixSource.h
index 4ffc36d..b29744c 100644
--- a/Source/OnixSource.h
+++ b/Source/OnixSource.h
@@ -121,13 +121,11 @@ class OnixSource : public DataThread
 	/** Sets the port voltage */
 	bool setPortVoltage(PortName port, float voltage) const;
 
-	void initializeContext();
-
 	void initializeDevices(bool updateStreamInfo = false);
 
 	void disconnectDevices(bool updateStreamInfo = false);
 
-	Array<OnixDevice*> getDataSources();
+	std::vector<std::shared_ptr<OnixDevice>> getDataSources();
 
 	void updateSourceBuffers();
 
@@ -142,7 +140,7 @@ class OnixSource : public DataThread
 private:
 
 	/** Available data sources */
-	OwnedArray<OnixDevice> sources;
+	std::vector<std::shared_ptr<OnixDevice>> sources;
 
 	/** Pointer to the editor */
 	OnixSourceEditor* editor;
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index a208ec6..1584693 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -77,15 +77,15 @@ Parameter* OnixSourceCanvas::getSourceParameter(String name)
 
 void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 {
-	Array<OnixDevice*> availableDataSources = onixSource->getDataSources();
+	auto availableDataSources = onixSource->getDataSources();
 
 	int portTabNumber = 0;
 
-	for (auto source : availableDataSources)
+	for (const auto& source : availableDataSources)
 	{
 		if (source->type == OnixDeviceType::NEUROPIXELS_1)
 		{
-			NeuropixV1Interface* neuropixInterface = new NeuropixV1Interface(source, editor, this);
+			NeuropixV1Interface* neuropixInterface = new NeuropixV1Interface(std::static_pointer_cast<Neuropixels_1>(source), editor, this);
 			settingsInterfaces.add((SettingsInterface*)neuropixInterface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(neuropixInterface), true);
 
@@ -93,7 +93,7 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 		}
 		else if (source->type == OnixDeviceType::BNO)
 		{
-			Bno055Interface* bno055Interface = new Bno055Interface(source, editor, this);
+			Bno055Interface* bno055Interface = new Bno055Interface(std::static_pointer_cast<Bno055>(source), editor, this);
 			settingsInterfaces.add((SettingsInterface*)bno055Interface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(bno055Interface), true);
 
@@ -101,7 +101,7 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 		}
 		else if (source->type == OnixDeviceType::MEMORYMONITOR)
 		{
-			MemoryMonitorInterface* memoryMonitorInterface = new MemoryMonitorInterface(source, editor, this);
+			MemoryMonitorInterface* memoryMonitorInterface = new MemoryMonitorInterface(std::static_pointer_cast<MemoryMonitor>(source), editor, this);
 			settingsInterfaces.add((SettingsInterface*)memoryMonitorInterface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(memoryMonitorInterface), true);
 
@@ -174,10 +174,8 @@ void OnixSourceCanvas::update()
 
 				if (v != nullptr)
 				{
-					OnixDevice* device = v->settingsInterface->dataSource;
-
-					if (device != nullptr)
-						t->setTabName(j, " " + device->getName() + " ");
+					if (v->settingsInterface->device != nullptr)
+						t->setTabName(j, " " + v->settingsInterface->device->getName() + " ");
 					else
 						t->setTabName(j, "");
 				}
@@ -195,7 +193,7 @@ void OnixSourceCanvas::startAcquisition()
 {
 	for (auto settingsInterface : settingsInterfaces)
 	{
-		if (settingsInterface->dataSource != nullptr && settingsInterface->dataSource->isEnabled())
+		if (settingsInterface->device != nullptr && settingsInterface->device->isEnabled())
 		{
 			settingsInterface->startAcquisition();
 		}
@@ -206,7 +204,7 @@ void OnixSourceCanvas::stopAcquisition()
 {
 	for (auto settingsInterface : settingsInterfaces)
 	{
-		if (settingsInterface->dataSource != nullptr && settingsInterface->dataSource->isEnabled())
+		if (settingsInterface->device != nullptr && settingsInterface->device->isEnabled())
 		{
 			settingsInterface->stopAcquisition();
 		}
diff --git a/Source/OnixSourceEditor.cpp b/Source/OnixSourceEditor.cpp
index a98e5c3..7327006 100644
--- a/Source/OnixSourceEditor.cpp
+++ b/Source/OnixSourceEditor.cpp
@@ -25,15 +25,20 @@
 #include "OnixSource.h"
 
 OnixSourceEditor::OnixSourceEditor(GenericProcessor* parentNode, OnixSource* onixSource)
-	: VisualizerEditor(parentNode, "Onix Source", 200), thread(onixSource)
+	: VisualizerEditor(parentNode, "Onix Source", 220), thread(onixSource)
 {
 	canvas = nullptr;
 
 	FontOptions fontOptionSmall = FontOptions("Fira Code", "Regular", 12.0f);
 	FontOptions fontOptionTitle = FontOptions("Fira Code", "Bold", 15.0f);
 
+	memoryUsage = std::make_unique<MemoryMonitorUsage>(parentNode);
+	memoryUsage->setBounds(10, 30, 15, 95);
+	memoryUsage->setTooltip("Monitors the percent of the hardware memory buffer used.");
+	addAndMakeVisible(memoryUsage.get());
+
 	portLabelA = std::make_unique<Label>("portLabelA", "Port A:");
-	portLabelA->setBounds(4, 25, 60, 16);
+	portLabelA->setBounds(memoryUsage->getRight() + 5, memoryUsage->getY(), 60, 16);
 	portLabelA->setFont(fontOptionTitle);
 	addAndMakeVisible(portLabelA.get());
 
@@ -66,7 +71,7 @@ OnixSourceEditor::OnixSourceEditor(GenericProcessor* parentNode, OnixSource* oni
 	addAndMakeVisible(portVoltageValueA.get());
 
 	portLabelB = std::make_unique<Label>("portLabelB", "Port B:");
-	portLabelB->setBounds(portLabelA->getX(), portVoltageOverrideLabelA->getBottom() + 5, portLabelA->getWidth(), portLabelA->getHeight());
+	portLabelB->setBounds(portLabelA->getX(), portVoltageOverrideLabelA->getBottom() + 3, portLabelA->getWidth(), portLabelA->getHeight());
 	portLabelB->setFont(fontOptionTitle);
 	addAndMakeVisible(portLabelB.get());
 
@@ -100,7 +105,7 @@ OnixSourceEditor::OnixSourceEditor(GenericProcessor* parentNode, OnixSource* oni
 
 	connectButton = std::make_unique<UtilityButton>("CONNECT");
 	connectButton->setFont(fontOptionSmall);
-	connectButton->setBounds(portLabelB->getX() + 5, portLabelB->getBottom() + 25, 70, 18);
+	connectButton->setBounds(portLabelB->getX() + 5, portVoltageOverrideLabelB->getBottom() + 3, 70, 18);
 	connectButton->setRadius(3.0f);
 	connectButton->setClickingTogglesState(true);
 	connectButton->setToggleState(false, dontSendNotification);
@@ -219,12 +224,33 @@ void OnixSourceEditor::updateSettings()
 
 void OnixSourceEditor::startAcquisition()
 {
+	// TODO: Disable all UI elements that should not be changed during acquisition...
 	connectButton->setEnabled(false);
+
+	for (const auto& source : thread->getDataSources())
+	{
+		if (source->type == OnixDeviceType::MEMORYMONITOR)
+		{
+			memoryUsage->setMemoryMonitor(std::static_pointer_cast<MemoryMonitor>(source));
+			memoryUsage->startAcquisition();
+			break;
+		}
+	}
 }
 
 void OnixSourceEditor::stopAcquisition()
 {
+  // TODO: Re-enable all of the UI elements 
 	connectButton->setEnabled(true);
+
+	for (const auto& source : thread->getDataSources())
+	{
+		if (source->type == OnixDeviceType::MEMORYMONITOR)
+		{
+			memoryUsage->stopAcquisition();
+			break;
+		}
+	}
 }
 
 Visualizer* OnixSourceEditor::createNewCanvas(void)
diff --git a/Source/OnixSourceEditor.h b/Source/OnixSourceEditor.h
index 3c704ff..038c756 100644
--- a/Source/OnixSourceEditor.h
+++ b/Source/OnixSourceEditor.h
@@ -28,6 +28,7 @@
 
 #include "OnixSourceCanvas.h"
 #include "NeuropixComponents.h"
+#include "Devices/MemoryMonitor.h"
 
 class OnixSource;
 
@@ -96,6 +97,8 @@ class OnixSourceEditor : public VisualizerEditor,
 
     std::unique_ptr<UtilityButton> connectButton;
 
+    std::unique_ptr<MemoryMonitorUsage> memoryUsage;
+
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OnixSourceEditor);
 };
 
diff --git a/Source/UI/Bno055Interface.cpp b/Source/UI/Bno055Interface.cpp
index f635c4e..26e16fd 100644
--- a/Source/UI/Bno055Interface.cpp
+++ b/Source/UI/Bno055Interface.cpp
@@ -23,9 +23,8 @@
 
 #include "Bno055Interface.h"
 
-Bno055Interface::Bno055Interface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c) :
-	SettingsInterface(d, e,c),
-	device((Bno055*)d)
+Bno055Interface::Bno055Interface(std::shared_ptr<Bno055> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
+	SettingsInterface(d, e,c)
 {
 	if (device != nullptr)
 	{
diff --git a/Source/UI/Bno055Interface.h b/Source/UI/Bno055Interface.h
index 28eb7b6..e6acd5f 100644
--- a/Source/UI/Bno055Interface.h
+++ b/Source/UI/Bno055Interface.h
@@ -35,7 +35,7 @@ class Bno055Interface : public SettingsInterface
 {
 public:
 	/** Constructor */
-	Bno055Interface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c);
+	Bno055Interface(std::shared_ptr<Bno055> d, OnixSourceEditor* e, OnixSourceCanvas* c);
 
 	/** Destructor */
 	~Bno055Interface();
@@ -55,8 +55,6 @@ class Bno055Interface : public SettingsInterface
 	/** Updates the info string on the right-hand side of the component */
 	void updateInfoString() override;
 
-	Bno055* device;
-
 private:
 
 };
diff --git a/Source/UI/MemoryMonitorInterface.cpp b/Source/UI/MemoryMonitorInterface.cpp
index a2ac820..a6d1463 100644
--- a/Source/UI/MemoryMonitorInterface.cpp
+++ b/Source/UI/MemoryMonitorInterface.cpp
@@ -23,15 +23,14 @@
 
 #include "MemoryMonitorInterface.h"
 
-MemoryMonitorInterface::MemoryMonitorInterface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c) :
-	SettingsInterface(d, e, c),
-	device((MemoryMonitor*)d)
+MemoryMonitorInterface::MemoryMonitorInterface(std::shared_ptr<MemoryMonitor> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
+	SettingsInterface(d, e, c)
 {
 	if (device != nullptr)
 	{
 		nameLabel = std::make_unique<Label>("MAIN", "NAME");
 		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
-		nameLabel->setBounds(625, 40, 370, 45);
+		nameLabel->setBounds(50, 40, 370, 45);
 		addAndMakeVisible(nameLabel.get());
 
 		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
@@ -54,7 +53,7 @@ MemoryMonitorInterface::MemoryMonitorInterface(OnixDevice* d, OnixSourceEditor*
 		sampleRateLabel->setBounds(infoLabel->getX(), infoLabel->getBottom() + 10, 130, 20);
 		addAndMakeVisible(sampleRateLabel.get());
 
-		sampleRateValue = std::make_unique<Label>("sampleRateValue", String(device->getSamplesPerSecond()));
+		sampleRateValue = std::make_unique<Label>("sampleRateValue", String(std::static_pointer_cast<MemoryMonitor>(device)->getSamplesPerSecond()));
 		sampleRateValue->setEditable(true);
 		sampleRateValue->setBounds(sampleRateLabel->getRight() + 3, sampleRateLabel->getY(), 50, 20);
 		sampleRateValue->setTooltip("Sets the sample rate of the Memory Monitor device in Hz. Must be between 1 and 1000 Hz.");
@@ -98,15 +97,17 @@ void MemoryMonitorInterface::labelTextChanged(Label* l)
 {
 	if (l == sampleRateValue.get())
 	{
+		auto d = std::static_pointer_cast<MemoryMonitor>(device);
+
 		int rate = l->getText().getIntValue();
 
 		if (rate < 1 || rate > 1000)
 		{
-			l->setText(String(device->getSamplesPerSecond()), dontSendNotification);
+			l->setText(String(d->getSamplesPerSecond()), dontSendNotification);
 			return;
 		}
 
-		device->setSamplesPerSecond((uint32_t)rate);
+		d->setSamplesPerSecond((uint32_t)rate);
 	}
 }
 
diff --git a/Source/UI/MemoryMonitorInterface.h b/Source/UI/MemoryMonitorInterface.h
index 32d5a73..ab18cc7 100644
--- a/Source/UI/MemoryMonitorInterface.h
+++ b/Source/UI/MemoryMonitorInterface.h
@@ -37,7 +37,7 @@ class MemoryMonitorInterface : public SettingsInterface,
 {
 public:
 
-	MemoryMonitorInterface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c);
+	MemoryMonitorInterface(std::shared_ptr<MemoryMonitor> d, OnixSourceEditor* e, OnixSourceCanvas* c);
 
 	~MemoryMonitorInterface();
 
@@ -60,8 +60,6 @@ class MemoryMonitorInterface : public SettingsInterface,
 	void buttonClicked(Button*) override;
 	void labelTextChanged(Label* l) override;
 
-	MemoryMonitor* device;
-
 private:
 
 	std::unique_ptr<Label> nameLabel;
diff --git a/Source/UI/NeuropixV1Interface.cpp b/Source/UI/NeuropixV1Interface.cpp
index 414011f..324caba 100644
--- a/Source/UI/NeuropixV1Interface.cpp
+++ b/Source/UI/NeuropixV1Interface.cpp
@@ -26,9 +26,8 @@
 
 #include "../Formats/ProbeInterface.h"
 
-NeuropixV1Interface::NeuropixV1Interface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c) :
+NeuropixV1Interface::NeuropixV1Interface(std::shared_ptr<Neuropixels_1> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
 	SettingsInterface(d, e, c),
-	device((Neuropixels_1*)d),
 	neuropix_info("INFO")
 {
 	ColourScheme::setColourScheme(ColourSchemeId::PLASMA);
@@ -94,9 +93,11 @@ NeuropixV1Interface::NeuropixV1Interface(OnixDevice* d, OnixSourceEditor* e, Oni
 		electrodeConfigurationComboBox->setItemEnabled(1, false);
 		electrodeConfigurationComboBox->addSeparator();
 
-		for (int i = 0; i < device->settings.availableElectrodeConfigurations.size(); i++)
+		auto npx = std::static_pointer_cast<Neuropixels_1>(device);
+
+		for (int i = 0; i < npx->settings.availableElectrodeConfigurations.size(); i++)
 		{
-			electrodeConfigurationComboBox->addItem(device->settings.availableElectrodeConfigurations[i], i + 2);
+			electrodeConfigurationComboBox->addItem(npx->settings.availableElectrodeConfigurations[i], i + 2);
 		}
 
 		electrodeConfigurationComboBox->setSelectedId(1, dontSendNotification);
@@ -105,16 +106,16 @@ NeuropixV1Interface::NeuropixV1Interface(OnixDevice* d, OnixSourceEditor* e, Oni
 
 		currentHeight += 55;
 
-		if (device->settings.availableApGains.size() > 0)
+		if (npx->settings.availableApGains.size() > 0)
 		{
 			apGainComboBox = std::make_unique<ComboBox>("apGainComboBox");
 			apGainComboBox->setBounds(450, currentHeight, 65, 22);
 			apGainComboBox->addListener(this);
 
-			for (int i = 0; i < device->settings.availableApGains.size(); i++)
-				apGainComboBox->addItem(String(device->settings.availableApGains[i]) + "x", i + 1);
+			for (int i = 0; i < npx->settings.availableApGains.size(); i++)
+				apGainComboBox->addItem(String(npx->settings.availableApGains[i]) + "x", i + 1);
 
-			apGainComboBox->setSelectedId(device->settings.apGainIndex + 1, dontSendNotification);
+			apGainComboBox->setSelectedId(npx->settings.apGainIndex + 1, dontSendNotification);
 			addAndMakeVisible(apGainComboBox.get());
 
 			apGainViewButton = std::make_unique<UtilityButton>("VIEW");
@@ -133,16 +134,16 @@ NeuropixV1Interface::NeuropixV1Interface(OnixDevice* d, OnixSourceEditor* e, Oni
 			currentHeight += 55;
 		}
 
-		if (device->settings.availableLfpGains.size() > 0)
+		if (npx->settings.availableLfpGains.size() > 0)
 		{
 			lfpGainComboBox = std::make_unique<ComboBox>("lfpGainComboBox");
 			lfpGainComboBox->setBounds(450, currentHeight, 65, 22);
 			lfpGainComboBox->addListener(this);
 
-			for (int i = 0; i < device->settings.availableLfpGains.size(); i++)
-				lfpGainComboBox->addItem(String(device->settings.availableLfpGains[i]) + "x", i + 1);
+			for (int i = 0; i < npx->settings.availableLfpGains.size(); i++)
+				lfpGainComboBox->addItem(String(npx->settings.availableLfpGains[i]) + "x", i + 1);
 
-			lfpGainComboBox->setSelectedId(device->settings.lfpGainIndex + 1, dontSendNotification);
+			lfpGainComboBox->setSelectedId(npx->settings.lfpGainIndex + 1, dontSendNotification);
 			addAndMakeVisible(lfpGainComboBox.get());
 
 			lfpGainViewButton = std::make_unique<UtilityButton>("VIEW");
@@ -161,18 +162,18 @@ NeuropixV1Interface::NeuropixV1Interface(OnixDevice* d, OnixSourceEditor* e, Oni
 			currentHeight += 55;
 		}
 
-		if (device->settings.availableReferences.size() > 0)
+		if (npx->settings.availableReferences.size() > 0)
 		{
 			referenceComboBox = std::make_unique<ComboBox>("ReferenceComboBox");
 			referenceComboBox->setBounds(450, currentHeight, 65, 22);
 			referenceComboBox->addListener(this);
 
-			for (int i = 0; i < device->settings.availableReferences.size(); i++)
+			for (int i = 0; i < npx->settings.availableReferences.size(); i++)
 			{
-				referenceComboBox->addItem(device->settings.availableReferences[i], i + 1);
+				referenceComboBox->addItem(npx->settings.availableReferences[i], i + 1);
 			}
 
-			referenceComboBox->setSelectedId(device->settings.referenceIndex + 1, dontSendNotification);
+			referenceComboBox->setSelectedId(npx->settings.referenceIndex + 1, dontSendNotification);
 			addAndMakeVisible(referenceComboBox.get());
 
 			referenceViewButton = std::make_unique<UtilityButton>("VIEW");
@@ -216,7 +217,7 @@ NeuropixV1Interface::NeuropixV1Interface(OnixDevice* d, OnixSourceEditor* e, Oni
 
 		activityViewComboBox = std::make_unique<ComboBox>("ActivityView Combo Box");
 
-		if (device->settings.availableLfpGains.size() > 0)
+		if (npx->settings.availableLfpGains.size() > 0)
 		{
 			activityViewComboBox->setBounds(450, currentHeight, 65, 22);
 			activityViewComboBox->addListener(this);
@@ -243,12 +244,12 @@ NeuropixV1Interface::NeuropixV1Interface(OnixDevice* d, OnixSourceEditor* e, Oni
 		probeSettingsLabel->setBounds(630, 110, 150, 15);
 		addAndMakeVisible(probeSettingsLabel.get());
 
-		adcCalibrationFileEditor = std::make_unique<PathParameterEditor>(canvas->getSourceParameter(device->getAdcPathParameterName()));
+		adcCalibrationFileEditor = std::make_unique<PathParameterEditor>(canvas->getSourceParameter(npx->getAdcPathParameterName()));
 		adcCalibrationFileEditor->setLayout(ParameterEditor::nameOnTop);
 		adcCalibrationFileEditor->setBounds(635, 126, 240, 45);
 		addAndMakeVisible(adcCalibrationFileEditor.get());
 
-		gainCalibrationFileEditor = std::make_unique<PathParameterEditor>(canvas->getSourceParameter(device->getGainPathParameterName()));
+		gainCalibrationFileEditor = std::make_unique<PathParameterEditor>(canvas->getSourceParameter(npx->getGainPathParameterName()));
 		gainCalibrationFileEditor->setLayout(ParameterEditor::nameOnTop);
 		gainCalibrationFileEditor->setBounds(635, 175, 240, 45);
 		addAndMakeVisible(gainCalibrationFileEditor.get());
@@ -299,6 +300,8 @@ void NeuropixV1Interface::updateInfoString()
 
 	nameString = "Headstage: ";
 
+	auto npx = std::static_pointer_cast<Neuropixels_1>(device);
+
 	if (device != nullptr)
 	{
 		nameString += "NeuropixelsV1e";
@@ -308,7 +311,7 @@ void NeuropixV1Interface::updateInfoString()
 		infoString += "\n";
 
 		infoString += "Probe Number: ";
-		infoString += device->getProbeNumber();
+		infoString += npx->getProbeNumber();
 		infoString += "\n";
 		infoString += "\n";
 	}
@@ -319,31 +322,33 @@ void NeuropixV1Interface::updateInfoString()
 
 void NeuropixV1Interface::comboBoxChanged(ComboBox* comboBox)
 {
+	auto npx = std::static_pointer_cast<Neuropixels_1>(device);
+
 	if (!editor->acquisitionIsActive)
 	{
 		if (comboBox == electrodeConfigurationComboBox.get())
 		{
 			String preset = electrodeConfigurationComboBox->getText();
 
-			Array<int> selection = device->selectElectrodeConfiguration(preset);
+			Array<int> selection = npx->selectElectrodeConfiguration(preset);
 
 			selectElectrodes(selection);
 		}
 		else if ((comboBox == apGainComboBox.get()))
 		{
-			device->settings.apGainIndex = apGainComboBox->getSelectedItemIndex();
+			npx->settings.apGainIndex = apGainComboBox->getSelectedItemIndex();
 		}
 		else if (comboBox == lfpGainComboBox.get())
 		{
-			device->settings.lfpGainIndex = lfpGainComboBox->getSelectedItemIndex();
+			npx->settings.lfpGainIndex = lfpGainComboBox->getSelectedItemIndex();
 		}
 		else if (comboBox == referenceComboBox.get())
 		{
-			device->settings.referenceIndex = referenceComboBox->getSelectedItemIndex();
+			npx->settings.referenceIndex = referenceComboBox->getSelectedItemIndex();
 		}
 		else if (comboBox == filterComboBox.get())
 		{
-			device->settings.apFilterState = filterComboBox->getSelectedId() == 1;
+			npx->settings.apFilterState = filterComboBox->getSelectedId() == 1;
 		}
 		else if (comboBox == activityViewComboBox.get())
 		{
@@ -397,11 +402,13 @@ void NeuropixV1Interface::setAnnotationLabel(String s, Colour c)
 
 void NeuropixV1Interface::buttonClicked(Button* button)
 {
+	auto npx = std::static_pointer_cast<Neuropixels_1>(device);
+
 	if (button == probeEnableButton.get())
 	{
-		device->setEnabled(probeEnableButton->getToggleState());
+		npx->setEnabled(probeEnableButton->getToggleState());
 
-		if (device->isEnabled())
+		if (npx->isEnabled())
 		{
 			probeEnableButton->setLabel("ENABLED");
 		}
@@ -491,9 +498,11 @@ Array<int> NeuropixV1Interface::getSelectedElectrodes() const
 {
 	Array<int> electrodeIndices;
 
-	for (int i = 0; i < device->settings.electrodeMetadata.size(); i++)
+	auto npx = std::static_pointer_cast<Neuropixels_1>(device);
+
+	for (int i = 0; i < npx->settings.electrodeMetadata.size(); i++)
 	{
-		if (device->settings.electrodeMetadata[i].isSelected)
+		if (npx->settings.electrodeMetadata[i].isSelected)
 		{
 			electrodeIndices.add(i);
 		}
@@ -524,26 +533,28 @@ void NeuropixV1Interface::setApFilterState(bool state)
 
 void NeuropixV1Interface::selectElectrodes(Array<int> electrodes)
 {
+	auto npx = std::static_pointer_cast<Neuropixels_1>(device);
+
 	// update selection state
 	for (int i = 0; i < electrodes.size(); i++)
 	{
-		Bank bank = device->settings.electrodeMetadata[electrodes[i]].bank;
-		int channel = device->settings.electrodeMetadata[electrodes[i]].channel;
-		int shank = device->settings.electrodeMetadata[electrodes[i]].shank;
-		int global_index = device->settings.electrodeMetadata[electrodes[i]].global_index;
+		Bank bank = npx->settings.electrodeMetadata[electrodes[i]].bank;
+		int channel = npx->settings.electrodeMetadata[electrodes[i]].channel;
+		int shank = npx->settings.electrodeMetadata[electrodes[i]].shank;
+		int global_index = npx->settings.electrodeMetadata[electrodes[i]].global_index;
 
-		for (int j = 0; j < device->settings.electrodeMetadata.size(); j++)
+		for (int j = 0; j < npx->settings.electrodeMetadata.size(); j++)
 		{
-			if (device->settings.electrodeMetadata[j].channel == channel)
+			if (npx->settings.electrodeMetadata[j].channel == channel)
 			{
-				if (device->settings.electrodeMetadata[j].bank == bank && device->settings.electrodeMetadata[j].shank == shank)
+				if (npx->settings.electrodeMetadata[j].bank == bank && npx->settings.electrodeMetadata[j].shank == shank)
 				{
-					device->settings.electrodeMetadata.getReference(j).status = ElectrodeStatus::CONNECTED;
+					npx->settings.electrodeMetadata.getReference(j).status = ElectrodeStatus::CONNECTED;
 				}
 
 				else
 				{
-					device->settings.electrodeMetadata.getReference(j).status = ElectrodeStatus::DISCONNECTED;
+					npx->settings.electrodeMetadata.getReference(j).status = ElectrodeStatus::DISCONNECTED;
 				}
 			}
 		}
@@ -709,6 +720,8 @@ void NeuropixV1Interface::drawLegend(Graphics& g)
 
 bool NeuropixV1Interface::applyProbeSettings(ProbeSettings p, bool shouldUpdateProbe)
 {
+	auto npx = std::static_pointer_cast<Neuropixels_1>(device);
+
 	if (electrodeConfigurationComboBox != 0)
 		electrodeConfigurationComboBox->setSelectedId(p.electrodeConfigurationIndex + 2, dontSendNotification);
 
@@ -730,10 +743,10 @@ bool NeuropixV1Interface::applyProbeSettings(ProbeSettings p, bool shouldUpdateP
 	if (referenceComboBox != 0)
 		referenceComboBox->setSelectedId(p.referenceIndex + 1, dontSendNotification);
 
-	for (int i = 0; i < device->settings.electrodeMetadata.size(); i++)
+	for (int i = 0; i < npx->settings.electrodeMetadata.size(); i++)
 	{
-		if (device->settings.electrodeMetadata[i].status == ElectrodeStatus::CONNECTED)
-			device->settings.electrodeMetadata.getReference(i).status = ElectrodeStatus::DISCONNECTED;
+		if (npx->settings.electrodeMetadata[i].status == ElectrodeStatus::CONNECTED)
+			npx->settings.electrodeMetadata.getReference(i).status = ElectrodeStatus::DISCONNECTED;
 	}
 
 	// update selection state
@@ -743,11 +756,11 @@ bool NeuropixV1Interface::applyProbeSettings(ProbeSettings p, bool shouldUpdateP
 		int channel = p.selectedChannel[i];
 		int shank = p.selectedShank[i];
 
-		for (int j = 0; j < device->settings.electrodeMetadata.size(); j++)
+		for (int j = 0; j < npx->settings.electrodeMetadata.size(); j++)
 		{
-			if (device->settings.electrodeMetadata[j].channel == channel && device->settings.electrodeMetadata[j].bank == bank && device->settings.electrodeMetadata[j].shank == shank)
+			if (npx->settings.electrodeMetadata[j].channel == channel && npx->settings.electrodeMetadata[j].bank == bank && npx->settings.electrodeMetadata[j].shank == shank)
 			{
-				device->settings.electrodeMetadata.getReference(j).status = ElectrodeStatus::CONNECTED;
+				npx->settings.electrodeMetadata.getReference(j).status = ElectrodeStatus::CONNECTED;
 			}
 		}
 	}
@@ -764,20 +777,24 @@ bool NeuropixV1Interface::applyProbeSettings(ProbeSettings p, bool shouldUpdateP
 
 ProbeSettings NeuropixV1Interface::getProbeSettings() const
 {
-	return device->settings;
+	auto npx = std::static_pointer_cast<Neuropixels_1>(device);
+
+	return npx->settings;
 }
 
 void NeuropixV1Interface::saveParameters(XmlElement* xml)
 {
 	if (device != nullptr)
 	{
+		auto npx = std::static_pointer_cast<Neuropixels_1>(device);
+
 		LOGD("Saving Neuropix display.");
 
 		XmlElement* xmlNode = xml->createNewChildElement("NP_PROBE");
 
-		xmlNode->setAttribute("probe_serial_number", String(device->getProbeNumber()));
-		xmlNode->setAttribute("probe_name", device->getName());
-		xmlNode->setAttribute("num_adcs", device->settings.probeMetadata.num_adcs);
+		xmlNode->setAttribute("probe_serial_number", String(npx->getProbeNumber()));
+		xmlNode->setAttribute("probe_name", npx->getName());
+		xmlNode->setAttribute("num_adcs", npx->settings.probeMetadata.num_adcs);
 
 		xmlNode->setAttribute("ZoomHeight", probeBrowser->getZoomHeight());
 		xmlNode->setAttribute("ZoomOffset", probeBrowser->getZoomOffset());
@@ -830,20 +847,20 @@ void NeuropixV1Interface::saveParameters(XmlElement* xml)
 		XmlElement* xposNode = xmlNode->createNewChildElement("ELECTRODE_XPOS");
 		XmlElement* yposNode = xmlNode->createNewChildElement("ELECTRODE_YPOS");
 
-		for (int i = 0; i < device->settings.selectedChannel.size(); i++)
+		for (int i = 0; i < npx->settings.selectedChannel.size(); i++)
 		{
-			int bank = int(device->settings.selectedBank[i]);
-			int shank = device->settings.selectedShank[i];
-			int channel = device->settings.selectedChannel[i];
-			int elec = device->settings.selectedElectrode[i];
+			int bank = int(npx->settings.selectedBank[i]);
+			int shank = npx->settings.selectedShank[i];
+			int channel = npx->settings.selectedChannel[i];
+			int elec = npx->settings.selectedElectrode[i];
 
 			String chString = String(bank);
 
 			String chId = "CH" + String(channel);
 
 			channelNode->setAttribute(chId, chString);
-			xposNode->setAttribute(chId, String(device->settings.electrodeMetadata[elec].xpos + 250 * shank));
-			yposNode->setAttribute(chId, String(device->settings.electrodeMetadata[elec].ypos));
+			xposNode->setAttribute(chId, String(npx->settings.electrodeMetadata[elec].xpos + 250 * shank));
+			yposNode->setAttribute(chId, String(npx->settings.electrodeMetadata[elec].ypos));
 		}
 
 		xmlNode->setAttribute("visualizationMode", (double)mode);
@@ -861,16 +878,18 @@ void NeuropixV1Interface::saveParameters(XmlElement* xml)
 			annotationNode->setAttribute("B", a.colour.getBlue());
 		}
 
-		xmlNode->setAttribute("isEnabled", bool(device->isEnabled()));
+		xmlNode->setAttribute("isEnabled", bool(npx->isEnabled()));
 	}
 }
 
 void NeuropixV1Interface::loadParameters(XmlElement* xml)
 {
-	if (device != nullptr)
+	auto npx = std::static_pointer_cast<Neuropixels_1>(device);
+
+	if (npx != nullptr)
 	{
-		// TODO: load parameters, put them into device->settings, and then update the interface
-		applyProbeSettings(device->settings, false);
+		// TODO: load parameters, put them into npx->settings, and then update the interface
+		applyProbeSettings(npx->settings, false);
 	}
 }
 
diff --git a/Source/UI/NeuropixV1Interface.h b/Source/UI/NeuropixV1Interface.h
index 46027ef..8863ec8 100644
--- a/Source/UI/NeuropixV1Interface.h
+++ b/Source/UI/NeuropixV1Interface.h
@@ -75,7 +75,7 @@ class NeuropixV1Interface : public SettingsInterface,
 	friend class ProbeBrowser;
 
 	/** Constructor */
-	NeuropixV1Interface(OnixDevice* d, OnixSourceEditor* e, OnixSourceCanvas* c);
+	NeuropixV1Interface(std::shared_ptr<Neuropixels_1> d, OnixSourceEditor* e, OnixSourceCanvas* c);
 
 	/** Destructor */
 	~NeuropixV1Interface();
@@ -116,8 +116,6 @@ class NeuropixV1Interface : public SettingsInterface,
 	void setApFilterState(bool state);
 	void selectElectrodes(Array<int> electrodes);
 
-	Neuropixels_1* device;
-
 private:
 	XmlElement neuropix_info;
 
diff --git a/Source/UI/ProbeBrowser.cpp b/Source/UI/ProbeBrowser.cpp
index 36d480f..6389b55 100644
--- a/Source/UI/ProbeBrowser.cpp
+++ b/Source/UI/ProbeBrowser.cpp
@@ -29,9 +29,9 @@ ProbeBrowser::ProbeBrowser(NeuropixV1Interface* parent_) : parent(parent_)
 
 	activityToView = ActivityToView::APVIEW;
 
-	ProbeType probeType = parent->device->settings.probeType;
+	auto device = std::static_pointer_cast<Neuropixels_1>(parent->device);
 
-	if (probeType == ProbeType::NPX_V2E || probeType == ProbeType::NPX_V2E_BETA)
+	if (device->settings.probeType == ProbeType::NPX_V2E || device->settings.probeType == ProbeType::NPX_V2E_BETA)
 	{
 		maxPeakToPeakAmplitude = 1000.0f;
 	}
@@ -53,7 +53,7 @@ ProbeBrowser::ProbeBrowser(NeuropixV1Interface* parent_) : parent(parent_)
 	zoomOffset = 50;
 	int defaultZoomHeight = 100;
 
-	ProbeMetadata probeMetadata = parent->device->settings.probeMetadata;
+	ProbeMetadata probeMetadata = device->settings.probeMetadata;
 
 	if (probeMetadata.columns_per_shank == 8)
 	{
@@ -224,7 +224,9 @@ void ProbeBrowser::mouseMove(const MouseEvent& event)
 
 int ProbeBrowser::getNearestElectrode(int x, int y) const
 {
-	ProbeMetadata probeMetadata = parent->device->settings.probeMetadata;
+	auto device = std::static_pointer_cast<Neuropixels_1>(parent->device);
+
+	ProbeMetadata probeMetadata = device->settings.probeMetadata;
 
 	int row = (lowerBound - y) / electrodeHeight + zoomAreaMinRow + 1;
 
@@ -246,7 +248,7 @@ int ProbeBrowser::getNearestElectrode(int x, int y) const
 		}
 	}
 
-	Array<ElectrodeMetadata> electrodeMetadata = parent->device->settings.electrodeMetadata;
+	Array<ElectrodeMetadata> electrodeMetadata = device->settings.electrodeMetadata;
 
 	for (int i = 0; i < electrodeMetadata.size(); i++)
 	{
@@ -263,7 +265,9 @@ int ProbeBrowser::getNearestElectrode(int x, int y) const
 
 Array<int> ProbeBrowser::getElectrodesWithinBounds(int x, int y, int w, int h) const
 {
-	ProbeMetadata probeMetadata = parent->device->settings.probeMetadata;
+	auto device = std::static_pointer_cast<Neuropixels_1>(parent->device);
+
+	ProbeMetadata probeMetadata = device->settings.probeMetadata;
 
 	int startrow = (lowerBound - y - h) / electrodeHeight + zoomAreaMinRow + 1;
 	int endrow = (lowerBound - y) / electrodeHeight + zoomAreaMinRow + 1;
@@ -286,7 +290,7 @@ Array<int> ProbeBrowser::getElectrodesWithinBounds(int x, int y, int w, int h) c
 	}
 
 	Array<int> inds;
-	Array<ElectrodeMetadata> electrodeMetadata = parent->device->settings.electrodeMetadata;
+	Array<ElectrodeMetadata> electrodeMetadata = device->settings.electrodeMetadata;
 
 	for (int i = 0; i < electrodeMetadata.size(); i++)
 	{
@@ -307,7 +311,9 @@ Array<int> ProbeBrowser::getElectrodesWithinBounds(int x, int y, int w, int h) c
 
 String ProbeBrowser::getElectrodeInfoString(int index)
 {
-	Array<ElectrodeMetadata> electrodeMetadata = parent->device->settings.electrodeMetadata;
+	auto device = std::static_pointer_cast<Neuropixels_1>(parent->device);
+
+	Array<ElectrodeMetadata> electrodeMetadata = device->settings.electrodeMetadata;
 
 	String a;
 	a += "Electrode ";
@@ -416,6 +422,8 @@ void ProbeBrowser::mouseUp(const MouseEvent& event)
 
 void ProbeBrowser::mouseDown(const MouseEvent& event)
 {
+	auto device = std::static_pointer_cast<Neuropixels_1>(parent->device);
+
 	initialOffset = zoomOffset;
 	initialHeight = zoomHeight;
 	
@@ -425,17 +433,17 @@ void ProbeBrowser::mouseDown(const MouseEvent& event)
 		{
 			if (!event.mods.isShiftDown())
 			{
-				for (int i = 0; i < parent->device->settings.electrodeMetadata.size(); i++)
-					parent->device->settings.electrodeMetadata.getReference(i).isSelected = false;
+				for (int i = 0; i < device->settings.electrodeMetadata.size(); i++)
+					device->settings.electrodeMetadata.getReference(i).isSelected = false;
 			}
 
 			if (event.x > leftEdge && event.x < rightEdge)
 			{
 				int chan = getNearestElectrode(event.x, event.y);
 
-				if (chan >= 0 && chan < parent->device->settings.electrodeMetadata.size())
+				if (chan >= 0 && chan < device->settings.electrodeMetadata.size())
 				{
-					parent->device->settings.electrodeMetadata.getReference(chan).isSelected = !parent->device->settings.electrodeMetadata.getReference(chan).isSelected;
+					device->settings.electrodeMetadata.getReference(chan).isSelected = !device->settings.electrodeMetadata.getReference(chan).isSelected;
 				}
 			}
 			repaint();
@@ -490,6 +498,8 @@ void ProbeBrowser::mouseDown(const MouseEvent& event)
 
 void ProbeBrowser::mouseDrag(const MouseEvent& event)
 {
+	auto device = std::static_pointer_cast<Neuropixels_1>(parent->device);
+
 	if (isOverZoomRegion)
 	{
 		if (isOverUpperBorder)
@@ -547,16 +557,16 @@ void ProbeBrowser::mouseDrag(const MouseEvent& event)
 
 		if (x < rightEdge)
 		{
-			for (int i = 0; i < parent->device->settings.electrodeMetadata.size(); i++)
+			for (int i = 0; i < device->settings.electrodeMetadata.size(); i++)
 			{
 				if (inBounds.indexOf(i) > -1)
 				{
-					parent->device->settings.electrodeMetadata.getReference(i).isSelected = true;
+					device->settings.electrodeMetadata.getReference(i).isSelected = true;
 				}
 				else
 				{
 					if (!event.mods.isShiftDown())
-						parent->device->settings.electrodeMetadata.getReference(i).isSelected = false;
+						device->settings.electrodeMetadata.getReference(i).isSelected = false;
 				}
 			}
 		}
@@ -614,8 +624,10 @@ void ProbeBrowser::paint(Graphics& g)
 	int channelSpan = SHANK_HEIGHT;
 	int pixelGap = 2;
 
-	ProbeMetadata probeMetadata = parent->device->settings.probeMetadata;
-	Array<ElectrodeMetadata> electrodeMetadata = parent->device->settings.electrodeMetadata;
+	auto device = std::static_pointer_cast<Neuropixels_1>(parent->device);
+
+	ProbeMetadata probeMetadata = device->settings.probeMetadata;
+	Array<ElectrodeMetadata> electrodeMetadata = device->settings.electrodeMetadata;
 
 	if (probeMetadata.columns_per_shank > 8)
 	{
@@ -827,7 +839,9 @@ void ProbeBrowser::drawAnnotations(Graphics& g)
 
 Colour ProbeBrowser::getElectrodeColour(int i)
 {
-	Array<ElectrodeMetadata> electrodeMetadata = parent->device->settings.electrodeMetadata;
+	auto device = std::static_pointer_cast<Neuropixels_1>(parent->device);
+
+	Array<ElectrodeMetadata> electrodeMetadata = device->settings.electrodeMetadata;
 
 	if (electrodeMetadata[i].status == ElectrodeStatus::DISCONNECTED) // not available
 	{
@@ -843,11 +857,11 @@ Colour ProbeBrowser::getElectrodeColour(int i)
 		}
 		else if (parent->mode == VisualizationMode::AP_GAIN_VIEW) // AP GAIN
 		{
-		    return Colour (25 * parent->device->settings.apGainIndex, 25 * parent->device->settings.apGainIndex, 50);
+		    return Colour (25 * device->settings.apGainIndex, 25 * device->settings.apGainIndex, 50);
 		}
 		else if (parent->mode == VisualizationMode::LFP_GAIN_VIEW) // LFP GAIN
 		{
-		    return Colour (66, 25 * parent->device->settings.lfpGainIndex, 35 * parent->device->settings.lfpGainIndex);
+		    return Colour (66, 25 * device->settings.lfpGainIndex, 35 * device->settings.lfpGainIndex);
 		}
 		else if (parent->mode == VisualizationMode::REFERENCE_VIEW)
 		{
diff --git a/Source/UI/SettingsInterface.h b/Source/UI/SettingsInterface.h
index bc00792..8fc5ef0 100644
--- a/Source/UI/SettingsInterface.h
+++ b/Source/UI/SettingsInterface.h
@@ -50,9 +50,9 @@ class SettingsInterface : public Component
     };
 
     /** Constructor */
-    SettingsInterface (OnixDevice* dataSource_, OnixSourceEditor* editor_, OnixSourceCanvas* canvas_)
+    SettingsInterface (std::shared_ptr<OnixDevice> dataSource_, OnixSourceEditor* editor_, OnixSourceCanvas* canvas_)
     {
-        dataSource = dataSource_;
+        device = dataSource_;
         editor = editor_;
         canvas = canvas_;
 
@@ -84,7 +84,7 @@ class SettingsInterface : public Component
     Type type = Type::UNKNOWN_SETTINGS_INTERFACE;
 
     /** Pointer to the data source*/
-    OnixDevice* dataSource;
+    std::shared_ptr<OnixDevice> device;
 
 protected:
     OnixSourceEditor* editor;

From 2f1a6cfa655cb4dc6a1c78f534769fc3494f4a7e Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Thu, 13 Mar 2025 15:57:50 -0400
Subject: [PATCH 04/25] Code cleanup - Make raw pointers private - Remove
 unused DataBuffer* - Removed excess calls to addSourceBuffers - Update
 samplesPerSecond for MemoryMonitor

---
 Source/Devices/Bno055.h              |  6 +++---
 Source/Devices/MemoryMonitor.cpp     | 17 ++++++++++++++++-
 Source/Devices/MemoryMonitor.h       | 10 +++++-----
 Source/Devices/Neuropixels_1.h       |  6 +++---
 Source/OnixDevice.cpp                |  2 +-
 Source/OnixDevice.h                  |  3 ---
 Source/OnixSource.cpp                | 10 +---------
 Source/UI/MemoryMonitorInterface.cpp |  2 +-
 8 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/Source/Devices/Bno055.h b/Source/Devices/Bno055.h
index f77576a..cd62ec0 100644
--- a/Source/Devices/Bno055.h
+++ b/Source/Devices/Bno055.h
@@ -58,14 +58,14 @@ class Bno055 : public OnixDevice
 
 	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override;
 
-	DataBuffer* eulerBuffer = deviceBuffer;
+private:
+
+	DataBuffer* eulerBuffer;
 	DataBuffer* quaternionBuffer;
 	DataBuffer* accelerationBuffer;
 	DataBuffer* gravityBuffer;
 	DataBuffer* temperatureBuffer;
 
-private:
-
 	static const int numFrames = 2;
 
 	Array<oni_frame_t*, CriticalSection, numFrames> frameArray;
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index 1244d4e..ef99ec2 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -54,7 +54,7 @@ void MemoryMonitorUsage::startAcquisition()
 
 void MemoryMonitorUsage::stopAcquisition()
 {
-	stopTimer(); 
+	stopTimer();
 	setFillPercentage(0.0f);
 	repaint();
 }
@@ -150,6 +150,21 @@ void MemoryMonitor::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 	}
 }
 
+void MemoryMonitor::setSamplesPerSecond(uint32_t samplesPerSecond_) 
+{
+	samplesPerSecond = samplesPerSecond_;
+
+	for (const auto& stream : streams)
+	{
+		streams.getReference(0).sampleRate = samplesPerSecond;
+	}
+}
+
+float MemoryMonitor::getLastPercentUsedValue()
+{
+	return lastPercentUsedValue;
+}
+
 void MemoryMonitor::processFrames()
 {
 	while (!frameArray.isEmpty())
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index 0908626..a3d266b 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -65,15 +65,15 @@ class MemoryMonitor : public OnixDevice
 
 	uint32_t getSamplesPerSecond() const { return samplesPerSecond; }
 
-	void setSamplesPerSecond(uint32_t samplesPerSecond_) { samplesPerSecond = samplesPerSecond_; }
+	void setSamplesPerSecond(uint32_t samplesPerSecond_);
 
-	DataBuffer* percentUsedBuffer = deviceBuffer;
-	DataBuffer* bytesUsedBuffer;
-
-	float getLastPercentUsedValue() { return lastPercentUsedValue; }
+	float getLastPercentUsedValue();
 
 private:
 
+	DataBuffer* percentUsedBuffer;
+	DataBuffer* bytesUsedBuffer;
+
 	static const int numFrames = 2;
 
 	Array<oni_frame_t*, CriticalSection, numFrames> frameArray;
diff --git a/Source/Devices/Neuropixels_1.h b/Source/Devices/Neuropixels_1.h
index 243f95b..72f084e 100644
--- a/Source/Devices/Neuropixels_1.h
+++ b/Source/Devices/Neuropixels_1.h
@@ -209,15 +209,15 @@ class Neuropixels_1 : public OnixDevice,
 
 	void writeShiftRegisters(std::bitset<shankConfigurationBitCount> shankBits, std::vector<std::bitset<BaseConfigurationBitCount>> configBits, Array<NeuropixelsV1Adc> adcs, double lfpGainCorrection, double apGainCorrection);
 
-	DataBuffer* apBuffer = deviceBuffer;
-	DataBuffer* lfpBuffer;
-
 	ProbeSettings settings;
 
 	static const int numberOfChannels = 384;
 
 private:
 
+	DataBuffer* apBuffer;
+	DataBuffer* lfpBuffer;
+
 	static const int superFramesPerUltraFrame = 12;
 	static const int framesPerSuperFrame = 13;
 	static const int framesPerUltraFrame = superFramesPerUltraFrame * framesPerSuperFrame;
diff --git a/Source/OnixDevice.cpp b/Source/OnixDevice.cpp
index 97613a5..7289f64 100644
--- a/Source/OnixDevice.cpp
+++ b/Source/OnixDevice.cpp
@@ -24,7 +24,7 @@
 #include "OnixDevice.h"
 
 OnixDevice::OnixDevice(String name_, OnixDeviceType type_, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
-	: type(type_), deviceIdx(deviceIdx_), ctx(ctx_), deviceBuffer(NULL)
+	: type(type_), deviceIdx(deviceIdx_), ctx(ctx_)
 {
 	name = name_;
 }
diff --git a/Source/OnixDevice.h b/Source/OnixDevice.h
index 307aba3..7198ef1 100644
--- a/Source/OnixDevice.h
+++ b/Source/OnixDevice.h
@@ -109,9 +109,6 @@ class OnixDevice
 
 	OnixDeviceType type;
 
-	/** Holds incoming data */
-	DataBuffer* deviceBuffer;
-
 	Array<StreamInfo> streams;
 
 	const int bufferSizeInSeconds = 10;
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 4a29b3d..90b0ea4 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -169,8 +169,6 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				}
 			}
 
-			np1->addSourceBuffers(sourceBuffers);
-
 			sources.push_back(np1);
 
 			npxProbeIdx++;
@@ -187,8 +185,6 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				continue;
 			}
 
-			bno->addSourceBuffers(sourceBuffers);
-
 			sources.push_back(bno);
 
 			bnoIdx++;
@@ -219,8 +215,6 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				}
 				npxProbeIdx += np2->getNumProbes();
 
-				np2->addSourceBuffers(sourceBuffers);
-
 				sources.push_back(np2);
 			}
 		}
@@ -236,8 +230,6 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				continue;
 			}
 
-			memoryMonitor->addSourceBuffers(sourceBuffers);
-
 			sources.push_back(memoryMonitor);
 		}
 	}
@@ -413,7 +405,7 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 			}
 
 			// add data streams and channels
-			for (StreamInfo streamInfo : source->streams)
+			for (const auto& streamInfo : source->streams)
 			{
 				DataStream::Settings streamSettings
 				{
diff --git a/Source/UI/MemoryMonitorInterface.cpp b/Source/UI/MemoryMonitorInterface.cpp
index a6d1463..41e04e1 100644
--- a/Source/UI/MemoryMonitorInterface.cpp
+++ b/Source/UI/MemoryMonitorInterface.cpp
@@ -101,7 +101,7 @@ void MemoryMonitorInterface::labelTextChanged(Label* l)
 
 		int rate = l->getText().getIntValue();
 
-		if (rate < 1 || rate > 1000)
+		if (rate < 0.1 || rate > 1000)
 		{
 			l->setText(String(d->getSamplesPerSecond()), dontSendNotification);
 			return;

From 97abadf76f3eaa428969c8765fb48bf3032acd06 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Fri, 14 Mar 2025 14:38:41 -0400
Subject: [PATCH 05/25] Convert linear scale to logarithmic for memory usage

---
 Source/Devices/MemoryMonitor.cpp | 2 +-
 Source/Devices/MemoryMonitor.h   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index ef99ec2..78e4c2e 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -37,7 +37,7 @@ void MemoryMonitorUsage::timerCallback()
 {
 	if (device != nullptr)
 	{
-		setFillPercentage(device->getLastPercentUsedValue() / 100.0f);
+		setFillPercentage(std::log(device->getLastPercentUsedValue() + 1) / maxLogarithmicValue);
 		repaint();
 	}
 }
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index a3d266b..6b1cca8 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -120,6 +120,10 @@ class MemoryMonitorUsage : public LevelMonitor
 private:
 
 	std::shared_ptr<MemoryMonitor> device;
+
+	// NB: Calculate the maximum logarithmic value to convert from linear scale (x: 0-100) to logarithmic scale (y: 0-1)
+	//	   using the following equation: y = log_e(x + 1) / log_e(x_max + 1);
+	const float maxLogarithmicValue = std::log(101);
 };
 
 #endif
\ No newline at end of file

From 8526fe3b6f3165ae568392289585dc0fc29c9182 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Mon, 17 Mar 2025 15:34:30 -0400
Subject: [PATCH 06/25] Add OutputClock - Remove empty destructors - Modify
 comments so they accurately reflect what the class / method does

---
 Source/Devices/Bno055.cpp            |   4 -
 Source/Devices/Bno055.h              |   6 +-
 Source/Devices/DeviceList.h          |   1 +
 Source/Devices/MemoryMonitor.cpp     |   8 --
 Source/Devices/MemoryMonitor.h       |  12 +-
 Source/Devices/Neuropixels2e.cpp     |   5 -
 Source/Devices/Neuropixels2e.h       |   6 +-
 Source/Devices/Neuropixels_1.cpp     |   8 --
 Source/Devices/Neuropixels_1.h       |   9 +-
 Source/Devices/OutputClock.cpp       |  61 +++++++++
 Source/Devices/OutputClock.h         | 102 ++++++++++++++
 Source/OnixDevice.h                  |   1 +
 Source/OnixSource.cpp                |  16 ++-
 Source/OnixSourceCanvas.cpp          |  14 +-
 Source/UI/Bno055Interface.cpp        |  22 +--
 Source/UI/Bno055Interface.h          |  11 +-
 Source/UI/InterfaceList.h            |   1 +
 Source/UI/MemoryMonitorInterface.cpp |  22 +--
 Source/UI/MemoryMonitorInterface.h   |  12 +-
 Source/UI/NeuropixV1Interface.cpp    |   4 -
 Source/UI/NeuropixV1Interface.h      |   3 -
 Source/UI/OutputClockInterface.cpp   | 196 +++++++++++++++++++++++++++
 Source/UI/OutputClockInterface.h     |  82 +++++++++++
 Source/UI/ProbeBrowser.cpp           |   4 -
 Source/UI/ProbeBrowser.h             |   1 -
 Source/UI/SettingsInterface.h        |  10 +-
 26 files changed, 500 insertions(+), 121 deletions(-)
 create mode 100644 Source/Devices/OutputClock.cpp
 create mode 100644 Source/Devices/OutputClock.h
 create mode 100644 Source/UI/OutputClockInterface.cpp
 create mode 100644 Source/UI/OutputClockInterface.h

diff --git a/Source/Devices/Bno055.cpp b/Source/Devices/Bno055.cpp
index 56fe4b0..160dc0b 100644
--- a/Source/Devices/Bno055.cpp
+++ b/Source/Devices/Bno055.cpp
@@ -87,10 +87,6 @@ Bno055::Bno055(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
 		eventCodes[i] = 0;
 }
 
-Bno055::~Bno055()
-{
-}
-
 int Bno055::configureDevice()
 {
 	oni_write_reg(ctx, deviceIdx, (uint32_t)Bno055Registers::ENABLE, (uint32_t)1);
diff --git a/Source/Devices/Bno055.h b/Source/Devices/Bno055.h
index cd62ec0..16312c1 100644
--- a/Source/Devices/Bno055.h
+++ b/Source/Devices/Bno055.h
@@ -31,6 +31,9 @@ enum class Bno055Registers
 	ENABLE = 0x00
 };
 
+/*
+	Configures and streams data from a BNO055 device
+*/
 class Bno055 : public OnixDevice
 {
 public:
@@ -38,9 +41,6 @@ class Bno055 : public OnixDevice
 	/** Constructor */
 	Bno055(String name, const oni_dev_idx_t, const oni_ctx);
 
-	/** Destructor */
-	~Bno055();
-
 	int configureDevice() override;
 
 	/** Update the settings of the device */
diff --git a/Source/Devices/DeviceList.h b/Source/Devices/DeviceList.h
index 5e5b61a..308e744 100644
--- a/Source/Devices/DeviceList.h
+++ b/Source/Devices/DeviceList.h
@@ -4,3 +4,4 @@
 #include "Neuropixels_1.h"
 #include "Neuropixels2e.h"
 #include "MemoryMonitor.h"
+#include "OutputClock.h"
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index 78e4c2e..6b0b3e9 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -29,10 +29,6 @@ MemoryMonitorUsage::MemoryMonitorUsage(GenericProcessor* p)
 	device = nullptr;
 }
 
-MemoryMonitorUsage::~MemoryMonitorUsage()
-{
-}
-
 void MemoryMonitorUsage::timerCallback()
 {
 	if (device != nullptr)
@@ -88,10 +84,6 @@ MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, const
 		eventCodes[i] = 0;
 }
 
-MemoryMonitor::~MemoryMonitor()
-{
-}
-
 int MemoryMonitor::configureDevice()
 {
 	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (uint32_t)MemoryMonitorRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0)));
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index 6b1cca8..328512e 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -35,16 +35,14 @@ enum class MemoryMonitorRegisters : uint32_t
 };
 
 /*
-	Streams data from a MemoryMonitor device on a Breakout Board
+	Configures and streams data from a MemoryMonitor device on a Breakout Board
 */
 class MemoryMonitor : public OnixDevice
 {
 public:
 	MemoryMonitor(String name, const oni_dev_idx_t, const oni_ctx);
 
-	~MemoryMonitor();
-
-	/** Enables the device so that it is ready to stream with default settings */
+	/** Configures the device so that it is ready to stream with default settings */
 	int configureDevice() override;
 
 	/** Update the settings of the device */
@@ -97,6 +95,8 @@ class MemoryMonitor : public OnixDevice
 	uint64 eventCodes[numFrames];
 
 	std::atomic<float> lastPercentUsedValue = 0.0f;
+
+	JUCE_LEAK_DETECTOR(MemoryMonitor);
 };
 
 /*
@@ -107,8 +107,6 @@ class MemoryMonitorUsage : public LevelMonitor
 public:
 	MemoryMonitorUsage(GenericProcessor*);
 
-	~MemoryMonitorUsage();
-
 	void timerCallback() override;
 
 	void setMemoryMonitor(std::shared_ptr<MemoryMonitor> memoryMonitor);
@@ -124,6 +122,8 @@ class MemoryMonitorUsage : public LevelMonitor
 	// NB: Calculate the maximum logarithmic value to convert from linear scale (x: 0-100) to logarithmic scale (y: 0-1)
 	//	   using the following equation: y = log_e(x + 1) / log_e(x_max + 1);
 	const float maxLogarithmicValue = std::log(101);
+
+	JUCE_LEAK_DETECTOR(MemoryMonitorUsage);
 };
 
 #endif
\ No newline at end of file
diff --git a/Source/Devices/Neuropixels2e.cpp b/Source/Devices/Neuropixels2e.cpp
index 1edc50f..deab57f 100644
--- a/Source/Devices/Neuropixels2e.cpp
+++ b/Source/Devices/Neuropixels2e.cpp
@@ -19,11 +19,6 @@ void Neuropixels2e::createDataStream(int n)
 	streams.add(apStream);
 }
 
-Neuropixels2e::~Neuropixels2e()
-{
-
-}
-
 int Neuropixels2e::getNumProbes() const
 {
 	return m_numProbes;
diff --git a/Source/Devices/Neuropixels2e.h b/Source/Devices/Neuropixels2e.h
index 0725dc4..194705f 100644
--- a/Source/Devices/Neuropixels2e.h
+++ b/Source/Devices/Neuropixels2e.h
@@ -2,15 +2,15 @@
 #include "../OnixDevice.h"
 #include "../I2CRegisterContext.h"
 
+/*
+	Configures and streams data from a Neuropixels 2.0e device
+*/
 class Neuropixels2e :
 	public OnixDevice
 {
 public:
 	Neuropixels2e(String name, const oni_dev_idx_t, const oni_ctx);
 
-	/** Destructor */
-	~Neuropixels2e();
-
 	int configureDevice() override;
 
 	/** Update the settings of the device */
diff --git a/Source/Devices/Neuropixels_1.cpp b/Source/Devices/Neuropixels_1.cpp
index e76e74a..39499df 100644
--- a/Source/Devices/Neuropixels_1.cpp
+++ b/Source/Devices/Neuropixels_1.cpp
@@ -30,10 +30,6 @@ BackgroundUpdaterWithProgressWindow::BackgroundUpdaterWithProgressWindow(Neuropi
 	device = d;
 }
 
-BackgroundUpdaterWithProgressWindow::~BackgroundUpdaterWithProgressWindow()
-{
-}
-
 int BackgroundUpdaterWithProgressWindow::updateSettings()
 {
 	runThread();
@@ -184,10 +180,6 @@ Neuropixels_1::Neuropixels_1(String name, OnixSource* s, const oni_dev_idx_t dev
 	source->getParameter(getGainPathParameterName())->setNextValue(File::getSpecialLocation(File::userHomeDirectory).getFullPathName());
 }
 
-Neuropixels_1::~Neuropixels_1()
-{
-}
-
 String Neuropixels_1::getAdcPathParameter()
 {
 	return source->getParameter(getAdcPathParameterName())->getValue();
diff --git a/Source/Devices/Neuropixels_1.h b/Source/Devices/Neuropixels_1.h
index 72f084e..cdf4143 100644
--- a/Source/Devices/Neuropixels_1.h
+++ b/Source/Devices/Neuropixels_1.h
@@ -149,7 +149,7 @@ struct NeuropixelsV1Adc
 
 /**
 
-	Streams data from an ONIX device
+	Configures and streams data from a Neuropixels 1.0f device
 
 */
 class Neuropixels_1 : public OnixDevice,
@@ -159,10 +159,7 @@ class Neuropixels_1 : public OnixDevice,
 	/** Constructor */
 	Neuropixels_1(String name, OnixSource* s, const oni_dev_idx_t, const oni_ctx);
 
-	/** Destructor */
-	~Neuropixels_1();
-
-	/** Enables the device so that it is ready to stream with default settings */
+	/** Configures the device so that it is ready to stream with default settings */
 	int configureDevice() override;
 
 	/** Update the settings of the device */
@@ -271,8 +268,6 @@ class BackgroundUpdaterWithProgressWindow : public ThreadWithProgressWindow
 public:
 	BackgroundUpdaterWithProgressWindow(Neuropixels_1* d);
 
-	~BackgroundUpdaterWithProgressWindow();
-
 	void run();
 
 	int updateSettings();
diff --git a/Source/Devices/OutputClock.cpp b/Source/Devices/OutputClock.cpp
new file mode 100644
index 0000000..a2f0f09
--- /dev/null
+++ b/Source/Devices/OutputClock.cpp
@@ -0,0 +1,61 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "OutputClock.h"
+
+OutputClock::OutputClock(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
+	: OnixDevice(name, OnixDeviceType::OUTPUTCLOCK, deviceIdx_, ctx_)
+{
+}
+
+OutputClock::~OutputClock()
+{
+	setClockGate(false, true);
+}
+
+int OutputClock::updateSettings()
+{
+	oni_reg_val_t baseFreqHz;
+	ONI_OK_RETURN_INT(oni_read_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::BASE_FREQ_HZ, &baseFreqHz));
+
+	auto periodCycles = (uint32_t)(baseFreqHz / frequencyHz);
+	auto h = (uint32_t)(periodCycles * (dutyCycle / 100));
+	auto l = periodCycles - h;
+	auto delayCycles = (uint32_t)(delay * baseFreqHz);
+
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::HIGH_CYCLES, h));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::LOW_CYCLES, l));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::DELAY_CYCLES, delayCycles));
+
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::GATE_RUN, 1));
+}
+
+void OutputClock::startAcquisition()
+{
+	writeClockGateRegister();
+}
+
+void OutputClock::stopAcquisition()
+{
+	setClockGate(false, true);
+}
\ No newline at end of file
diff --git a/Source/Devices/OutputClock.h b/Source/Devices/OutputClock.h
new file mode 100644
index 0000000..3407bf8
--- /dev/null
+++ b/Source/Devices/OutputClock.h
@@ -0,0 +1,102 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef __OUTPUTCLOCK_H__
+#define __OUTPUTCLOCK_H__
+
+#include "../OnixDevice.h"
+
+enum class OutputClockRegisters : uint32_t
+{
+	NULL_REGISTER = 0,
+	CLOCK_GATE = 1,
+	HIGH_CYCLES = 2,
+	LOW_CYCLES = 3,
+	DELAY_CYCLES = 4,
+	GATE_RUN = 5,
+	BASE_FREQ_HZ = 6
+};
+
+/*
+	Configures an OutputClock device on a Breakout Board
+*/
+class OutputClock : public OnixDevice
+{
+public:
+	OutputClock(String name, const oni_dev_idx_t, const oni_ctx);
+
+	~OutputClock();
+
+	/** Device is always enabled */
+	int configureDevice() override { return 0; };
+
+	/** Update the settings of the device */
+	int updateSettings() override;
+
+	/** Starts probe data streaming */
+	void startAcquisition() override;
+
+	/** Stops probe data streaming*/
+	void stopAcquisition() override;
+
+	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
+	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override {};
+
+	void addFrame(oni_frame_t*) override {};
+
+	void processFrames() override {};
+
+	float getFrequencyHz() const { return frequencyHz; }
+
+	void setFrequencyHz(float frequency) { frequencyHz = frequency; }
+
+	uint32_t getDutyCycle() const { return dutyCycle; }
+
+	void setDutyCycle(uint32_t dutyCycle_) { dutyCycle = dutyCycle_; }
+
+	uint32_t getDelay() const { return delay; }
+
+	void setDelay(uint32_t delay_) { delay = delay_; }
+
+	bool getClockGate() const { return clockGate; }
+
+	void setClockGate(bool gate, bool writeToRegister = false)
+	{ 
+		clockGate = gate;
+		if (writeToRegister) writeClockGateRegister();
+	}
+
+private:
+
+	float frequencyHz = 1e6;
+	uint32_t dutyCycle = 50;
+	uint32_t delay = 0;
+
+	bool clockGate = false;
+
+	void writeClockGateRegister() { ONI_OK(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::CLOCK_GATE, clockGate ? 1 : 0)); }
+
+	JUCE_LEAK_DETECTOR(OutputClock);
+};
+
+#endif // !__OUTPUTCLOCK_H__
diff --git a/Source/OnixDevice.h b/Source/OnixDevice.h
index 7198ef1..95c36ca 100644
--- a/Source/OnixDevice.h
+++ b/Source/OnixDevice.h
@@ -56,6 +56,7 @@ enum class OnixDeviceType {
 	NEUROPIXELS_2,
 	ADC,
 	MEMORYMONITOR,
+	OUTPUTCLOCK,
 };
 
 struct StreamInfo {
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 90b0ea4..7949466 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -220,7 +220,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 		}
 		else if (devices[dev_idx].id == ONIX_MEMUSAGE)
 		{
-			auto memoryMonitor = std::make_shared<MemoryMonitor>("MemoryMonitor", devices[dev_idx].idx, ctx);
+			auto memoryMonitor = std::make_shared<MemoryMonitor>("Memory Monitor", devices[dev_idx].idx, ctx);
 
 			int result = memoryMonitor->configureDevice();
 
@@ -232,6 +232,20 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 
 			sources.push_back(memoryMonitor);
 		}
+		else if (devices[dev_idx].id == ONIX_FMCCLKOUT1R3)
+		{
+			auto outputClock = std::make_shared<OutputClock>("Output Clock", devices[dev_idx].idx, ctx);
+
+			int result = outputClock->configureDevice();
+
+			if (result != 0)
+			{
+				LOGE("Device Idx: ", devices[dev_idx].idx, " Error enabling device stream.");
+				continue;
+			}
+
+			sources.push_back(outputClock);
+		}
 	}
 
 	val = 1;
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index 1584693..2bb9b21 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -86,7 +86,7 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 		if (source->type == OnixDeviceType::NEUROPIXELS_1)
 		{
 			NeuropixV1Interface* neuropixInterface = new NeuropixV1Interface(std::static_pointer_cast<Neuropixels_1>(source), editor, this);
-			settingsInterfaces.add((SettingsInterface*)neuropixInterface);
+			settingsInterfaces.add(neuropixInterface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(neuropixInterface), true);
 
 			portTabIndex.add(portTabNumber++);
@@ -94,7 +94,7 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 		else if (source->type == OnixDeviceType::BNO)
 		{
 			Bno055Interface* bno055Interface = new Bno055Interface(std::static_pointer_cast<Bno055>(source), editor, this);
-			settingsInterfaces.add((SettingsInterface*)bno055Interface);
+			settingsInterfaces.add(bno055Interface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(bno055Interface), true);
 
 			portTabIndex.add(portTabNumber++);
@@ -102,9 +102,17 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 		else if (source->type == OnixDeviceType::MEMORYMONITOR)
 		{
 			MemoryMonitorInterface* memoryMonitorInterface = new MemoryMonitorInterface(std::static_pointer_cast<MemoryMonitor>(source), editor, this);
-			settingsInterfaces.add((SettingsInterface*)memoryMonitorInterface);
+			settingsInterfaces.add(memoryMonitorInterface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(memoryMonitorInterface), true);
 
+			portTabIndex.add(portTabNumber++);
+		}
+		else if (source->type == OnixDeviceType::OUTPUTCLOCK)
+		{
+			OutputClockInterface* outputClockInterface = new OutputClockInterface(std::static_pointer_cast<OutputClock>(source), editor, this);
+			settingsInterfaces.add(outputClockInterface);
+			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(outputClockInterface), true);
+
 			portTabIndex.add(portTabNumber++);
 		}
 	}
diff --git a/Source/UI/Bno055Interface.cpp b/Source/UI/Bno055Interface.cpp
index 26e16fd..86043b8 100644
--- a/Source/UI/Bno055Interface.cpp
+++ b/Source/UI/Bno055Interface.cpp
@@ -23,7 +23,7 @@
 
 #include "Bno055Interface.h"
 
-Bno055Interface::Bno055Interface(std::shared_ptr<Bno055> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
+Bno055Interface::Bno055Interface(std::shared_ptr<Bno055> d, OnixSourceEditor* e, OnixSourceCanvas* c) : 
 	SettingsInterface(d, e,c)
 {
 	if (device != nullptr)
@@ -34,26 +34,6 @@ Bno055Interface::Bno055Interface(std::shared_ptr<Bno055> d, OnixSourceEditor* e,
 	type = SettingsInterface::Type::BNO055_SETTINGS_INTERFACE;
 }
 
-Bno055Interface::~Bno055Interface()
-{
-}
-
-void Bno055Interface::startAcquisition()
-{
-}
-
-void Bno055Interface::stopAcquisition()
-{
-}
-
-void Bno055Interface::saveParameters(XmlElement* xml)
-{
-}
-
-void Bno055Interface::loadParameters(XmlElement* xml)
-{
-}
-
 void Bno055Interface::updateInfoString()
 {
 }
diff --git a/Source/UI/Bno055Interface.h b/Source/UI/Bno055Interface.h
index e6acd5f..8e055e2 100644
--- a/Source/UI/Bno055Interface.h
+++ b/Source/UI/Bno055Interface.h
@@ -37,20 +37,17 @@ class Bno055Interface : public SettingsInterface
 	/** Constructor */
 	Bno055Interface(std::shared_ptr<Bno055> d, OnixSourceEditor* e, OnixSourceCanvas* c);
 
-	/** Destructor */
-	~Bno055Interface();
-
 	/** Disables buttons and starts animation if necessary */
-	void startAcquisition() override;
+	void startAcquisition() override {};
 
 	/** Enables buttons and start animation if necessary */
-	void stopAcquisition() override;
+	void stopAcquisition() override {};
 
 	/** Save parameters to XML */
-	void saveParameters(XmlElement* xml) override;
+	void saveParameters(XmlElement* xml) override {};
 
 	/** Load parameters from XML */
-	void loadParameters(XmlElement* xml) override;
+	void loadParameters(XmlElement* xml) override {};
 
 	/** Updates the info string on the right-hand side of the component */
 	void updateInfoString() override;
diff --git a/Source/UI/InterfaceList.h b/Source/UI/InterfaceList.h
index 1319798..8c0824a 100644
--- a/Source/UI/InterfaceList.h
+++ b/Source/UI/InterfaceList.h
@@ -2,3 +2,4 @@
 #include "NeuropixV1Interface.h"
 #include "Bno055Interface.h"
 #include "MemoryMonitorInterface.h"
+#include "OutputClockInterface.h"
diff --git a/Source/UI/MemoryMonitorInterface.cpp b/Source/UI/MemoryMonitorInterface.cpp
index 41e04e1..025616e 100644
--- a/Source/UI/MemoryMonitorInterface.cpp
+++ b/Source/UI/MemoryMonitorInterface.cpp
@@ -68,10 +68,6 @@ MemoryMonitorInterface::MemoryMonitorInterface(std::shared_ptr<MemoryMonitor> d,
 	type = SettingsInterface::Type::MEMORYMONITOR_SETTINGS_INTERFACE;
 }
 
-MemoryMonitorInterface::~MemoryMonitorInterface()
-{
-}
-
 void MemoryMonitorInterface::buttonClicked(Button* button)
 {
 	if (button == deviceEnableButton.get())
@@ -101,7 +97,7 @@ void MemoryMonitorInterface::labelTextChanged(Label* l)
 
 		int rate = l->getText().getIntValue();
 
-		if (rate < 0.1 || rate > 1000)
+		if (rate < 1 || rate > 1000)
 		{
 			l->setText(String(d->getSamplesPerSecond()), dontSendNotification);
 			return;
@@ -111,22 +107,6 @@ void MemoryMonitorInterface::labelTextChanged(Label* l)
 	}
 }
 
-void MemoryMonitorInterface::startAcquisition()
-{
-}
-
-void MemoryMonitorInterface::stopAcquisition()
-{
-}
-
-void MemoryMonitorInterface::saveParameters(XmlElement* xml)
-{
-}
-
-void MemoryMonitorInterface::loadParameters(XmlElement* xml)
-{
-}
-
 void MemoryMonitorInterface::updateInfoString()
 {
 	String nameString, infoString;
diff --git a/Source/UI/MemoryMonitorInterface.h b/Source/UI/MemoryMonitorInterface.h
index ab18cc7..9b511c1 100644
--- a/Source/UI/MemoryMonitorInterface.h
+++ b/Source/UI/MemoryMonitorInterface.h
@@ -39,19 +39,17 @@ class MemoryMonitorInterface : public SettingsInterface,
 
 	MemoryMonitorInterface(std::shared_ptr<MemoryMonitor> d, OnixSourceEditor* e, OnixSourceCanvas* c);
 
-	~MemoryMonitorInterface();
-
 	/** Disables buttons and starts animation if necessary */
-	void startAcquisition() override;
+	void startAcquisition() override {};
 
 	/** Enables buttons and start animation if necessary */
-	void stopAcquisition() override;
+	void stopAcquisition() override {};
 
 	/** Save parameters to XML */
-	void saveParameters(XmlElement* xml) override;
+	void saveParameters(XmlElement* xml) override {};
 
 	/** Load parameters from XML */
-	void loadParameters(XmlElement* xml) override;
+	void loadParameters(XmlElement* xml) override {};
 
 	/** Updates the info string on the right-hand side of the component */
 	void updateInfoString() override;
@@ -69,6 +67,8 @@ class MemoryMonitorInterface : public SettingsInterface,
 	std::unique_ptr<Label> sampleRateValue;
 
 	std::unique_ptr<UtilityButton> deviceEnableButton;
+
+	JUCE_LEAK_DETECTOR(MemoryMonitorInterface);
 };
 
 #endif
diff --git a/Source/UI/NeuropixV1Interface.cpp b/Source/UI/NeuropixV1Interface.cpp
index 324caba..a9a0cae 100644
--- a/Source/UI/NeuropixV1Interface.cpp
+++ b/Source/UI/NeuropixV1Interface.cpp
@@ -290,10 +290,6 @@ NeuropixV1Interface::NeuropixV1Interface(std::shared_ptr<Neuropixels_1> d, OnixS
 	updateInfoString();
 }
 
-NeuropixV1Interface::~NeuropixV1Interface()
-{
-}
-
 void NeuropixV1Interface::updateInfoString()
 {
 	String nameString, infoString;
diff --git a/Source/UI/NeuropixV1Interface.h b/Source/UI/NeuropixV1Interface.h
index 8863ec8..21999c1 100644
--- a/Source/UI/NeuropixV1Interface.h
+++ b/Source/UI/NeuropixV1Interface.h
@@ -77,9 +77,6 @@ class NeuropixV1Interface : public SettingsInterface,
 	/** Constructor */
 	NeuropixV1Interface(std::shared_ptr<Neuropixels_1> d, OnixSourceEditor* e, OnixSourceCanvas* c);
 
-	/** Destructor */
-	~NeuropixV1Interface();
-
 	/** Draws the legend */
 	void paint(Graphics& g) override;
 
diff --git a/Source/UI/OutputClockInterface.cpp b/Source/UI/OutputClockInterface.cpp
new file mode 100644
index 0000000..2f9a47b
--- /dev/null
+++ b/Source/UI/OutputClockInterface.cpp
@@ -0,0 +1,196 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "OutputClockInterface.h"
+
+OutputClockInterface::OutputClockInterface(std::shared_ptr<OutputClock> d, OnixSourceEditor* e, OnixSourceCanvas* c) : 
+	SettingsInterface(d, e, c)
+{
+	if (device != nullptr)
+	{
+		nameLabel = std::make_unique<Label>("MAIN", "NAME");
+		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
+		nameLabel->setBounds(50, 40, 370, 45);
+		addAndMakeVisible(nameLabel.get());
+
+		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
+		deviceEnableButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
+		deviceEnableButton->setRadius(3.0f);
+		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
+		deviceEnableButton->setClickingTogglesState(true);
+		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
+		deviceEnableButton->addListener(this);
+		addAndMakeVisible(deviceEnableButton.get());
+
+		infoLabel = std::make_unique<Label>("INFO", "INFO");
+		infoLabel->setFont(FontOptions(15.0f));
+		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
+		infoLabel->setJustificationType(Justification::topLeft);
+		addAndMakeVisible(infoLabel.get());
+
+		frequencyHzLabel = std::make_unique<Label>("frequencyHz", "Frequency [Hz]");
+		frequencyHzLabel->setBounds(infoLabel->getX(), infoLabel->getBottom() + 10, 130, 20);
+		addAndMakeVisible(frequencyHzLabel.get());
+
+		frequencyHzValue = std::make_unique<Label>("frequencyHzValue", String(std::static_pointer_cast<OutputClock>(device)->getFrequencyHz()));
+		frequencyHzValue->setEditable(true);
+		frequencyHzValue->setBounds(frequencyHzLabel->getRight() + 3, frequencyHzLabel->getY(), 50, 20);
+		frequencyHzValue->setTooltip("Sets the output clock frequency in Hz. Must be between 0.1 Hz and 10 MHz.");
+		frequencyHzValue->setColour(Label::ColourIds::backgroundColourId, Colours::lightgrey);
+		frequencyHzValue->setJustificationType(Justification::centred);
+		frequencyHzValue->addListener(this);
+		addAndMakeVisible(frequencyHzValue.get());
+
+		dutyCycleLabel = std::make_unique<Label>("dutyCycle", "Duty Cycle [%]");
+		dutyCycleLabel->setBounds(frequencyHzLabel->getX(), frequencyHzLabel->getBottom() + 10, 130, 20);
+		addAndMakeVisible(dutyCycleLabel.get());
+
+		dutyCycleValue = std::make_unique<Label>("dutyCycleValue", String(std::static_pointer_cast<OutputClock>(device)->getDutyCycle()));
+		dutyCycleValue->setEditable(true);
+		dutyCycleValue->setBounds(dutyCycleLabel->getRight() + 3, dutyCycleLabel->getY(), 50, 20);
+		dutyCycleValue->setTooltip("Sets the output clock duty cycle in percent. Values must be between 10 and 90.");
+		dutyCycleValue->setColour(Label::ColourIds::backgroundColourId, Colours::lightgrey);
+		dutyCycleValue->setJustificationType(Justification::centred);
+		dutyCycleValue->addListener(this);
+		addAndMakeVisible(dutyCycleValue.get());
+
+		delayLabel = std::make_unique<Label>("delay", "Delay [s]");
+		delayLabel->setBounds(dutyCycleLabel->getX(), dutyCycleLabel->getBottom() + 10, 130, 20);
+		addAndMakeVisible(delayLabel.get());
+
+		delayValue = std::make_unique<Label>("delayValue", String(std::static_pointer_cast<OutputClock>(device)->getDelay()));
+		delayValue->setEditable(true);
+		delayValue->setBounds(delayLabel->getRight() + 3, delayLabel->getY(), 50, 20);
+		delayValue->setTooltip("Sets the delay after acquisition commences before the clock becomes active, in seconds. Values must be between 0 and 3600 seconds.");
+		delayValue->setColour(Label::ColourIds::backgroundColourId, Colours::lightgrey);
+		delayValue->setJustificationType(Justification::centred);
+		delayValue->addListener(this);
+		addAndMakeVisible(delayValue.get());
+
+		clockGateButton = std::make_unique<UtilityButton>("Gate Status");
+		clockGateButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
+		clockGateButton->setRadius(3.0f);
+		clockGateButton->setBounds(delayLabel->getX(), delayLabel->getBottom() + 5, 100, 22);
+		clockGateButton->setClickingTogglesState(true);
+		clockGateButton->setToggleState(std::static_pointer_cast<OutputClock>(device)->getClockGate(), dontSendNotification);
+		clockGateButton->setTooltip("Toggles the output clock gate. If enabled, the clock output will be connected to the clock output line." + 
+			String(" If disabled, the clock output line will be held low."));
+		clockGateButton->addListener(this);
+		addAndMakeVisible(clockGateButton.get());
+
+		updateInfoString();
+	}
+
+	type = Type::OUTPUTCLOCK_SETTINGS_INTERFACE;
+}
+
+void OutputClockInterface::buttonClicked(Button* b)
+{
+	if (b == deviceEnableButton.get())
+	{
+		device->setEnabled(deviceEnableButton->getToggleState());
+		device->configureDevice();
+		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
+
+		if (device->isEnabled())
+		{
+			deviceEnableButton->setLabel("ENABLED");
+		}
+		else
+		{
+			deviceEnableButton->setLabel("DISABLED");
+		}
+
+		CoreServices::updateSignalChain(editor);
+	}
+	else if (b == clockGateButton.get())
+	{
+		auto clockOutput = std::static_pointer_cast<OutputClock>(device);
+
+		clockOutput->setClockGate(clockGateButton->getToggleState(), editor->acquisitionIsActive);
+	}
+}
+
+void OutputClockInterface::labelTextChanged(Label* l)
+{
+	if (l == frequencyHzValue.get())
+	{
+		auto d = std::static_pointer_cast<OutputClock>(device);
+
+		auto rate = l->getText().getFloatValue();
+
+		if (rate < 0.1 || rate > 10e6)
+		{
+			l->setText(String(d->getFrequencyHz()), dontSendNotification);
+			return;
+		}
+
+		d->setFrequencyHz(rate);
+	}
+	else if (l == dutyCycleValue.get())
+	{
+		auto d = std::static_pointer_cast<OutputClock>(device);
+
+		uint32_t rate = l->getText().getIntValue();
+
+		if (rate < 10 || rate > 90)
+		{
+			l->setText(String(d->getDutyCycle()), dontSendNotification);
+			return;
+		}
+
+		d->setDutyCycle(rate);
+	}
+	else if (l == delayValue.get())
+	{
+		auto d = std::static_pointer_cast<OutputClock>(device);
+
+		uint32_t rate = l->getText().getIntValue();
+
+		if (rate < 0 || rate > 3600)
+		{
+			l->setText(String(d->getDelay()), dontSendNotification);
+			return;
+		}
+
+		d->setDelay(rate);
+	}
+}
+
+void OutputClockInterface::updateInfoString()
+{
+	String nameString, infoString;
+
+	nameString = "Breakout Board";
+
+	if (device != nullptr)
+	{
+		infoString = "Device: Output Clock";
+		infoString += "\n";
+		infoString += "\n";
+	}
+
+	infoLabel->setText(infoString, dontSendNotification);
+	nameLabel->setText(nameString, dontSendNotification);
+}
diff --git a/Source/UI/OutputClockInterface.h b/Source/UI/OutputClockInterface.h
new file mode 100644
index 0000000..ab41f81
--- /dev/null
+++ b/Source/UI/OutputClockInterface.h
@@ -0,0 +1,82 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef __OUTPUTCLOCKINTERFACE_H__
+#define __OUTPUTCLOCKINTERFACE_H__
+
+#include <VisualizerEditorHeaders.h>
+
+#include "../OnixSourceEditor.h"
+#include "../OnixSourceCanvas.h"
+
+#include "../Devices/OutputClock.h"
+
+class OutputClockInterface : public SettingsInterface,
+	public Label::Listener,
+	public Button::Listener
+{
+public:
+
+	OutputClockInterface(std::shared_ptr<OutputClock> d, OnixSourceEditor* e, OnixSourceCanvas* c);
+
+	/** Disables buttons and starts animation if necessary */
+	void startAcquisition() override {};
+
+	/** Enables buttons and start animation if necessary */
+	void stopAcquisition() override {};
+
+	/** Save parameters to XML */
+	void saveParameters(XmlElement* xml) override {};
+
+	/** Load parameters from XML */
+	void loadParameters(XmlElement* xml) override {};
+
+	/** Updates the info string on the right-hand side of the component */
+	void updateInfoString() override;
+
+	/** Listener methods*/
+	void buttonClicked(Button*) override;
+	void labelTextChanged(Label* l) override;
+
+private:
+
+	std::unique_ptr<Label> nameLabel;
+	std::unique_ptr<Label> infoLabel;
+
+	std::unique_ptr<UtilityButton> deviceEnableButton;
+
+	std::unique_ptr<Label> frequencyHzLabel;
+	std::unique_ptr<Label> frequencyHzValue;
+
+	std::unique_ptr<Label> dutyCycleLabel;
+	std::unique_ptr<Label> dutyCycleValue;
+
+	std::unique_ptr<Label> delayLabel;
+	std::unique_ptr<Label> delayValue;
+
+	std::unique_ptr<UtilityButton> clockGateButton;
+
+	JUCE_LEAK_DETECTOR(OutputClockInterface);
+};
+
+#endif // !__OUTPUTCLOCKINTERFACE_H__
diff --git a/Source/UI/ProbeBrowser.cpp b/Source/UI/ProbeBrowser.cpp
index 6389b55..67a094c 100644
--- a/Source/UI/ProbeBrowser.cpp
+++ b/Source/UI/ProbeBrowser.cpp
@@ -124,10 +124,6 @@ ProbeBrowser::ProbeBrowser(NeuropixV1Interface* parent_) : parent(parent_)
 	dragZoneWidth = 10;
 }
 
-ProbeBrowser::~ProbeBrowser()
-{
-}
-
 void ProbeBrowser::mouseMove(const MouseEvent& event)
 {
 	float y = event.y;
diff --git a/Source/UI/ProbeBrowser.h b/Source/UI/ProbeBrowser.h
index f9f4e7e..530307a 100644
--- a/Source/UI/ProbeBrowser.h
+++ b/Source/UI/ProbeBrowser.h
@@ -33,7 +33,6 @@ class ProbeBrowser : public Component,
 {
 public:
     ProbeBrowser (NeuropixV1Interface*);
-    virtual ~ProbeBrowser();
 
     void mouseMove (const MouseEvent& event);
     void mouseDown (const MouseEvent& event);
diff --git a/Source/UI/SettingsInterface.h b/Source/UI/SettingsInterface.h
index 8fc5ef0..5ce442f 100644
--- a/Source/UI/SettingsInterface.h
+++ b/Source/UI/SettingsInterface.h
@@ -46,13 +46,14 @@ class SettingsInterface : public Component
         PROBE_SETTINGS_INTERFACE,
         BNO055_SETTINGS_INTERFACE,
         MEMORYMONITOR_SETTINGS_INTERFACE,
+        OUTPUTCLOCK_SETTINGS_INTERFACE,
         UNKNOWN_SETTINGS_INTERFACE
     };
 
     /** Constructor */
-    SettingsInterface (std::shared_ptr<OnixDevice> dataSource_, OnixSourceEditor* editor_, OnixSourceCanvas* canvas_)
+    SettingsInterface (std::shared_ptr<OnixDevice> device_, OnixSourceEditor* editor_, OnixSourceCanvas* canvas_)
     {
-        device = dataSource_;
+        device = device_;
         editor = editor_;
         canvas = canvas_;
 
@@ -62,9 +63,6 @@ class SettingsInterface : public Component
         setBounds (0, 0, width, height);
     }
 
-    /** Destructor */
-    ~SettingsInterface() {}
-
     /** Called when acquisition begins */
     virtual void startAcquisition() = 0;
 
@@ -84,7 +82,7 @@ class SettingsInterface : public Component
     Type type = Type::UNKNOWN_SETTINGS_INTERFACE;
 
     /** Pointer to the data source*/
-    std::shared_ptr<OnixDevice> device;
+    std::shared_ptr<OnixDevice> device = nullptr;
 
 protected:
     OnixSourceEditor* editor;

From a66e01dc33faa2ac41d04131abd1b1967caeaa46 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Mon, 17 Mar 2025 16:07:32 -0400
Subject: [PATCH 07/25] Only report read_frame error when acquisition is active

---
 Source/FrameReader.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/FrameReader.cpp b/Source/FrameReader.cpp
index c6c2349..987d2d9 100644
--- a/Source/FrameReader.cpp
+++ b/Source/FrameReader.cpp
@@ -50,6 +50,8 @@ void FrameReader::run()
 
 		if (res < ONI_ESUCCESS)
 		{
+			if (threadShouldExit()) return;
+
 			LOGE("Error reading ONI frame: ", oni_error_str(res), " code ", res);
 			return;
 		}

From c35b134e4ead22146c905456707cd29bb97fe121 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Mon, 17 Mar 2025 16:25:28 -0400
Subject: [PATCH 08/25] Add Heartbeat

---
 Source/Devices/DeviceList.h      |   1 +
 Source/Devices/Heartbeat.cpp     |  56 ++++++++++++++
 Source/Devices/Heartbeat.h       |  76 +++++++++++++++++++
 Source/Devices/MemoryMonitor.h   |   2 +-
 Source/OnixDevice.h              |   1 +
 Source/OnixSource.cpp            |  14 ++++
 Source/OnixSourceCanvas.cpp      |  14 +++-
 Source/UI/HeartbeatInterface.cpp | 125 +++++++++++++++++++++++++++++++
 Source/UI/HeartbeatInterface.h   |  74 ++++++++++++++++++
 Source/UI/InterfaceList.h        |   1 +
 Source/UI/SettingsInterface.h    |   1 +
 11 files changed, 361 insertions(+), 4 deletions(-)
 create mode 100644 Source/Devices/Heartbeat.cpp
 create mode 100644 Source/Devices/Heartbeat.h
 create mode 100644 Source/UI/HeartbeatInterface.cpp
 create mode 100644 Source/UI/HeartbeatInterface.h

diff --git a/Source/Devices/DeviceList.h b/Source/Devices/DeviceList.h
index 308e744..b7fcada 100644
--- a/Source/Devices/DeviceList.h
+++ b/Source/Devices/DeviceList.h
@@ -5,3 +5,4 @@
 #include "Neuropixels2e.h"
 #include "MemoryMonitor.h"
 #include "OutputClock.h"
+#include "Heartbeat.h"
diff --git a/Source/Devices/Heartbeat.cpp b/Source/Devices/Heartbeat.cpp
new file mode 100644
index 0000000..2ed8d92
--- /dev/null
+++ b/Source/Devices/Heartbeat.cpp
@@ -0,0 +1,56 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "Heartbeat.h"
+
+Heartbeat::Heartbeat(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
+	: OnixDevice(name, OnixDeviceType::HEARTBEAT, deviceIdx_, ctx_)
+{
+}
+
+int Heartbeat::configureDevice()
+{
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (uint32_t)HeartbeatRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0)));
+
+	return 0;
+}
+
+int Heartbeat::updateSettings()
+{
+	writeBeatsPerSecondRegister();
+	return 0;
+}
+
+void Heartbeat::setBeatsPerSecond(uint32_t beats, bool writeToRegister)
+{
+	beatsPerSecond = beats;
+	if (writeToRegister) writeBeatsPerSecondRegister();
+}
+
+void Heartbeat::writeBeatsPerSecondRegister()
+{
+	oni_reg_val_t clkHz;
+
+	ONI_OK(oni_read_reg(ctx, deviceIdx, (oni_reg_addr_t)HeartbeatRegisters::CLK_HZ, &clkHz));
+	ONI_OK(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)HeartbeatRegisters::CLK_DIV, clkHz / beatsPerSecond));
+}
diff --git a/Source/Devices/Heartbeat.h b/Source/Devices/Heartbeat.h
new file mode 100644
index 0000000..af4f478
--- /dev/null
+++ b/Source/Devices/Heartbeat.h
@@ -0,0 +1,76 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef __HEARTBEAT_H__
+#define __HEARTBEAT_H__
+
+#include "../OnixDevice.h"
+
+enum class HeartbeatRegisters : uint32_t
+{
+	ENABLE = 0,
+	CLK_DIV = 1,
+	CLK_HZ = 2
+};
+
+/*
+	Configures and streams data from a MemoryMonitor device on a Breakout Board
+*/
+class Heartbeat : public OnixDevice
+{
+public:
+	Heartbeat(String name, const oni_dev_idx_t, const oni_ctx);
+
+	/** Configures the device so that it is ready to stream with default settings */
+	int configureDevice() override;
+
+	/** Update the settings of the device */
+	int updateSettings() override;
+
+	/** Starts probe data streaming */
+	void startAcquisition() override {};
+
+	/** Stops probe data streaming*/
+	void stopAcquisition() override {};
+
+	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
+	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override {};
+
+	void addFrame(oni_frame_t*) override { LOGD("Heartbeat"); };
+
+	void processFrames() override {};
+
+	uint32_t getBeatsPerSecond() const { return beatsPerSecond; }
+
+	void setBeatsPerSecond(uint32_t beats, bool writeToRegister = false);
+
+private:
+
+	uint32_t beatsPerSecond = 100;
+
+	void writeBeatsPerSecondRegister();
+
+	JUCE_LEAK_DETECTOR(Heartbeat);
+};
+
+#endif
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index 328512e..47f4a25 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -126,4 +126,4 @@ class MemoryMonitorUsage : public LevelMonitor
 	JUCE_LEAK_DETECTOR(MemoryMonitorUsage);
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/Source/OnixDevice.h b/Source/OnixDevice.h
index 95c36ca..31132c8 100644
--- a/Source/OnixDevice.h
+++ b/Source/OnixDevice.h
@@ -57,6 +57,7 @@ enum class OnixDeviceType {
 	ADC,
 	MEMORYMONITOR,
 	OUTPUTCLOCK,
+	HEARTBEAT,
 };
 
 struct StreamInfo {
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 7949466..96434a7 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -246,6 +246,20 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 
 			sources.push_back(outputClock);
 		}
+		else if (devices[dev_idx].id == ONIX_HEARTBEAT)
+		{
+			auto heartbeat = std::make_shared<Heartbeat>("Heartbeat", devices[dev_idx].idx, ctx);
+
+			int result = heartbeat->configureDevice();
+
+			if (result != 0)
+			{
+				LOGE("Device Idx: ", devices[dev_idx].idx, " Error enabling device stream.");
+				continue;
+			}
+
+			sources.push_back(heartbeat);
+		}
 	}
 
 	val = 1;
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index 2bb9b21..d57dbde 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -93,7 +93,7 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 		}
 		else if (source->type == OnixDeviceType::BNO)
 		{
-			Bno055Interface* bno055Interface = new Bno055Interface(std::static_pointer_cast<Bno055>(source), editor, this);
+			auto bno055Interface = new Bno055Interface(std::static_pointer_cast<Bno055>(source), editor, this);
 			settingsInterfaces.add(bno055Interface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(bno055Interface), true);
 
@@ -101,7 +101,7 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 		}
 		else if (source->type == OnixDeviceType::MEMORYMONITOR)
 		{
-			MemoryMonitorInterface* memoryMonitorInterface = new MemoryMonitorInterface(std::static_pointer_cast<MemoryMonitor>(source), editor, this);
+			auto memoryMonitorInterface = new MemoryMonitorInterface(std::static_pointer_cast<MemoryMonitor>(source), editor, this);
 			settingsInterfaces.add(memoryMonitorInterface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(memoryMonitorInterface), true);
 
@@ -109,10 +109,18 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 		}
 		else if (source->type == OnixDeviceType::OUTPUTCLOCK)
 		{
-			OutputClockInterface* outputClockInterface = new OutputClockInterface(std::static_pointer_cast<OutputClock>(source), editor, this);
+			auto outputClockInterface = new OutputClockInterface(std::static_pointer_cast<OutputClock>(source), editor, this);
 			settingsInterfaces.add(outputClockInterface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(outputClockInterface), true);
 
+			portTabIndex.add(portTabNumber++);
+		}
+		else if (source->type == OnixDeviceType::HEARTBEAT)
+		{
+			auto heartbeatInterface = new HeartbeatInterface(std::static_pointer_cast<Heartbeat>(source), editor, this);
+			settingsInterfaces.add(heartbeatInterface);
+			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(heartbeatInterface), true);
+
 			portTabIndex.add(portTabNumber++);
 		}
 	}
diff --git a/Source/UI/HeartbeatInterface.cpp b/Source/UI/HeartbeatInterface.cpp
new file mode 100644
index 0000000..fcd1179
--- /dev/null
+++ b/Source/UI/HeartbeatInterface.cpp
@@ -0,0 +1,125 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "HeartbeatInterface.h"
+
+HeartbeatInterface::HeartbeatInterface(std::shared_ptr<Heartbeat> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
+	SettingsInterface(d, e, c)
+{
+	if (device != nullptr)
+	{
+		nameLabel = std::make_unique<Label>("MAIN", "NAME");
+		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
+		nameLabel->setBounds(50, 40, 370, 45);
+		addAndMakeVisible(nameLabel.get());
+
+		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
+		deviceEnableButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
+		deviceEnableButton->setRadius(3.0f);
+		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
+		deviceEnableButton->setClickingTogglesState(true);
+		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton->setTooltip("If disabled, Heartbeat will not stream data during acquisition");
+		deviceEnableButton->addListener(this);
+		addAndMakeVisible(deviceEnableButton.get());
+
+		infoLabel = std::make_unique<Label>("INFO", "INFO");
+		infoLabel->setFont(FontOptions(15.0f));
+		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
+		infoLabel->setJustificationType(Justification::topLeft);
+		addAndMakeVisible(infoLabel.get());
+
+		beatsPerSecondLabel = std::make_unique<Label>("beatsPerSecondLabel", "Beats Per Second [Hz]");
+		beatsPerSecondLabel->setBounds(infoLabel->getX(), infoLabel->getBottom() + 10, 170, 20);
+		addAndMakeVisible(beatsPerSecondLabel.get());
+
+		beatsPerSecondValue = std::make_unique<Label>("beatsPerSecondValue", String(std::static_pointer_cast<Heartbeat>(device)->getBeatsPerSecond()));
+		beatsPerSecondValue->setEditable(true);
+		beatsPerSecondValue->setBounds(beatsPerSecondLabel->getRight() + 3, beatsPerSecondLabel->getY(), 50, 20);
+		beatsPerSecondValue->setTooltip("Sets the rate at which beats are produced. Must be between 1 and 10 MHz.");
+		beatsPerSecondValue->setColour(Label::ColourIds::backgroundColourId, Colours::lightgrey);
+		beatsPerSecondValue->setJustificationType(Justification::centred);
+		beatsPerSecondValue->addListener(this);
+		addAndMakeVisible(beatsPerSecondValue.get());
+
+		updateInfoString();
+	}
+
+	type = SettingsInterface::Type::HEARTBEAT_SETTINGS_INTERFACE;
+}
+
+void HeartbeatInterface::buttonClicked(Button* button)
+{
+	if (button == deviceEnableButton.get())
+	{
+		device->setEnabled(deviceEnableButton->getToggleState());
+		device->configureDevice();
+		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
+
+		if (device->isEnabled())
+		{
+			deviceEnableButton->setLabel("ENABLED");
+		}
+		else
+		{
+			deviceEnableButton->setLabel("DISABLED");
+		}
+
+		CoreServices::updateSignalChain(editor);
+	}
+}
+
+void HeartbeatInterface::labelTextChanged(Label* l)
+{
+	if (l == beatsPerSecondValue.get())
+	{
+		auto d = std::static_pointer_cast<Heartbeat>(device);
+
+		int rate = l->getText().getIntValue();
+
+		if (rate < 1 || rate > 10e6)
+		{
+			l->setText(String(d->getBeatsPerSecond()), dontSendNotification);
+			return;
+		}
+
+		d->setBeatsPerSecond((uint32_t)rate, editor->acquisitionIsActive);
+	}
+}
+
+void HeartbeatInterface::updateInfoString()
+{
+	String nameString, infoString;
+
+	nameString = "Breakout Board";
+
+	if (device != nullptr)
+	{
+		infoString = "Device: Heartbeat";
+		infoString += "\n";
+		infoString += "\n";
+	}
+
+	infoLabel->setText(infoString, dontSendNotification);
+	nameLabel->setText(nameString, dontSendNotification);
+}
diff --git a/Source/UI/HeartbeatInterface.h b/Source/UI/HeartbeatInterface.h
new file mode 100644
index 0000000..41b90fe
--- /dev/null
+++ b/Source/UI/HeartbeatInterface.h
@@ -0,0 +1,74 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef __HEARTBEATINTERFACE_H__
+#define __HEARTBEATINTERFACE_H__
+
+#include <VisualizerEditorHeaders.h>
+
+#include "../OnixSourceEditor.h"
+#include "../OnixSourceCanvas.h"
+
+#include "../Devices/Heartbeat.h"
+
+class HeartbeatInterface : public SettingsInterface,
+	public Label::Listener,
+	public Button::Listener
+{
+public:
+
+	HeartbeatInterface(std::shared_ptr<Heartbeat> d, OnixSourceEditor* e, OnixSourceCanvas* c);
+
+	/** Disables buttons and starts animation if necessary */
+	void startAcquisition() override {};
+
+	/** Enables buttons and start animation if necessary */
+	void stopAcquisition() override {};
+
+	/** Save parameters to XML */
+	void saveParameters(XmlElement* xml) override {};
+
+	/** Load parameters from XML */
+	void loadParameters(XmlElement* xml) override {};
+
+	/** Updates the info string on the right-hand side of the component */
+	void updateInfoString() override;
+
+	/** Listener methods*/
+	void buttonClicked(Button*) override;
+	void labelTextChanged(Label* l) override;
+
+private:
+
+	std::unique_ptr<Label> nameLabel;
+	std::unique_ptr<Label> infoLabel;
+
+	std::unique_ptr<Label> beatsPerSecondLabel;
+	std::unique_ptr<Label> beatsPerSecondValue;
+
+	std::unique_ptr<UtilityButton> deviceEnableButton;
+
+	JUCE_LEAK_DETECTOR(HeartbeatInterface);
+};
+
+#endif
diff --git a/Source/UI/InterfaceList.h b/Source/UI/InterfaceList.h
index 8c0824a..40448cd 100644
--- a/Source/UI/InterfaceList.h
+++ b/Source/UI/InterfaceList.h
@@ -3,3 +3,4 @@
 #include "Bno055Interface.h"
 #include "MemoryMonitorInterface.h"
 #include "OutputClockInterface.h"
+#include "HeartbeatInterface.h"
diff --git a/Source/UI/SettingsInterface.h b/Source/UI/SettingsInterface.h
index 5ce442f..933d4b6 100644
--- a/Source/UI/SettingsInterface.h
+++ b/Source/UI/SettingsInterface.h
@@ -47,6 +47,7 @@ class SettingsInterface : public Component
         BNO055_SETTINGS_INTERFACE,
         MEMORYMONITOR_SETTINGS_INTERFACE,
         OUTPUTCLOCK_SETTINGS_INTERFACE,
+        HEARTBEAT_SETTINGS_INTERFACE,
         UNKNOWN_SETTINGS_INTERFACE
     };
 

From 56c305c16b2e5dffb23052636b8a42bbd606bd6c Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Tue, 18 Mar 2025 12:59:03 -0400
Subject: [PATCH 09/25] Ensure that frames are deleted

---
 Source/Devices/Heartbeat.h   | 2 +-
 Source/Devices/OutputClock.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Devices/Heartbeat.h b/Source/Devices/Heartbeat.h
index af4f478..ac952bc 100644
--- a/Source/Devices/Heartbeat.h
+++ b/Source/Devices/Heartbeat.h
@@ -56,7 +56,7 @@ class Heartbeat : public OnixDevice
 	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
 	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override {};
 
-	void addFrame(oni_frame_t*) override { LOGD("Heartbeat"); };
+	void addFrame(oni_frame_t* frame) override { oni_destroy_frame(frame); }
 
 	void processFrames() override {};
 
diff --git a/Source/Devices/OutputClock.h b/Source/Devices/OutputClock.h
index 3407bf8..5567346 100644
--- a/Source/Devices/OutputClock.h
+++ b/Source/Devices/OutputClock.h
@@ -62,7 +62,7 @@ class OutputClock : public OnixDevice
 	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
 	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override {};
 
-	void addFrame(oni_frame_t*) override {};
+	void addFrame(oni_frame_t* frame) override { oni_destroy_frame(frame); }
 
 	void processFrames() override {};
 

From d3100f7b1591f593a86b078eeeb0c75c51e4d100 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Tue, 18 Mar 2025 16:09:06 -0400
Subject: [PATCH 10/25] Add HarpSyncInput

---
 Source/Devices/DeviceList.h          |   1 +
 Source/Devices/HarpSyncInput.cpp     | 126 +++++++++++++++++++++++++++
 Source/Devices/HarpSyncInput.h       |  90 +++++++++++++++++++
 Source/OnixDevice.h                  |   1 +
 Source/OnixSource.cpp                |  14 +++
 Source/OnixSourceCanvas.cpp          |   8 ++
 Source/UI/HarpSyncInputInterface.cpp |  94 ++++++++++++++++++++
 Source/UI/HarpSyncInputInterface.h   |  69 +++++++++++++++
 Source/UI/InterfaceList.h            |   1 +
 Source/UI/SettingsInterface.h        |   1 +
 10 files changed, 405 insertions(+)
 create mode 100644 Source/Devices/HarpSyncInput.cpp
 create mode 100644 Source/Devices/HarpSyncInput.h
 create mode 100644 Source/UI/HarpSyncInputInterface.cpp
 create mode 100644 Source/UI/HarpSyncInputInterface.h

diff --git a/Source/Devices/DeviceList.h b/Source/Devices/DeviceList.h
index b7fcada..de2435c 100644
--- a/Source/Devices/DeviceList.h
+++ b/Source/Devices/DeviceList.h
@@ -6,3 +6,4 @@
 #include "MemoryMonitor.h"
 #include "OutputClock.h"
 #include "Heartbeat.h"
+#include "HarpSyncInput.h"
diff --git a/Source/Devices/HarpSyncInput.cpp b/Source/Devices/HarpSyncInput.cpp
new file mode 100644
index 0000000..4b796b5
--- /dev/null
+++ b/Source/Devices/HarpSyncInput.cpp
@@ -0,0 +1,126 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "HarpSyncInput.h"
+
+HarpSyncInput::HarpSyncInput(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
+	: OnixDevice(name, OnixDeviceType::HARPSYNCINPUT, deviceIdx_, ctx_)
+{
+	setEnabled(false);
+
+	StreamInfo harpTimeStream;
+	harpTimeStream.name = name + "-HarpTime";
+	harpTimeStream.description = "Harp clock time corresponding to the local acquisition ONIX clock count";
+	harpTimeStream.identifier = "onix-harpsyncinput.data.harptime";
+	harpTimeStream.numChannels = 1;
+	harpTimeStream.sampleRate = 1;
+	harpTimeStream.channelPrefix = "HarpTime";
+	harpTimeStream.bitVolts = 1.0f;
+	harpTimeStream.channelType = ContinuousChannel::Type::AUX;
+	streams.add(harpTimeStream);
+
+	for (int i = 0; i < numFrames; i++)
+		eventCodes[i] = 0;
+}
+
+int HarpSyncInput::configureDevice()
+{
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (uint32_t)HarpSyncInputRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0)));
+
+	return 0;
+}
+
+int HarpSyncInput::updateSettings()
+{
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)HarpSyncInputRegisters::SOURCE, (oni_reg_val_t)HarpSyncSource::Breakout));
+
+	return 0;
+}
+
+void HarpSyncInput::startAcquisition()
+{
+	currentFrame = 0;
+	sampleNumber = 0;
+}
+
+void HarpSyncInput::stopAcquisition()
+{
+	while (!frameArray.isEmpty())
+	{
+		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+		oni_destroy_frame(frameArray.removeAndReturn(0));
+	}
+
+	currentFrame = 0;
+	sampleNumber = 0;
+}
+
+void HarpSyncInput::addFrame(oni_frame_t* frame)
+{
+	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+	frameArray.add(frame);
+}
+
+void HarpSyncInput::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
+{
+	for (StreamInfo streamInfo : streams)
+	{
+		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
+
+		if (streamInfo.channelPrefix.equalsIgnoreCase("HarpTime"))
+			harpTimeBuffer = sourceBuffers.getLast();
+	}
+}
+
+void HarpSyncInput::processFrames()
+{
+	while (!frameArray.isEmpty())
+	{
+		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+		oni_frame_t* frame = frameArray.removeAndReturn(0);
+
+		uint32_t* dataPtr = (uint32_t*)frame->data;
+
+		timestamps[currentFrame] = *(uint64_t*)frame->data;
+
+		harpTimeSamples[currentFrame] = *(dataPtr + 2) + 1;
+
+		oni_destroy_frame(frame);
+
+		sampleNumbers[currentFrame] = sampleNumber++;
+
+		currentFrame++;
+
+		if (currentFrame >= numFrames)
+		{
+			shouldAddToBuffer = true;
+			currentFrame = 0;
+		}
+
+		if (shouldAddToBuffer)
+		{
+			shouldAddToBuffer = false;
+			harpTimeBuffer->addToBuffer(harpTimeSamples, sampleNumbers, timestamps, eventCodes, numFrames);
+		}
+	}
+}
diff --git a/Source/Devices/HarpSyncInput.h b/Source/Devices/HarpSyncInput.h
new file mode 100644
index 0000000..a8bcc51
--- /dev/null
+++ b/Source/Devices/HarpSyncInput.h
@@ -0,0 +1,90 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef __HARPSYNCINPUT_H__
+#define __HARPSYNCINPUT_H__
+
+#include "../OnixDevice.h"
+
+enum class HarpSyncInputRegisters : uint32_t
+{
+	ENABLE = 0,
+	SOURCE = 1
+};
+
+enum class HarpSyncSource : uint32_t
+{
+	Breakout = 0,
+	ClockAdapter = 1
+};
+
+/*
+	Configures and streams data from a HarpSyncInput device on a Breakout Board
+*/
+class HarpSyncInput : public OnixDevice
+{
+public:
+	HarpSyncInput(String name, const oni_dev_idx_t, const oni_ctx);
+
+	/** Configures the device so that it is ready to stream with default settings */
+	int configureDevice() override;
+
+	/** Update the settings of the device */
+	int updateSettings() override;
+
+	/** Starts probe data streaming */
+	void startAcquisition() override;
+
+	/** Stops probe data streaming*/
+	void stopAcquisition() override;
+
+	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
+	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override;
+
+	void addFrame(oni_frame_t* frame) override;
+
+	void processFrames() override;
+
+private:
+
+	DataBuffer* harpTimeBuffer;
+
+	static const int numFrames = 2;
+
+	Array<oni_frame_t*, CriticalSection, numFrames> frameArray;
+
+	unsigned short currentFrame = 0;
+	int sampleNumber = 0;
+
+	bool shouldAddToBuffer = false;
+
+	float harpTimeSamples[numFrames];
+
+	double timestamps[numFrames];
+	int64 sampleNumbers[numFrames];
+	uint64 eventCodes[numFrames];
+
+	JUCE_LEAK_DETECTOR(HarpSyncInput);
+};
+
+#endif
diff --git a/Source/OnixDevice.h b/Source/OnixDevice.h
index 31132c8..4e1ae76 100644
--- a/Source/OnixDevice.h
+++ b/Source/OnixDevice.h
@@ -58,6 +58,7 @@ enum class OnixDeviceType {
 	MEMORYMONITOR,
 	OUTPUTCLOCK,
 	HEARTBEAT,
+	HARPSYNCINPUT,
 };
 
 struct StreamInfo {
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 96434a7..e4e6cd2 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -260,6 +260,20 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 
 			sources.push_back(heartbeat);
 		}
+		else if (devices[dev_idx].id == ONIX_HARPSYNCINPUT)
+		{
+			auto harpSyncInput = std::make_shared<HarpSyncInput>("Harp Sync Input", devices[dev_idx].idx, ctx);
+
+			int result = harpSyncInput->configureDevice();
+
+			if (result != 0)
+			{
+				LOGE("Device Idx: ", devices[dev_idx].idx, " Error enabling device stream.");
+				continue;
+			}
+
+			sources.push_back(harpSyncInput);
+		}
 	}
 
 	val = 1;
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index d57dbde..4f4681d 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -121,6 +121,14 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 			settingsInterfaces.add(heartbeatInterface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(heartbeatInterface), true);
 
+			portTabIndex.add(portTabNumber++);
+		}
+		else if (source->type == OnixDeviceType::HARPSYNCINPUT)
+		{
+			auto harpSyncInputInterface = new HarpSyncInputInterface(std::static_pointer_cast<HarpSyncInput>(source), editor, this);
+			settingsInterfaces.add(harpSyncInputInterface);
+			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(harpSyncInputInterface), true);
+
 			portTabIndex.add(portTabNumber++);
 		}
 	}
diff --git a/Source/UI/HarpSyncInputInterface.cpp b/Source/UI/HarpSyncInputInterface.cpp
new file mode 100644
index 0000000..1c6cbb6
--- /dev/null
+++ b/Source/UI/HarpSyncInputInterface.cpp
@@ -0,0 +1,94 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "HarpSyncInputInterface.h"
+
+HarpSyncInputInterface::HarpSyncInputInterface(std::shared_ptr<HarpSyncInput> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
+	SettingsInterface(d, e, c)
+{
+	if (device != nullptr)
+	{
+		nameLabel = std::make_unique<Label>("MAIN", "NAME");
+		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
+		nameLabel->setBounds(50, 40, 370, 45);
+		addAndMakeVisible(nameLabel.get());
+
+		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
+		deviceEnableButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
+		deviceEnableButton->setRadius(3.0f);
+		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
+		deviceEnableButton->setClickingTogglesState(true);
+		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
+		deviceEnableButton->addListener(this);
+		addAndMakeVisible(deviceEnableButton.get());
+
+		infoLabel = std::make_unique<Label>("INFO", "INFO");
+		infoLabel->setFont(FontOptions(15.0f));
+		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
+		infoLabel->setJustificationType(Justification::topLeft);
+		addAndMakeVisible(infoLabel.get());
+
+		updateInfoString();
+	}
+
+	type = SettingsInterface::Type::HARPSYNCINPUT_SETTINGS_INTERFACE;
+}
+
+void HarpSyncInputInterface::buttonClicked(Button* button)
+{
+	if (button == deviceEnableButton.get())
+	{
+		device->setEnabled(deviceEnableButton->getToggleState());
+		device->configureDevice();
+		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
+
+		if (device->isEnabled())
+		{
+			deviceEnableButton->setLabel("ENABLED");
+		}
+		else
+		{
+			deviceEnableButton->setLabel("DISABLED");
+		}
+
+		CoreServices::updateSignalChain(editor);
+	}
+}
+
+void HarpSyncInputInterface::updateInfoString()
+{
+	String nameString, infoString;
+
+	nameString = "Breakout Board";
+
+	if (device != nullptr)
+	{
+		infoString = "Device: Harp Sync Input";
+		infoString += "\n";
+		infoString += "\n";
+	}
+
+	infoLabel->setText(infoString, dontSendNotification);
+	nameLabel->setText(nameString, dontSendNotification);
+}
diff --git a/Source/UI/HarpSyncInputInterface.h b/Source/UI/HarpSyncInputInterface.h
new file mode 100644
index 0000000..a6c6781
--- /dev/null
+++ b/Source/UI/HarpSyncInputInterface.h
@@ -0,0 +1,69 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef __HARPSYNCINPUTINTERFACE_H__
+#define __HARPSYNCINPUTINTERFACE_H__
+
+#include <VisualizerEditorHeaders.h>
+
+#include "../OnixSourceEditor.h"
+#include "../OnixSourceCanvas.h"
+
+#include "../Devices/HarpSyncInput.h"
+
+class HarpSyncInputInterface : public SettingsInterface,
+	public Button::Listener
+{
+public:
+
+	HarpSyncInputInterface(std::shared_ptr<HarpSyncInput> d, OnixSourceEditor* e, OnixSourceCanvas* c);
+
+	/** Disables buttons and starts animation if necessary */
+	void startAcquisition() override {};
+
+	/** Enables buttons and start animation if necessary */
+	void stopAcquisition() override {};
+
+	/** Save parameters to XML */
+	void saveParameters(XmlElement* xml) override {};
+
+	/** Load parameters from XML */
+	void loadParameters(XmlElement* xml) override {};
+
+	/** Updates the info string on the right-hand side of the component */
+	void updateInfoString() override;
+
+	/** Listener methods*/
+	void buttonClicked(Button*) override;
+
+private:
+
+	std::unique_ptr<Label> nameLabel;
+	std::unique_ptr<Label> infoLabel;
+
+	std::unique_ptr<UtilityButton> deviceEnableButton;
+
+	JUCE_LEAK_DETECTOR(HarpSyncInputInterface);
+};
+
+#endif
diff --git a/Source/UI/InterfaceList.h b/Source/UI/InterfaceList.h
index 40448cd..bf8a83a 100644
--- a/Source/UI/InterfaceList.h
+++ b/Source/UI/InterfaceList.h
@@ -4,3 +4,4 @@
 #include "MemoryMonitorInterface.h"
 #include "OutputClockInterface.h"
 #include "HeartbeatInterface.h"
+#include "HarpSyncInputInterface.h"
diff --git a/Source/UI/SettingsInterface.h b/Source/UI/SettingsInterface.h
index 933d4b6..31b00cf 100644
--- a/Source/UI/SettingsInterface.h
+++ b/Source/UI/SettingsInterface.h
@@ -48,6 +48,7 @@ class SettingsInterface : public Component
         MEMORYMONITOR_SETTINGS_INTERFACE,
         OUTPUTCLOCK_SETTINGS_INTERFACE,
         HEARTBEAT_SETTINGS_INTERFACE,
+        HARPSYNCINPUT_SETTINGS_INTERFACE,
         UNKNOWN_SETTINGS_INTERFACE
     };
 

From df3200a94c6e9575268c7b9b3b68c701d6baee3e Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Fri, 21 Mar 2025 09:39:26 -0400
Subject: [PATCH 11/25] Set toggle state after the listener is attached

---
 Source/UI/HarpSyncInputInterface.cpp | 2 +-
 Source/UI/HeartbeatInterface.cpp     | 2 +-
 Source/UI/MemoryMonitorInterface.cpp | 2 +-
 Source/UI/NeuropixV1Interface.cpp    | 2 +-
 Source/UI/OutputClockInterface.cpp   | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Source/UI/HarpSyncInputInterface.cpp b/Source/UI/HarpSyncInputInterface.cpp
index 1c6cbb6..979111b 100644
--- a/Source/UI/HarpSyncInputInterface.cpp
+++ b/Source/UI/HarpSyncInputInterface.cpp
@@ -38,10 +38,10 @@ HarpSyncInputInterface::HarpSyncInputInterface(std::shared_ptr<HarpSyncInput> d,
 		deviceEnableButton->setRadius(3.0f);
 		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
-		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
 		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
+		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
 
 		infoLabel = std::make_unique<Label>("INFO", "INFO");
 		infoLabel->setFont(FontOptions(15.0f));
diff --git a/Source/UI/HeartbeatInterface.cpp b/Source/UI/HeartbeatInterface.cpp
index fcd1179..fc3e661 100644
--- a/Source/UI/HeartbeatInterface.cpp
+++ b/Source/UI/HeartbeatInterface.cpp
@@ -38,10 +38,10 @@ HeartbeatInterface::HeartbeatInterface(std::shared_ptr<Heartbeat> d, OnixSourceE
 		deviceEnableButton->setRadius(3.0f);
 		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
-		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
 		deviceEnableButton->setTooltip("If disabled, Heartbeat will not stream data during acquisition");
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
+		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
 
 		infoLabel = std::make_unique<Label>("INFO", "INFO");
 		infoLabel->setFont(FontOptions(15.0f));
diff --git a/Source/UI/MemoryMonitorInterface.cpp b/Source/UI/MemoryMonitorInterface.cpp
index 025616e..0b2ab2b 100644
--- a/Source/UI/MemoryMonitorInterface.cpp
+++ b/Source/UI/MemoryMonitorInterface.cpp
@@ -38,10 +38,10 @@ MemoryMonitorInterface::MemoryMonitorInterface(std::shared_ptr<MemoryMonitor> d,
 		deviceEnableButton->setRadius(3.0f);
 		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
-		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
 		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
+		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
 
 		infoLabel = std::make_unique<Label>("INFO", "INFO");
 		infoLabel->setFont(FontOptions(15.0f));
diff --git a/Source/UI/NeuropixV1Interface.cpp b/Source/UI/NeuropixV1Interface.cpp
index a9a0cae..69f65ea 100644
--- a/Source/UI/NeuropixV1Interface.cpp
+++ b/Source/UI/NeuropixV1Interface.cpp
@@ -52,10 +52,10 @@ NeuropixV1Interface::NeuropixV1Interface(std::shared_ptr<Neuropixels_1> d, OnixS
 		probeEnableButton->setRadius(3.0f);
 		probeEnableButton->setBounds(630, currentHeight + 25, 100, 22);
 		probeEnableButton->setClickingTogglesState(true);
-		probeEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
 		probeEnableButton->setTooltip("If disabled, probe will not stream data during acquisition");
 		probeEnableButton->addListener(this);
 		addAndMakeVisible(probeEnableButton.get());
+		probeEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
 
 		electrodesLabel = std::make_unique<Label>("ELECTRODES", "ELECTRODES");
 		electrodesLabel->setFont(FontOptions("Inter", "Regular", 13.0f));
diff --git a/Source/UI/OutputClockInterface.cpp b/Source/UI/OutputClockInterface.cpp
index 2f9a47b..a4648a2 100644
--- a/Source/UI/OutputClockInterface.cpp
+++ b/Source/UI/OutputClockInterface.cpp
@@ -38,10 +38,10 @@ OutputClockInterface::OutputClockInterface(std::shared_ptr<OutputClock> d, OnixS
 		deviceEnableButton->setRadius(3.0f);
 		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
-		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
-		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
+		deviceEnableButton->setTooltip("If disabled, Output Clock will not be active during acquisition");
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
+		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
 
 		infoLabel = std::make_unique<Label>("INFO", "INFO");
 		infoLabel->setFont(FontOptions(15.0f));

From cb3142490fee55ebcd6ecfd54535d94078253ee3 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Fri, 21 Mar 2025 09:39:51 -0400
Subject: [PATCH 12/25] Add AnalogIO - Note: Currently this does not write data
 frames to the device. This will be added in a later commit

---
 Source/Devices/AnalogIO.cpp     | 193 +++++++++++++++++++++++++++
 Source/Devices/AnalogIO.h       | 178 ++++++++++++++++++++++++
 Source/Devices/DeviceList.h     |   1 +
 Source/OnixDevice.h             |   1 +
 Source/OnixSource.cpp           |  38 +++++-
 Source/OnixSourceCanvas.cpp     |   8 ++
 Source/UI/AnalogIOInterface.cpp | 230 ++++++++++++++++++++++++++++++++
 Source/UI/AnalogIOInterface.h   |  85 ++++++++++++
 Source/UI/InterfaceList.h       |   1 +
 Source/UI/SettingsInterface.h   |   1 +
 10 files changed, 730 insertions(+), 6 deletions(-)
 create mode 100644 Source/Devices/AnalogIO.cpp
 create mode 100644 Source/Devices/AnalogIO.h
 create mode 100644 Source/UI/AnalogIOInterface.cpp
 create mode 100644 Source/UI/AnalogIOInterface.h

diff --git a/Source/Devices/AnalogIO.cpp b/Source/Devices/AnalogIO.cpp
new file mode 100644
index 0000000..988cbaa
--- /dev/null
+++ b/Source/Devices/AnalogIO.cpp
@@ -0,0 +1,193 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "AnalogIO.h"
+
+AnalogIO::AnalogIO(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
+	: OnixDevice(name, OnixDeviceType::ANALOGIO, deviceIdx_, ctx_)
+{
+	StreamInfo analogInputStream;
+	analogInputStream.name = name + "-AnalogInput";
+	analogInputStream.description = "Analog Input data";
+	analogInputStream.identifier = "onix-analogio.data.input";
+	analogInputStream.numChannels = 12;
+	analogInputStream.sampleRate = std::floor(100000 / framesToAverage);
+	analogInputStream.channelPrefix = "AnalogInput";
+	analogInputStream.bitVolts = 1.0f;
+	analogInputStream.channelType = ContinuousChannel::Type::ADC;
+	streams.add(analogInputStream);
+
+	for (int i = 0; i < numFrames; i++)
+		eventCodes[i] = 0;
+
+	for (int i = 0; i < numChannels; i += 1)
+	{
+		channelDirection[i] = AnalogIODirection::Input;
+		channelVoltageRange[i] = AnalogIOVoltageRange::FiveVolts;
+	}
+
+	dataType = AnalogIODataType::S16;
+}
+
+int AnalogIO::configureDevice()
+{
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (uint32_t)AnalogIORegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0)));
+
+	return 0;
+}
+
+int AnalogIO::updateSettings()
+{
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH00_IN_RANGE, (oni_reg_val_t)channelVoltageRange[0]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH01_IN_RANGE, (oni_reg_val_t)channelVoltageRange[1]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH02_IN_RANGE, (oni_reg_val_t)channelVoltageRange[2]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH03_IN_RANGE, (oni_reg_val_t)channelVoltageRange[3]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH04_IN_RANGE, (oni_reg_val_t)channelVoltageRange[4]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH05_IN_RANGE, (oni_reg_val_t)channelVoltageRange[5]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH06_IN_RANGE, (oni_reg_val_t)channelVoltageRange[6]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH07_IN_RANGE, (oni_reg_val_t)channelVoltageRange[7]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH08_IN_RANGE, (oni_reg_val_t)channelVoltageRange[8]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH09_IN_RANGE, (oni_reg_val_t)channelVoltageRange[9]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH10_IN_RANGE, (oni_reg_val_t)channelVoltageRange[10]));
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH11_IN_RANGE, (oni_reg_val_t)channelVoltageRange[11]));
+
+	uint32_t ioReg = 0;
+
+	for (int i = 0; i < numChannels; i += 1)
+	{
+		ioReg = (ioReg & ~((uint32_t)1 << i)) | ((uint32_t)(channelDirection[i]) << i);
+	}
+
+	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CHDIR, ioReg));
+
+	for (int i = 0; i < numChannels; i += 1)
+	{
+		voltsPerDivision[i] = getVoltsPerDivision(channelVoltageRange[i]);
+	}
+
+	return 0;
+}
+
+float AnalogIO::getVoltsPerDivision(AnalogIOVoltageRange voltageRange)
+{
+	switch (voltageRange)
+	{
+	case AnalogIOVoltageRange::TenVolts:
+		return 20.0f / numberOfDivisions;
+	case AnalogIOVoltageRange::TwoPointFiveVolts:
+		return 5.0f / numberOfDivisions;
+	case AnalogIOVoltageRange::FiveVolts:
+		return 10.0f / numberOfDivisions;
+	default:
+		return 0.0f;
+	}
+}
+
+void AnalogIO::startAcquisition()
+{
+	currentFrame = 0;
+	currentAverageFrame = 0;
+	sampleNumber = 0;
+
+	analogInputSamples.fill(0);
+}
+
+void AnalogIO::stopAcquisition()
+{
+	while (!frameArray.isEmpty())
+	{
+		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+		oni_destroy_frame(frameArray.removeAndReturn(0));
+	}
+}
+
+void AnalogIO::addFrame(oni_frame_t* frame)
+{
+	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+	frameArray.add(frame);
+}
+
+void AnalogIO::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
+{
+	for (StreamInfo streamInfo : streams)
+	{
+		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
+
+		if (streamInfo.channelPrefix.equalsIgnoreCase("AnalogInput"))
+			analogInputBuffer = sourceBuffers.getLast();
+	}
+}
+
+void AnalogIO::processFrames()
+{
+	while (!frameArray.isEmpty())
+	{
+		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+		oni_frame_t* frame = frameArray.removeAndReturn(0);
+
+		int16_t* dataPtr = (int16_t*)frame->data;
+
+		int dataOffset = 4;
+
+		for (int i = 0; i < numChannels; i += 1)
+		{
+			if (dataType == AnalogIODataType::S16)
+				analogInputSamples[currentFrame + i * numFrames] += *(dataPtr + dataOffset + i);
+			else
+				analogInputSamples[currentFrame + i * numFrames] += *(dataPtr + dataOffset + i) * voltsPerDivision[i];
+		}
+
+		currentAverageFrame += 1;
+
+		if (currentAverageFrame >= framesToAverage)
+		{
+			for (int i = 0; i < numChannels; i += 1)
+			{
+				analogInputSamples[currentFrame + i * numFrames] /= framesToAverage;
+			}
+
+			currentAverageFrame = 0;
+
+			currentFrame++;
+
+			timestamps[currentFrame] = *(uint64_t*)frame->data;
+			sampleNumbers[currentFrame] = sampleNumber++;
+		}
+
+		oni_destroy_frame(frame);
+
+		if (currentFrame >= numFrames)
+		{
+			shouldAddToBuffer = true;
+			currentFrame = 0;
+		}
+
+		if (shouldAddToBuffer)
+		{
+			shouldAddToBuffer = false;
+			analogInputBuffer->addToBuffer(analogInputSamples.data(), sampleNumbers, timestamps, eventCodes, numFrames);
+
+			analogInputSamples.fill(0);
+		}
+	}
+}
diff --git a/Source/Devices/AnalogIO.h b/Source/Devices/AnalogIO.h
new file mode 100644
index 0000000..5c07026
--- /dev/null
+++ b/Source/Devices/AnalogIO.h
@@ -0,0 +1,178 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef __ANALOGIO_H__
+#define __ANALOGIO_H__
+
+#include "../OnixDevice.h"
+
+enum class AnalogIORegisters : uint32_t
+{
+	ENABLE = 0,
+	CHDIR = 1,
+	CH00_IN_RANGE = 2,
+	CH01_IN_RANGE = 3,
+	CH02_IN_RANGE = 4,
+	CH03_IN_RANGE = 5,
+	CH04_IN_RANGE = 6,
+	CH05_IN_RANGE = 7,
+	CH06_IN_RANGE = 8,
+	CH07_IN_RANGE = 9,
+	CH08_IN_RANGE = 10,
+	CH09_IN_RANGE = 11,
+	CH10_IN_RANGE = 12,
+	CH11_IN_RANGE = 13,
+};
+
+enum class AnalogIOVoltageRange : uint32_t
+{
+	TenVolts = 0,
+	TwoPointFiveVolts = 1,
+	FiveVolts = 2
+};
+
+enum class AnalogIODirection : uint32_t
+{
+	Input = 0,
+	Output = 1
+};
+
+enum class AnalogIODataType : uint32_t
+{
+	S16 = 0,
+	Volts = 1
+};
+
+/*
+	Configures and streams data from an AnalogIO device on a Breakout Board
+*/
+class AnalogIO : public OnixDevice
+{
+public:
+	AnalogIO(String name, const oni_dev_idx_t, const oni_ctx);
+
+	/** Configures the device so that it is ready to stream with default settings */
+	int configureDevice() override;
+
+	/** Update the settings of the device */
+	int updateSettings() override;
+
+	/** Starts probe data streaming */
+	void startAcquisition() override;
+
+	/** Stops probe data streaming*/
+	void stopAcquisition() override;
+
+	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
+	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override;
+
+	void addFrame(oni_frame_t*) override;
+
+	void processFrames() override;
+
+	AnalogIODirection getChannelDirection(int channelNumber)
+	{
+		if (channelNumber > numChannels || channelNumber < 0)
+		{
+			LOGE("Channel number must be between 0 and " + String(channelNumber));
+			return AnalogIODirection::Input;
+		}
+
+		return channelDirection[channelNumber];
+	}
+
+	void setChannelDirection(int channelNumber, AnalogIODirection direction)
+	{
+		if (channelNumber > numChannels || channelNumber < 0)
+		{
+			LOGE("Channel number must be between 0 and " + String(channelNumber));
+			return;
+		}
+
+		channelDirection[channelNumber] = direction;
+	}
+
+	AnalogIOVoltageRange getChannelVoltageRange(int channelNumber)
+	{
+		if (channelNumber > numChannels || channelNumber < 0)
+		{
+			LOGE("Channel number must be between 0 and " + String(channelNumber));
+			return AnalogIOVoltageRange::FiveVolts;
+		}
+
+		return channelVoltageRange[channelNumber];
+	}
+
+	void setChannelVoltageRange(int channelNumber, AnalogIOVoltageRange direction)
+	{
+		if (channelNumber > numChannels || channelNumber < 0)
+		{
+			LOGE("Channel number must be between 0 and " + String(channelNumber));
+			return;
+		}
+
+		channelVoltageRange[channelNumber] = direction;
+	}
+
+	AnalogIODataType getDataType() const { return dataType; }
+
+	void setDataType(AnalogIODataType type) { dataType = type; }
+
+private:
+
+	DataBuffer* analogInputBuffer = nullptr;
+
+	static const int numFrames = 25;
+	static const int framesToAverage = 4; // NB: Downsampling from 100 kHz to 25 kHz
+	static const int numChannels = 12;
+
+	static const int numberOfDivisions = 1 << 16;
+	const int dacMidScale = 1 << 15;
+
+	std::array<AnalogIODirection, numChannels> channelDirection;
+	std::array<AnalogIOVoltageRange, numChannels> channelVoltageRange;
+
+	AnalogIODataType dataType = AnalogIODataType::S16;
+
+	Array<oni_frame_t*, CriticalSection, numFrames> frameArray;
+
+	unsigned short currentFrame = 0;
+	unsigned short currentAverageFrame = 0;
+	int sampleNumber = 0;
+
+	bool shouldAddToBuffer = false;
+
+	std::array<float, numFrames* numChannels> analogInputSamples;
+
+	double timestamps[numFrames];
+	int64 sampleNumbers[numFrames];
+	uint64 eventCodes[numFrames];
+
+	std::array<float, numChannels> voltsPerDivision;
+
+	static float getVoltsPerDivision(AnalogIOVoltageRange voltageRange);
+
+	JUCE_LEAK_DETECTOR(AnalogIO);
+};
+
+#endif
diff --git a/Source/Devices/DeviceList.h b/Source/Devices/DeviceList.h
index de2435c..4dfc3f7 100644
--- a/Source/Devices/DeviceList.h
+++ b/Source/Devices/DeviceList.h
@@ -7,3 +7,4 @@
 #include "OutputClock.h"
 #include "Heartbeat.h"
 #include "HarpSyncInput.h"
+#include "AnalogIO.h"
diff --git a/Source/OnixDevice.h b/Source/OnixDevice.h
index 4e1ae76..67adbb7 100644
--- a/Source/OnixDevice.h
+++ b/Source/OnixDevice.h
@@ -59,6 +59,7 @@ enum class OnixDeviceType {
 	OUTPUTCLOCK,
 	HEARTBEAT,
 	HARPSYNCINPUT,
+	ANALOGIO,
 };
 
 struct StreamInfo {
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index e4e6cd2..4c73ce8 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -34,7 +34,7 @@ OnixSource::OnixSource(SourceNode* sn) :
 	addBooleanParameter(Parameter::PROCESSOR_SCOPE, "passthroughA", "Passthrough", "Enables passthrough mode for e-variant headstages on Port A", false, true);
 	addBooleanParameter(Parameter::PROCESSOR_SCOPE, "passthroughB", "Passthrough", "Enables passthrough mode for e-variant headstages on Port B", false, true);
 
-	addBooleanParameter(Parameter::PROCESSOR_SCOPE, "connected", "Connect", "Connect to Onix hardware", false, true); 
+	addBooleanParameter(Parameter::PROCESSOR_SCOPE, "connected", "Connect", "Connect to Onix hardware", false, true);
 
 	if (!context.isInitialized()) { LOGE("Failed to initialize context."); return; }
 }
@@ -65,7 +65,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 {
 	if (!context.isInitialized())
 	{
-		LOGE("Cannot initialize devices, context is not initialized correctly. Please try removing the plugin and adding it again."); 
+		LOGE("Cannot initialize devices, context is not initialized correctly. Please try removing the plugin and adding it again.");
 		return;
 	}
 
@@ -98,9 +98,9 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 	size_t devices_sz = sizeof(oni_device_t) * num_devs;
 	devices = (oni_device_t*)realloc(devices, devices_sz);
 
-	if (devices == NULL) 
-	{ 
-		LOGE("No devices found."); 
+	if (devices == NULL)
+	{
+		LOGE("No devices found.");
 		if (updateStreamInfo) CoreServices::updateSignalChain(editor);
 		return;
 	}
@@ -196,7 +196,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			auto serializer = std::make_unique<I2CRegisterContext>(DS90UB9x::SER_ADDR, devices[dev_idx].idx, ctx);
 			serializer->WriteByte((uint32_t)DS90UB9x::DS90UB9xSerializerI2CRegister::SCLHIGH, 20);
 			serializer->WriteByte((uint32_t)DS90UB9x::DS90UB9xSerializerI2CRegister::SCLLOW, 20);
-			
+
 			auto EEPROM = std::make_unique<HeadStageEEPROM>(devices[dev_idx].idx, ctx);
 			uint32_t hsid = EEPROM->GetHeadStageID();
 			LOGD("Detected headstage ", hsid);
@@ -274,6 +274,20 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 
 			sources.push_back(harpSyncInput);
 		}
+		else if (devices[dev_idx].id == ONIX_FMCANALOG1R3)
+		{
+			auto analogIO = std::make_shared<AnalogIO>("Analog IO", devices[dev_idx].idx, ctx);
+
+			int result = analogIO->configureDevice();
+
+			if (result != 0)
+			{
+				LOGE("Device Idx: ", devices[dev_idx].idx, " Error enabling device stream.");
+				continue;
+			}
+
+			sources.push_back(analogIO);
+		}
 	}
 
 	val = 1;
@@ -445,6 +459,18 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 
 				deviceInfos->add(new DeviceInfo(deviceSettings));
 			}
+			else if (source->type == OnixDeviceType::ANALOGIO)
+			{
+				DeviceInfo::Settings deviceSettings{
+					source->getName(),
+					"Analog IO",
+					"analogio",
+					"0000000",
+					""
+				};
+
+				deviceInfos->add(new DeviceInfo(deviceSettings));
+			}
 
 			// add data streams and channels
 			for (const auto& streamInfo : source->streams)
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index 4f4681d..6469f29 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -129,6 +129,14 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* portTab)
 			settingsInterfaces.add(harpSyncInputInterface);
 			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(harpSyncInputInterface), true);
 
+			portTabIndex.add(portTabNumber++);
+		}
+		else if (source->type == OnixDeviceType::ANALOGIO)
+		{
+			auto analogIOInterface = new AnalogIOInterface(std::static_pointer_cast<AnalogIO>(source), editor, this);
+			settingsInterfaces.add(analogIOInterface);
+			portTab->addTab(source->getName(), Colours::darkgrey, createCustomViewport(analogIOInterface), true);
+
 			portTabIndex.add(portTabNumber++);
 		}
 	}
diff --git a/Source/UI/AnalogIOInterface.cpp b/Source/UI/AnalogIOInterface.cpp
new file mode 100644
index 0000000..eeb2a44
--- /dev/null
+++ b/Source/UI/AnalogIOInterface.cpp
@@ -0,0 +1,230 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "AnalogIOInterface.h"
+
+AnalogIOInterface::AnalogIOInterface(std::shared_ptr<AnalogIO> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
+	SettingsInterface(d, e, c)
+{
+	if (device != nullptr)
+	{
+		nameLabel = std::make_unique<Label>("MAIN", "NAME");
+		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
+		nameLabel->setBounds(50, 40, 370, 45);
+		addAndMakeVisible(nameLabel.get());
+
+		FontOptions font = FontOptions("Fira Code", "Regular", 12.0f);
+
+		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
+		deviceEnableButton->setFont(font);
+		deviceEnableButton->setRadius(3.0f);
+		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
+		deviceEnableButton->setClickingTogglesState(true);
+		deviceEnableButton->setTooltip("If disabled, AnalogIO will not stream or receive data during acquisition");
+		deviceEnableButton->addListener(this);
+		addAndMakeVisible(deviceEnableButton.get());
+		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+
+		infoLabel = std::make_unique<Label>("INFO", "INFO");
+		infoLabel->setFont(FontOptions(15.0f));
+		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
+		infoLabel->setJustificationType(Justification::topLeft);
+		addAndMakeVisible(infoLabel.get());
+
+		dataTypeLabel = std::make_unique<Label>("dataTypeLabel", "Data Type");
+		dataTypeLabel->setFont(font);
+		dataTypeLabel->setBounds(infoLabel->getX(), infoLabel->getBottom() + 5, 80, 20);
+		addAndMakeVisible(dataTypeLabel.get());
+
+		dataTypeComboBox = std::make_unique<ComboBox>("dataTypeComboBox");
+		dataTypeComboBox->setBounds(dataTypeLabel->getRight() + 5, dataTypeLabel->getY(), 65, dataTypeLabel->getHeight());
+		dataTypeComboBox->addListener(this);
+		dataTypeComboBox->setTooltip("Set the data type output by this device. S16 outputs signed 16-bit data, while Volts outputs 32-bit floating point data.");
+		dataTypeComboBox->addItem("S16", 1);
+		dataTypeComboBox->addItem("Volts", 2);
+		dataTypeComboBox->setSelectedId(getDataTypeId(std::static_pointer_cast<AnalogIO>(device)), dontSendNotification);
+		addAndMakeVisible(dataTypeComboBox.get());
+
+		auto prevLabelRectangle = dataTypeLabel->getBounds().translated(0, 10);
+		prevLabelRectangle.setWidth(140);
+		auto prevComboBoxRectangle = dataTypeComboBox->getBounds().translated(0, 10);
+		prevComboBoxRectangle.setWidth(80);
+		prevComboBoxRectangle.setX(prevLabelRectangle.getRight() + 5);
+
+		StringArray directionList;
+		directionList.add("Input");
+		directionList.add("Output");
+
+		StringArray voltageRangeList;
+		voltageRangeList.add("+/- 2.5 V");
+		voltageRangeList.add("+/- 5.0 V");
+		voltageRangeList.add("+/- 10.0 V");
+
+		for (int i = 0; i < numChannels; i += 1)
+		{
+			channelDirectionLabels[i] = std::make_unique<Label>("channelDirectionLabel" + String(i), "Channel " + String(i) + String(": Direction"));
+			channelDirectionLabels[i]->setBounds(prevLabelRectangle.getX(), prevLabelRectangle.getBottom() + 4, prevLabelRectangle.getWidth(), prevLabelRectangle.getHeight());
+			channelDirectionLabels[i]->setFont(font);
+			addAndMakeVisible(channelDirectionLabels[i].get());
+
+			prevLabelRectangle = channelDirectionLabels[i]->getBounds();
+
+			channelDirectionComboBoxes[i] = std::make_unique<ComboBox>("channelDirectionComboBox" + String(i));
+			channelDirectionComboBoxes[i]->setBounds(prevComboBoxRectangle.getX(), prevLabelRectangle.getY(), prevComboBoxRectangle.getWidth(), prevComboBoxRectangle.getHeight());
+			channelDirectionComboBoxes[i]->addListener(this);
+			channelDirectionComboBoxes[i]->setTooltip("Sets the direction of Channel " + String(i));
+			channelDirectionComboBoxes[i]->addItemList(directionList, 1);
+			channelDirectionComboBoxes[i]->setSelectedId(getChannelDirectionId(std::static_pointer_cast<AnalogIO>(device), i), dontSendNotification);
+			addAndMakeVisible(channelDirectionComboBoxes[i].get());
+
+			prevComboBoxRectangle = channelDirectionComboBoxes[i]->getBounds();
+
+			voltageRangeLabels[i] = std::make_unique<Label>("voltageRangeLabel" + String(i), "Voltage Range");
+			voltageRangeLabels[i]->setBounds(prevComboBoxRectangle.getRight() + 10, prevComboBoxRectangle.getY(), 110, prevComboBoxRectangle.getHeight());
+			voltageRangeLabels[i]->setFont(font);
+			addAndMakeVisible(voltageRangeLabels[i].get());
+
+			voltageRangeComboBoxes[i] = std::make_unique<ComboBox>("voltageRangeComboBox" + String(i));
+			voltageRangeComboBoxes[i]->setBounds(voltageRangeLabels[i]->getRight() + 4, voltageRangeLabels[i]->getY(), prevComboBoxRectangle.getWidth(), prevComboBoxRectangle.getHeight());
+			voltageRangeComboBoxes[i]->addListener(this);
+			voltageRangeComboBoxes[i]->setTooltip("Sets the voltage range of channel " + String(i));
+			voltageRangeComboBoxes[i]->addItemList(voltageRangeList, 1);
+			voltageRangeComboBoxes[i]->setSelectedId(getChannelVoltageRangeId(std::static_pointer_cast<AnalogIO>(device), i), dontSendNotification);
+			addAndMakeVisible(voltageRangeComboBoxes[i].get());
+		}
+
+		updateInfoString();
+	}
+
+	type = SettingsInterface::Type::ANALOGIO_SETTINGS_INTERFACE;
+}
+
+void AnalogIOInterface::buttonClicked(Button* button)
+{
+	if (button == deviceEnableButton.get())
+	{
+		device->setEnabled(deviceEnableButton->getToggleState());
+		device->configureDevice();
+		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
+
+		if (device->isEnabled())
+		{
+			deviceEnableButton->setLabel("ENABLED");
+		}
+		else
+		{
+			deviceEnableButton->setLabel("DISABLED");
+		}
+
+		CoreServices::updateSignalChain(editor);
+	}
+}
+
+void AnalogIOInterface::comboBoxChanged(ComboBox* cb)
+{
+	if (cb == dataTypeComboBox.get())
+	{
+		AnalogIODataType newType = dataTypeComboBox->getText() == "S16" ? AnalogIODataType::S16 : AnalogIODataType::Volts;
+		std::static_pointer_cast<AnalogIO>(device)->setDataType(newType);
+		return;
+	}
+
+	for (int i = 0; i < numChannels; i += 1)
+	{
+		if (cb == channelDirectionComboBoxes[i].get())
+		{
+			AnalogIODirection newDirection = channelDirectionComboBoxes[i]->getText() == "Input" ? AnalogIODirection::Input : AnalogIODirection::Output;
+			std::static_pointer_cast<AnalogIO>(device)->setChannelDirection(i, newDirection);
+			return;
+		}
+		else if (cb == voltageRangeComboBoxes[i].get())
+		{
+			AnalogIOVoltageRange newVoltageRange = AnalogIOVoltageRange::TwoPointFiveVolts;
+			
+			if (voltageRangeComboBoxes[i]->getText() == "+/- 2.5 V") newVoltageRange = AnalogIOVoltageRange::TwoPointFiveVolts;
+			else if (voltageRangeComboBoxes[i]->getText() == "+/- 5.0 V") newVoltageRange = AnalogIOVoltageRange::FiveVolts;
+			else if (voltageRangeComboBoxes[i]->getText() == "+/- 10.0 V") newVoltageRange = AnalogIOVoltageRange::TenVolts;
+
+			std::static_pointer_cast<AnalogIO>(device)->setChannelVoltageRange(i, newVoltageRange);
+			return;
+		}
+	}
+}
+
+void AnalogIOInterface::updateInfoString()
+{
+	String nameString, infoString;
+
+	nameString = "Breakout Board";
+
+	if (device != nullptr)
+	{
+		infoString = "Device: Analog IO";
+		infoString += "\n";
+		infoString += "\n";
+	}
+
+	infoLabel->setText(infoString, dontSendNotification);
+	nameLabel->setText(nameString, dontSendNotification);
+}
+
+int AnalogIOInterface::getChannelDirectionId(std::shared_ptr<AnalogIO> device, int channelNumber)
+{
+	switch (device->getChannelDirection(channelNumber))
+	{
+	case AnalogIODirection::Input:
+		return 1;
+	case AnalogIODirection::Output:
+		return 2;
+	default:
+		return 0;
+	}
+}
+
+int AnalogIOInterface::getChannelVoltageRangeId(std::shared_ptr<AnalogIO> device, int channelNumber)
+{
+	switch (device->getChannelVoltageRange(channelNumber))
+	{
+	case AnalogIOVoltageRange::TwoPointFiveVolts:
+		return 1;
+	case AnalogIOVoltageRange::FiveVolts:
+		return 2;
+	case AnalogIOVoltageRange::TenVolts:
+		return 3;
+	default:
+		break;
+	}
+}
+
+int AnalogIOInterface::getDataTypeId(std::shared_ptr<AnalogIO> device)
+{
+	switch (device->getDataType())
+	{
+	case AnalogIODataType::S16:
+		return 1;
+	case AnalogIODataType::Volts:
+		return 2;
+	default:
+		return 0;
+	}
+}
diff --git a/Source/UI/AnalogIOInterface.h b/Source/UI/AnalogIOInterface.h
new file mode 100644
index 0000000..65ea650
--- /dev/null
+++ b/Source/UI/AnalogIOInterface.h
@@ -0,0 +1,85 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef __ANALOGIOINTERFACE_H__
+#define __ANALOGIOINTERFACE_H__
+
+#include <VisualizerEditorHeaders.h>
+
+#include "../OnixSourceEditor.h"
+#include "../OnixSourceCanvas.h"
+
+#include "../Devices/AnalogIO.h"
+
+class AnalogIOInterface : public SettingsInterface,
+	public Button::Listener,
+	public ComboBox::Listener
+{
+public:
+	/** Constructor */
+	AnalogIOInterface(std::shared_ptr<AnalogIO> d, OnixSourceEditor* e, OnixSourceCanvas* c);
+
+	/** Disables buttons and starts animation if necessary */
+	void startAcquisition() override {};
+
+	/** Enables buttons and start animation if necessary */
+	void stopAcquisition() override {};
+
+	/** Save parameters to XML */
+	void saveParameters(XmlElement* xml) override {};
+
+	/** Load parameters from XML */
+	void loadParameters(XmlElement* xml) override {};
+
+	/** Updates the info string on the right-hand side of the component */
+	void updateInfoString() override;
+
+	/** Listener methods*/
+	void buttonClicked(Button*) override;
+	void comboBoxChanged(ComboBox* cb) override;
+
+private:
+
+	static const int numChannels = 12;
+
+	std::unique_ptr<Label> nameLabel;
+	std::unique_ptr<Label> infoLabel;
+
+	std::unique_ptr<Label> dataTypeLabel;
+	std::unique_ptr<ComboBox> dataTypeComboBox;
+
+	std::array<std::unique_ptr<Label>, numChannels> voltageRangeLabels;
+	std::array<std::unique_ptr<ComboBox>, numChannels> voltageRangeComboBoxes;
+	std::array<std::unique_ptr<Label>, numChannels> channelDirectionLabels;
+	std::array<std::unique_ptr<ComboBox>, numChannels> channelDirectionComboBoxes;
+
+	std::unique_ptr<UtilityButton> deviceEnableButton;
+
+	static int getChannelDirectionId(std::shared_ptr<AnalogIO> device, int channelNumber);
+	static int getChannelVoltageRangeId(std::shared_ptr<AnalogIO> device, int channelNumber);
+	static int getDataTypeId(std::shared_ptr<AnalogIO> device);
+
+	JUCE_LEAK_DETECTOR(AnalogIOInterface);
+};
+
+#endif // !__AnalogIOInterface_H__
diff --git a/Source/UI/InterfaceList.h b/Source/UI/InterfaceList.h
index bf8a83a..3e45f17 100644
--- a/Source/UI/InterfaceList.h
+++ b/Source/UI/InterfaceList.h
@@ -5,3 +5,4 @@
 #include "OutputClockInterface.h"
 #include "HeartbeatInterface.h"
 #include "HarpSyncInputInterface.h"
+#include "AnalogIOInterface.h"
diff --git a/Source/UI/SettingsInterface.h b/Source/UI/SettingsInterface.h
index 31b00cf..d0959f1 100644
--- a/Source/UI/SettingsInterface.h
+++ b/Source/UI/SettingsInterface.h
@@ -49,6 +49,7 @@ class SettingsInterface : public Component
         OUTPUTCLOCK_SETTINGS_INTERFACE,
         HEARTBEAT_SETTINGS_INTERFACE,
         HARPSYNCINPUT_SETTINGS_INTERFACE,
+        ANALOGIO_SETTINGS_INTERFACE,
         UNKNOWN_SETTINGS_INTERFACE
     };
 

From 692a09d545b04a33e792315b039f4121b287d64f Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Fri, 21 Mar 2025 13:43:42 -0400
Subject: [PATCH 13/25] Fix merge conflicts - Updated the patterns used by the
 breakout board devices for instantiating the device (Onix1 as a shared
 pointer, and updates to updateSettings())

---
 Source/Devices/AnalogIO.cpp          | 34 +++++++++++--------------
 Source/Devices/AnalogIO.h            |  4 +--
 Source/Devices/HarpSyncInput.cpp     | 17 ++++++-------
 Source/Devices/HarpSyncInput.h       |  4 +--
 Source/Devices/Heartbeat.cpp         | 20 +++++++--------
 Source/Devices/Heartbeat.h           |  4 +--
 Source/Devices/MemoryMonitor.cpp     | 25 ++++++++++---------
 Source/Devices/MemoryMonitor.h       |  4 +--
 Source/Devices/Neuropixels2e.cpp     |  4 ++-
 Source/Devices/Neuropixels_1.cpp     |  3 +--
 Source/Devices/Neuropixels_1.h       |  2 --
 Source/Devices/OutputClock.cpp       | 19 +++++++-------
 Source/Devices/OutputClock.h         |  6 ++---
 Source/Devices/PortController.cpp    |  2 ++
 Source/Onix1.h                       |  1 +
 Source/OnixSource.cpp                | 30 +++++++++++-----------
 Source/OnixSourceCanvas.cpp          | 16 +++---------
 Source/OnixSourceCanvas.h            | 11 ++++-----
 Source/OnixSourceEditor.cpp          |  4 +--
 Source/OnixSourceEditor.h            |  3 ---
 Source/UI/AnalogIOInterface.cpp      |  5 ++--
 Source/UI/Bno055Interface.cpp        | 19 ++------------
 Source/UI/HarpSyncInputInterface.cpp |  5 ++--
 Source/UI/HeartbeatInterface.cpp     |  5 ++--
 Source/UI/MemoryMonitorInterface.cpp |  5 ++--
 Source/UI/NeuropixV1Interface.cpp    | 37 ++++++++++++++--------------
 Source/UI/NeuropixV1Interface.h      |  2 +-
 Source/UI/OutputClockInterface.cpp   |  5 ++--
 28 files changed, 135 insertions(+), 161 deletions(-)

diff --git a/Source/Devices/AnalogIO.cpp b/Source/Devices/AnalogIO.cpp
index 988cbaa..8bac1cf 100644
--- a/Source/Devices/AnalogIO.cpp
+++ b/Source/Devices/AnalogIO.cpp
@@ -23,8 +23,8 @@
 
 #include "AnalogIO.h"
 
-AnalogIO::AnalogIO(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
-	: OnixDevice(name, OnixDeviceType::ANALOGIO, deviceIdx_, ctx_)
+AnalogIO::AnalogIO(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> oni_ctx)
+	: OnixDevice(name, OnixDeviceType::ANALOGIO, deviceIdx_, oni_ctx)
 {
 	StreamInfo analogInputStream;
 	analogInputStream.name = name + "-AnalogInput";
@@ -51,25 +51,20 @@ AnalogIO::AnalogIO(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ct
 
 int AnalogIO::configureDevice()
 {
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (uint32_t)AnalogIORegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0)));
+	if (deviceContext == nullptr || !deviceContext->isInitialized()) return -1;
 
-	return 0;
+	deviceContext->writeRegister(deviceIdx, (uint32_t)AnalogIORegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0));
+
+	return deviceContext->getLastResult();
 }
 
-int AnalogIO::updateSettings()
+bool AnalogIO::updateSettings()
 {
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH00_IN_RANGE, (oni_reg_val_t)channelVoltageRange[0]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH01_IN_RANGE, (oni_reg_val_t)channelVoltageRange[1]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH02_IN_RANGE, (oni_reg_val_t)channelVoltageRange[2]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH03_IN_RANGE, (oni_reg_val_t)channelVoltageRange[3]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH04_IN_RANGE, (oni_reg_val_t)channelVoltageRange[4]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH05_IN_RANGE, (oni_reg_val_t)channelVoltageRange[5]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH06_IN_RANGE, (oni_reg_val_t)channelVoltageRange[6]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH07_IN_RANGE, (oni_reg_val_t)channelVoltageRange[7]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH08_IN_RANGE, (oni_reg_val_t)channelVoltageRange[8]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH09_IN_RANGE, (oni_reg_val_t)channelVoltageRange[9]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH10_IN_RANGE, (oni_reg_val_t)channelVoltageRange[10]));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH11_IN_RANGE, (oni_reg_val_t)channelVoltageRange[11]));
+	for (int i = 0; i < numChannels; i += 1)
+	{
+		deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CH00_IN_RANGE + i, (oni_reg_val_t)channelVoltageRange[i]); 
+		if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
+	}
 
 	uint32_t ioReg = 0;
 
@@ -78,14 +73,15 @@ int AnalogIO::updateSettings()
 		ioReg = (ioReg & ~((uint32_t)1 << i)) | ((uint32_t)(channelDirection[i]) << i);
 	}
 
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CHDIR, ioReg));
+	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)AnalogIORegisters::CHDIR, ioReg);
+	if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
 
 	for (int i = 0; i < numChannels; i += 1)
 	{
 		voltsPerDivision[i] = getVoltsPerDivision(channelVoltageRange[i]);
 	}
 
-	return 0;
+	return true;
 }
 
 float AnalogIO::getVoltsPerDivision(AnalogIOVoltageRange voltageRange)
diff --git a/Source/Devices/AnalogIO.h b/Source/Devices/AnalogIO.h
index 5c07026..4efeea7 100644
--- a/Source/Devices/AnalogIO.h
+++ b/Source/Devices/AnalogIO.h
@@ -69,13 +69,13 @@ enum class AnalogIODataType : uint32_t
 class AnalogIO : public OnixDevice
 {
 public:
-	AnalogIO(String name, const oni_dev_idx_t, const oni_ctx);
+	AnalogIO(String name, const oni_dev_idx_t, std::shared_ptr<Onix1> oni_ctx);
 
 	/** Configures the device so that it is ready to stream with default settings */
 	int configureDevice() override;
 
 	/** Update the settings of the device */
-	int updateSettings() override;
+	bool updateSettings() override;
 
 	/** Starts probe data streaming */
 	void startAcquisition() override;
diff --git a/Source/Devices/HarpSyncInput.cpp b/Source/Devices/HarpSyncInput.cpp
index 4b796b5..4ff4634 100644
--- a/Source/Devices/HarpSyncInput.cpp
+++ b/Source/Devices/HarpSyncInput.cpp
@@ -23,8 +23,8 @@
 
 #include "HarpSyncInput.h"
 
-HarpSyncInput::HarpSyncInput(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
-	: OnixDevice(name, OnixDeviceType::HARPSYNCINPUT, deviceIdx_, ctx_)
+HarpSyncInput::HarpSyncInput(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> oni_ctx)
+	: OnixDevice(name, OnixDeviceType::HARPSYNCINPUT, deviceIdx_, oni_ctx)
 {
 	setEnabled(false);
 
@@ -45,14 +45,16 @@ HarpSyncInput::HarpSyncInput(String name, const oni_dev_idx_t deviceIdx_, const
 
 int HarpSyncInput::configureDevice()
 {
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (uint32_t)HarpSyncInputRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0)));
+	if (deviceContext == nullptr || !deviceContext->isInitialized()) return -1;
 
-	return 0;
+	deviceContext->writeRegister(deviceIdx, (uint32_t)HarpSyncInputRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0));
+
+	return deviceContext->getLastResult();
 }
 
-int HarpSyncInput::updateSettings()
+bool HarpSyncInput::updateSettings()
 {
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)HarpSyncInputRegisters::SOURCE, (oni_reg_val_t)HarpSyncSource::Breakout));
+	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)HarpSyncInputRegisters::SOURCE, (oni_reg_val_t)HarpSyncSource::Breakout);
 
 	return 0;
 }
@@ -70,9 +72,6 @@ void HarpSyncInput::stopAcquisition()
 		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
-
-	currentFrame = 0;
-	sampleNumber = 0;
 }
 
 void HarpSyncInput::addFrame(oni_frame_t* frame)
diff --git a/Source/Devices/HarpSyncInput.h b/Source/Devices/HarpSyncInput.h
index a8bcc51..c76253a 100644
--- a/Source/Devices/HarpSyncInput.h
+++ b/Source/Devices/HarpSyncInput.h
@@ -44,13 +44,13 @@ enum class HarpSyncSource : uint32_t
 class HarpSyncInput : public OnixDevice
 {
 public:
-	HarpSyncInput(String name, const oni_dev_idx_t, const oni_ctx);
+	HarpSyncInput(String name, const oni_dev_idx_t, std::shared_ptr<Onix1> oni_ctx);
 
 	/** Configures the device so that it is ready to stream with default settings */
 	int configureDevice() override;
 
 	/** Update the settings of the device */
-	int updateSettings() override;
+	bool updateSettings() override;
 
 	/** Starts probe data streaming */
 	void startAcquisition() override;
diff --git a/Source/Devices/Heartbeat.cpp b/Source/Devices/Heartbeat.cpp
index 2ed8d92..f7a9a2c 100644
--- a/Source/Devices/Heartbeat.cpp
+++ b/Source/Devices/Heartbeat.cpp
@@ -23,22 +23,24 @@
 
 #include "Heartbeat.h"
 
-Heartbeat::Heartbeat(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
-	: OnixDevice(name, OnixDeviceType::HEARTBEAT, deviceIdx_, ctx_)
+Heartbeat::Heartbeat(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> oni_ctx)
+	: OnixDevice(name, OnixDeviceType::HEARTBEAT, deviceIdx_, oni_ctx)
 {
 }
 
 int Heartbeat::configureDevice()
 {
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (uint32_t)HeartbeatRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0)));
+	if (deviceContext == nullptr || !deviceContext->isInitialized()) return -1;
 
-	return 0;
+	deviceContext->writeRegister(deviceIdx, (uint32_t)HeartbeatRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0));
+
+	return deviceContext->getLastResult();
 }
 
-int Heartbeat::updateSettings()
+bool Heartbeat::updateSettings()
 {
 	writeBeatsPerSecondRegister();
-	return 0;
+	return deviceContext->getLastResult() == ONI_ESUCCESS;
 }
 
 void Heartbeat::setBeatsPerSecond(uint32_t beats, bool writeToRegister)
@@ -49,8 +51,6 @@ void Heartbeat::setBeatsPerSecond(uint32_t beats, bool writeToRegister)
 
 void Heartbeat::writeBeatsPerSecondRegister()
 {
-	oni_reg_val_t clkHz;
-
-	ONI_OK(oni_read_reg(ctx, deviceIdx, (oni_reg_addr_t)HeartbeatRegisters::CLK_HZ, &clkHz));
-	ONI_OK(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)HeartbeatRegisters::CLK_DIV, clkHz / beatsPerSecond));
+	oni_reg_val_t clkHz = deviceContext->readRegister(deviceIdx, (oni_reg_addr_t)HeartbeatRegisters::CLK_HZ);
+	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)HeartbeatRegisters::CLK_DIV, clkHz / beatsPerSecond);
 }
diff --git a/Source/Devices/Heartbeat.h b/Source/Devices/Heartbeat.h
index ac952bc..6a3a1bc 100644
--- a/Source/Devices/Heartbeat.h
+++ b/Source/Devices/Heartbeat.h
@@ -39,13 +39,13 @@ enum class HeartbeatRegisters : uint32_t
 class Heartbeat : public OnixDevice
 {
 public:
-	Heartbeat(String name, const oni_dev_idx_t, const oni_ctx);
+	Heartbeat(String name, const oni_dev_idx_t, std::shared_ptr<Onix1> oni_ctx);
 
 	/** Configures the device so that it is ready to stream with default settings */
 	int configureDevice() override;
 
 	/** Update the settings of the device */
-	int updateSettings() override;
+	bool updateSettings() override;
 
 	/** Starts probe data streaming */
 	void startAcquisition() override {};
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index 6b0b3e9..98d1e69 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -55,8 +55,8 @@ void MemoryMonitorUsage::stopAcquisition()
 	repaint();
 }
 
-MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
-	: OnixDevice(name, OnixDeviceType::MEMORYMONITOR, deviceIdx_, ctx_)
+MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> oni_ctx)
+	: OnixDevice(name, OnixDeviceType::MEMORYMONITOR, deviceIdx_, oni_ctx)
 {
 	StreamInfo percentUsedStream;
 	percentUsedStream.name = name + "-PercentUsed";
@@ -86,22 +86,23 @@ MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, const
 
 int MemoryMonitor::configureDevice()
 {
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (uint32_t)MemoryMonitorRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0)));
+	if (deviceContext == nullptr || !deviceContext->isInitialized()) return -1;
 
-	return 0;
-}
+	deviceContext->writeRegister(deviceIdx, (uint32_t)MemoryMonitorRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0));
+	if (deviceContext->getLastResult() != ONI_ESUCCESS) return deviceContext->getLastResult();
 
-int MemoryMonitor::updateSettings()
-{
-	oni_reg_val_t clkHz;
+	totalMemory = deviceContext->readRegister(deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::TOTAL_MEM);
 
-	ONI_OK_RETURN_INT(oni_read_reg(ctx, deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::CLK_HZ, &clkHz));
+	return deviceContext->getLastResult();
+}
 
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::CLK_DIV, clkHz / samplesPerSecond));
+bool MemoryMonitor::updateSettings()
+{
+	oni_reg_val_t clkHz = deviceContext->readRegister(deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::CLK_HZ);
 
-	ONI_OK_RETURN_INT(oni_read_reg(ctx, deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::TOTAL_MEM, &totalMemory));
+	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::CLK_DIV, clkHz / samplesPerSecond);
 
-	return 0;
+	return deviceContext->getLastResult() == ONI_ESUCCESS;
 }
 
 void MemoryMonitor::startAcquisition()
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index 47f4a25..c1150fd 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -40,13 +40,13 @@ enum class MemoryMonitorRegisters : uint32_t
 class MemoryMonitor : public OnixDevice
 {
 public:
-	MemoryMonitor(String name, const oni_dev_idx_t, const oni_ctx);
+	MemoryMonitor(String name, const oni_dev_idx_t, std::shared_ptr<Onix1> oni_ctx);
 
 	/** Configures the device so that it is ready to stream with default settings */
 	int configureDevice() override;
 
 	/** Update the settings of the device */
-	int updateSettings() override;
+	bool updateSettings() override;
 
 	/** Starts probe data streaming */
 	void startAcquisition() override;
diff --git a/Source/Devices/Neuropixels2e.cpp b/Source/Devices/Neuropixels2e.cpp
index df84566..9f4f2b1 100644
--- a/Source/Devices/Neuropixels2e.cpp
+++ b/Source/Devices/Neuropixels2e.cpp
@@ -26,6 +26,8 @@ int Neuropixels2e::getNumProbes() const
 
 int Neuropixels2e::configureDevice()
 {
+	if (deviceContext == nullptr || !deviceContext->isInitialized()) return -1;
+
 	configureSerDes();
 	setProbeSupply(true);
 	probeSNA = getProbeSN(ProbeASelected);
@@ -37,7 +39,7 @@ int Neuropixels2e::configureDevice()
 	if (probeSNA == -1 && probeSNB == -1)
 	{
 		m_numProbes = 0;
-		return -1;
+		return -2;
 	}
 	else if (probeSNA != -1 && probeSNB != -1)
 	{
diff --git a/Source/Devices/Neuropixels_1.cpp b/Source/Devices/Neuropixels_1.cpp
index 85bf22c..f742448 100644
--- a/Source/Devices/Neuropixels_1.cpp
+++ b/Source/Devices/Neuropixels_1.cpp
@@ -22,7 +22,6 @@
 */
 
 #include "Neuropixels_1.h"
-#include "../OnixSource.h"
 
 BackgroundUpdaterWithProgressWindow::BackgroundUpdaterWithProgressWindow(Neuropixels_1* d)
 	: ThreadWithProgressWindow("Writing calibration files to Neuropixels Probe: " + d->getName(), true, false)
@@ -313,7 +312,7 @@ int Neuropixels_1::configureDevice()
 	WriteByte((uint32_t)NeuropixelsRegisters::OP_MODE, (uint32_t)OpMode::RECORD);
 	if (i2cContext->getLastResult() != ONI_ESUCCESS) return -3;
 
-	return 0;
+	return deviceContext->getLastResult();
 }
 
 bool Neuropixels_1::updateSettings()
diff --git a/Source/Devices/Neuropixels_1.h b/Source/Devices/Neuropixels_1.h
index bb6b751..6eb5f8e 100644
--- a/Source/Devices/Neuropixels_1.h
+++ b/Source/Devices/Neuropixels_1.h
@@ -27,8 +27,6 @@
 #include "../OnixDevice.h"
 #include "../NeuropixComponents.h"
 
-class OnixSource;
-
 #include <ctime>
 #include <chrono>
 #include <bitset>
diff --git a/Source/Devices/OutputClock.cpp b/Source/Devices/OutputClock.cpp
index a2f0f09..8a8e0aa 100644
--- a/Source/Devices/OutputClock.cpp
+++ b/Source/Devices/OutputClock.cpp
@@ -23,31 +23,30 @@
 
 #include "OutputClock.h"
 
-OutputClock::OutputClock(String name, const oni_dev_idx_t deviceIdx_, const oni_ctx ctx_)
-	: OnixDevice(name, OnixDeviceType::OUTPUTCLOCK, deviceIdx_, ctx_)
+OutputClock::OutputClock(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> oni_ctx)
+	: OnixDevice(name, OnixDeviceType::OUTPUTCLOCK, deviceIdx_, oni_ctx)
 {
 }
 
 OutputClock::~OutputClock()
 {
-	setClockGate(false, true);
+	if (deviceContext != nullptr && deviceContext->isInitialized()) setClockGate(false, true);
 }
 
-int OutputClock::updateSettings()
+bool OutputClock::updateSettings()
 {
-	oni_reg_val_t baseFreqHz;
-	ONI_OK_RETURN_INT(oni_read_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::BASE_FREQ_HZ, &baseFreqHz));
+	oni_reg_val_t baseFreqHz = deviceContext->readRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::BASE_FREQ_HZ);
 
 	auto periodCycles = (uint32_t)(baseFreqHz / frequencyHz);
 	auto h = (uint32_t)(periodCycles * (dutyCycle / 100));
 	auto l = periodCycles - h;
 	auto delayCycles = (uint32_t)(delay * baseFreqHz);
 
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::HIGH_CYCLES, h));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::LOW_CYCLES, l));
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::DELAY_CYCLES, delayCycles));
+	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::HIGH_CYCLES, h); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
+	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::LOW_CYCLES, l); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
+	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::DELAY_CYCLES, delayCycles); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
 
-	ONI_OK_RETURN_INT(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::GATE_RUN, 1));
+	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::GATE_RUN, 1); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
 }
 
 void OutputClock::startAcquisition()
diff --git a/Source/Devices/OutputClock.h b/Source/Devices/OutputClock.h
index 5567346..64df433 100644
--- a/Source/Devices/OutputClock.h
+++ b/Source/Devices/OutputClock.h
@@ -43,7 +43,7 @@ enum class OutputClockRegisters : uint32_t
 class OutputClock : public OnixDevice
 {
 public:
-	OutputClock(String name, const oni_dev_idx_t, const oni_ctx);
+	OutputClock(String name, const oni_dev_idx_t, std::shared_ptr<Onix1> oni_ctx);
 
 	~OutputClock();
 
@@ -51,7 +51,7 @@ class OutputClock : public OnixDevice
 	int configureDevice() override { return 0; };
 
 	/** Update the settings of the device */
-	int updateSettings() override;
+	bool updateSettings() override;
 
 	/** Starts probe data streaming */
 	void startAcquisition() override;
@@ -94,7 +94,7 @@ class OutputClock : public OnixDevice
 
 	bool clockGate = false;
 
-	void writeClockGateRegister() { ONI_OK(oni_write_reg(ctx, deviceIdx, (oni_reg_addr_t)OutputClockRegisters::CLOCK_GATE, clockGate ? 1 : 0)); }
+	void writeClockGateRegister() { deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::CLOCK_GATE, clockGate ? 1 : 0); }
 
 	JUCE_LEAK_DETECTOR(OutputClock);
 };
diff --git a/Source/Devices/PortController.cpp b/Source/Devices/PortController.cpp
index 6dd130c..741f34b 100644
--- a/Source/Devices/PortController.cpp
+++ b/Source/Devices/PortController.cpp
@@ -35,6 +35,8 @@ PortController::~PortController()
 
 int PortController::configureDevice()
 {
+	if (deviceContext == nullptr || !deviceContext->isInitialized()) return -5;
+
 	deviceContext->writeRegister(deviceIdx, (uint32_t)PortControllerRegister::ENABLE, 1);
 
 	return deviceContext->getLastResult();
diff --git a/Source/Onix1.h b/Source/Onix1.h
index 1ac2a54..2913f68 100644
--- a/Source/Onix1.h
+++ b/Source/Onix1.h
@@ -32,6 +32,7 @@
 #include "../../plugin-GUI/Source/Utils/Utils.h"
 
 constexpr const char* NEUROPIXELSV1F_HEADSTAGE_NAME = "Neuropixels 1.0f";
+constexpr const char* BREAKOUT_BOARD_NAME = "Breakout Board";
 
 class error_t : public std::exception
 {
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index b9d172e..b41687a 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -205,71 +205,71 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				sources.push_back(np2);
 			}
 		}
-		else if (devices[dev_idx].id == ONIX_MEMUSAGE)
+		else if (device.id == ONIX_MEMUSAGE)
 		{
-			auto memoryMonitor = std::make_shared<MemoryMonitor>("Memory Monitor", devices[dev_idx].idx, ctx);
+			auto memoryMonitor = std::make_shared<MemoryMonitor>("Memory Monitor", index, context);
 
 			int result = memoryMonitor->configureDevice();
 
 			if (result != 0)
 			{
-				LOGE("Device Idx: ", devices[dev_idx].idx, " Error enabling device stream.");
+				LOGE("Device Idx: ", index, " Error enabling device stream.");
 				continue;
 			}
 
 			sources.push_back(memoryMonitor);
 		}
-		else if (devices[dev_idx].id == ONIX_FMCCLKOUT1R3)
+		else if (device.id == ONIX_FMCCLKOUT1R3)
 		{
-			auto outputClock = std::make_shared<OutputClock>("Output Clock", devices[dev_idx].idx, ctx);
+			auto outputClock = std::make_shared<OutputClock>("Output Clock", index, context);
 
 			int result = outputClock->configureDevice();
 
 			if (result != 0)
 			{
-				LOGE("Device Idx: ", devices[dev_idx].idx, " Error enabling device stream.");
+				LOGE("Device Idx: ", index, " Error enabling device stream.");
 				continue;
 			}
 
 			sources.push_back(outputClock);
 		}
-		else if (devices[dev_idx].id == ONIX_HEARTBEAT)
+		else if (device.id == ONIX_HEARTBEAT)
 		{
-			auto heartbeat = std::make_shared<Heartbeat>("Heartbeat", devices[dev_idx].idx, ctx);
+			auto heartbeat = std::make_shared<Heartbeat>("Heartbeat", index, context);
 
 			int result = heartbeat->configureDevice();
 
 			if (result != 0)
 			{
-				LOGE("Device Idx: ", devices[dev_idx].idx, " Error enabling device stream.");
+				LOGE("Device Idx: ", index, " Error enabling device stream.");
 				continue;
 			}
 
 			sources.push_back(heartbeat);
 		}
-		else if (devices[dev_idx].id == ONIX_HARPSYNCINPUT)
+		else if (device.id == ONIX_HARPSYNCINPUT)
 		{
-			auto harpSyncInput = std::make_shared<HarpSyncInput>("Harp Sync Input", devices[dev_idx].idx, ctx);
+			auto harpSyncInput = std::make_shared<HarpSyncInput>("Harp Sync Input", index, context);
 
 			int result = harpSyncInput->configureDevice();
 
 			if (result != 0)
 			{
-				LOGE("Device Idx: ", devices[dev_idx].idx, " Error enabling device stream.");
+				LOGE("Device Idx: ", index, " Error enabling device stream.");
 				continue;
 			}
 
 			sources.push_back(harpSyncInput);
 		}
-		else if (devices[dev_idx].id == ONIX_FMCANALOG1R3)
+		else if (device.id == ONIX_FMCANALOG1R3)
 		{
-			auto analogIO = std::make_shared<AnalogIO>("Analog IO", devices[dev_idx].idx, ctx);
+			auto analogIO = std::make_shared<AnalogIO>("Analog IO", index, context);
 
 			int result = analogIO->configureDevice();
 
 			if (result != 0)
 			{
-				LOGE("Device Idx: ", devices[dev_idx].idx, " Error enabling device stream.");
+				LOGE("Device Idx: ", index, " Error enabling device stream.");
 				continue;
 			}
 
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index b3e2b89..db4f054 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -124,7 +124,7 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* tab, OnixDeviceVec
 		else if (device->type == OnixDeviceType::HEARTBEAT)
 		{
 			auto heartbeatInterface = std::make_shared<HeartbeatInterface>(std::static_pointer_cast<Heartbeat>(device), editor, this);
-      addInterfaceToTab(getDeviceTabName(device), tab, heartbeatInterface);
+			addInterfaceToTab(getDeviceTabName(device), tab, heartbeatInterface);
 		}
 		else if (device->type == OnixDeviceType::HARPSYNCINPUT)
 		{
@@ -203,14 +203,6 @@ CustomViewport* OnixSourceCanvas::createCustomViewport(SettingsInterface* settin
 	return new CustomViewport(settingsInterface, bounds.getWidth(), bounds.getHeight());
 }
 
-OnixSourceCanvas::~OnixSourceCanvas()
-{
-}
-
-void OnixSourceCanvas::paint(Graphics& g)
-{
-}
-
 void OnixSourceCanvas::refresh()
 {
 	repaint();
@@ -358,9 +350,9 @@ void OnixSourceCanvas::refreshTabs()
 				AlertWindow::showMessageBox(
 					MessageBoxIconType::WarningIcon,
 					"No Headstages Found",
-					"No headstages were found when connecting. Double check that the correct headstage is selected. " + 
-						String("If the correct headstage is selected, try pressing disconnect / connect again.\n\n") + 
-						String("If the port voltage is manually set, try clearing the value and letting the automated voltage discovery algorithm run.")
+					"No headstages were found when connecting. Double check that the correct headstage is selected. " +
+					String("If the correct headstage is selected, try pressing disconnect / connect again.\n\n") +
+					String("If the port voltage is manually set, try clearing the value and letting the automated voltage discovery algorithm run.")
 				);
 			}
 		}
diff --git a/Source/OnixSourceCanvas.h b/Source/OnixSourceCanvas.h
index ba8b059..fce0820 100644
--- a/Source/OnixSourceCanvas.h
+++ b/Source/OnixSourceCanvas.h
@@ -31,6 +31,8 @@
 #include "OnixSourceEditor.h"
 #include "OnixSource.h"
 
+class OnixSource;
+
 /**
 
 	TabBarButton with custom appearance
@@ -83,12 +85,6 @@ class OnixSourceCanvas : public Visualizer
 	/** Constructor */
 	OnixSourceCanvas(GenericProcessor*, OnixSourceEditor*, OnixSource*);
 
-	/** Destructor */
-	~OnixSourceCanvas();
-
-	/** Fills background */
-	void paint(Graphics& g);
-
 	/** Renders the Visualizer on each animation callback cycle */
 	void refresh() override;
 
@@ -123,6 +119,9 @@ class OnixSourceCanvas : public Visualizer
 	/** Add the headstage and all of its devices to the canvas */
 	void addHeadstage(String headstage, PortName port);
 
+	/** Adds the Breakout Board as a tab, and adds all of its devices as sub-tabs */
+	void addBreakoutBoardTab();
+
 	/** Called when the basestation is created or refreshed */
 	void populateSourceTabs(CustomTabComponent*, OnixDeviceVector);
 
diff --git a/Source/OnixSourceEditor.cpp b/Source/OnixSourceEditor.cpp
index eb4623b..09299ca 100644
--- a/Source/OnixSourceEditor.cpp
+++ b/Source/OnixSourceEditor.cpp
@@ -302,7 +302,7 @@ void OnixSourceEditor::startAcquisition()
 	// TODO: Disable all UI elements that should not be changed during acquisition...
 	connectButton->setEnabled(false);
 
-	for (const auto& source : thread->getDataSources())
+	for (const auto& source : source->getDataSources())
 	{
 		if (source->type == OnixDeviceType::MEMORYMONITOR)
 		{
@@ -318,7 +318,7 @@ void OnixSourceEditor::stopAcquisition()
   // TODO: Re-enable all of the UI elements 
 	connectButton->setEnabled(true);
 
-	for (const auto& source : thread->getDataSources())
+	for (const auto& source : source->getDataSources())
 	{
 		if (source->type == OnixDeviceType::MEMORYMONITOR)
 		{
diff --git a/Source/OnixSourceEditor.h b/Source/OnixSourceEditor.h
index 660b4f0..decf9d4 100644
--- a/Source/OnixSourceEditor.h
+++ b/Source/OnixSourceEditor.h
@@ -49,9 +49,6 @@ class OnixSourceEditor : public VisualizerEditor,
     /** Constructor */
     OnixSourceEditor(GenericProcessor* parentNode, OnixSource* source_);
 
-    /** Destructor */
-    virtual ~OnixSourceEditor() { }
-
     /** Listener methods */
     void labelTextChanged(Label* l) override;
 
diff --git a/Source/UI/AnalogIOInterface.cpp b/Source/UI/AnalogIOInterface.cpp
index eeb2a44..77282d4 100644
--- a/Source/UI/AnalogIOInterface.cpp
+++ b/Source/UI/AnalogIOInterface.cpp
@@ -41,9 +41,10 @@ AnalogIOInterface::AnalogIOInterface(std::shared_ptr<AnalogIO> d, OnixSourceEdit
 		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
 		deviceEnableButton->setTooltip("If disabled, AnalogIO will not stream or receive data during acquisition");
+		deviceEnableButton->setToggleState(true, dontSendNotification);
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
-		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
 
 		infoLabel = std::make_unique<Label>("INFO", "INFO");
 		infoLabel->setFont(FontOptions(15.0f));
@@ -125,7 +126,7 @@ void AnalogIOInterface::buttonClicked(Button* button)
 	{
 		device->setEnabled(deviceEnableButton->getToggleState());
 		device->configureDevice();
-		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
+		if (canvas->foundInputSource()) canvas->resetContext();
 
 		if (device->isEnabled())
 		{
diff --git a/Source/UI/Bno055Interface.cpp b/Source/UI/Bno055Interface.cpp
index a0f5647..5c86184 100644
--- a/Source/UI/Bno055Interface.cpp
+++ b/Source/UI/Bno055Interface.cpp
@@ -35,10 +35,11 @@ Bno055Interface::Bno055Interface(std::shared_ptr<Bno055> d, OnixSourceEditor* e,
 		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->setToggleState(true, dontSendNotification);
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
+		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
 	}
 
 	type = SettingsInterface::Type::BNO055_SETTINGS_INTERFACE;
@@ -64,19 +65,3 @@ void Bno055Interface::buttonClicked(Button* button)
 		CoreServices::updateSignalChain(editor);
 	}
 }
-
-void Bno055Interface::startAcquisition()
-{
-}
-
-void Bno055Interface::stopAcquisition()
-{
-}
-
-void Bno055Interface::saveParameters(XmlElement* xml)
-{
-}
-
-void Bno055Interface::loadParameters(XmlElement* xml)
-{
-}
diff --git a/Source/UI/HarpSyncInputInterface.cpp b/Source/UI/HarpSyncInputInterface.cpp
index 979111b..409c221 100644
--- a/Source/UI/HarpSyncInputInterface.cpp
+++ b/Source/UI/HarpSyncInputInterface.cpp
@@ -39,9 +39,10 @@ HarpSyncInputInterface::HarpSyncInputInterface(std::shared_ptr<HarpSyncInput> d,
 		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
 		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
+		deviceEnableButton->setToggleState(true, dontSendNotification);
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
-		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
 
 		infoLabel = std::make_unique<Label>("INFO", "INFO");
 		infoLabel->setFont(FontOptions(15.0f));
@@ -61,7 +62,7 @@ void HarpSyncInputInterface::buttonClicked(Button* button)
 	{
 		device->setEnabled(deviceEnableButton->getToggleState());
 		device->configureDevice();
-		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
+		if (canvas->foundInputSource()) canvas->resetContext();
 
 		if (device->isEnabled())
 		{
diff --git a/Source/UI/HeartbeatInterface.cpp b/Source/UI/HeartbeatInterface.cpp
index fc3e661..1d91c53 100644
--- a/Source/UI/HeartbeatInterface.cpp
+++ b/Source/UI/HeartbeatInterface.cpp
@@ -39,9 +39,10 @@ HeartbeatInterface::HeartbeatInterface(std::shared_ptr<Heartbeat> d, OnixSourceE
 		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
 		deviceEnableButton->setTooltip("If disabled, Heartbeat will not stream data during acquisition");
+		deviceEnableButton->setToggleState(true, dontSendNotification);
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
-		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
 
 		infoLabel = std::make_unique<Label>("INFO", "INFO");
 		infoLabel->setFont(FontOptions(15.0f));
@@ -74,7 +75,7 @@ void HeartbeatInterface::buttonClicked(Button* button)
 	{
 		device->setEnabled(deviceEnableButton->getToggleState());
 		device->configureDevice();
-		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
+		if (canvas->foundInputSource()) canvas->resetContext();
 
 		if (device->isEnabled())
 		{
diff --git a/Source/UI/MemoryMonitorInterface.cpp b/Source/UI/MemoryMonitorInterface.cpp
index 0b2ab2b..13c0353 100644
--- a/Source/UI/MemoryMonitorInterface.cpp
+++ b/Source/UI/MemoryMonitorInterface.cpp
@@ -39,9 +39,10 @@ MemoryMonitorInterface::MemoryMonitorInterface(std::shared_ptr<MemoryMonitor> d,
 		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
 		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
+		deviceEnableButton->setToggleState(true, dontSendNotification);
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
-		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
 
 		infoLabel = std::make_unique<Label>("INFO", "INFO");
 		infoLabel->setFont(FontOptions(15.0f));
@@ -74,7 +75,7 @@ void MemoryMonitorInterface::buttonClicked(Button* button)
 	{
 		device->setEnabled(deviceEnableButton->getToggleState());
 		device->configureDevice();
-		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
+		if (canvas->foundInputSource()) canvas->resetContext();
 
 		if (device->isEnabled())
 		{
diff --git a/Source/UI/NeuropixV1Interface.cpp b/Source/UI/NeuropixV1Interface.cpp
index 7ebbda3..d8ab7eb 100644
--- a/Source/UI/NeuropixV1Interface.cpp
+++ b/Source/UI/NeuropixV1Interface.cpp
@@ -53,19 +53,20 @@ NeuropixV1Interface::NeuropixV1Interface(std::shared_ptr<Neuropixels_1> d, OnixS
 		nameLabel->setBounds(625, 40, 370, 45);
 		addAndMakeVisible(nameLabel.get());
 
-		probeEnableButton = std::make_unique<UtilityButton>("ENABLED");
-		probeEnableButton->setFont(fontRegularButton);
-		probeEnableButton->setRadius(3.0f);
-		probeEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
-		probeEnableButton->setClickingTogglesState(true);
-		probeEnableButton->setTooltip("If disabled, probe will not stream data during acquisition");
-		probeEnableButton->addListener(this);
-		addAndMakeVisible(probeEnableButton.get());
-		probeEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
+		deviceEnableButton->setFont(fontRegularButton);
+		deviceEnableButton->setRadius(3.0f);
+		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
+		deviceEnableButton->setClickingTogglesState(true);
+		deviceEnableButton->setTooltip("If disabled, probe will not stream data during acquisition");
+		deviceEnableButton->setToggleState(true, dontSendNotification);
+		deviceEnableButton->addListener(this);
+		addAndMakeVisible(deviceEnableButton.get());
+		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
 
 		infoLabel = std::make_unique<Label>("INFO", "INFO");
 		infoLabel->setFont(FontOptions(15.0f));
-		infoLabel->setBounds(probeEnableButton->getX(), probeEnableButton->getBottom() + 10, nameLabel->getWidth(), 50);
+		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, nameLabel->getWidth(), 50);
 		infoLabel->setJustificationType(Justification::topLeft);
 		addAndMakeVisible(infoLabel.get());
 
@@ -698,9 +699,9 @@ void NeuropixV1Interface::buttonClicked(Button* button)
 {
 	auto npx = std::static_pointer_cast<Neuropixels_1>(device);
 
-	if (button == probeEnableButton.get())
+	if (button == deviceEnableButton.get())
 	{
-		npx->setEnabled(probeEnableButton->getToggleState());
+		npx->setEnabled(deviceEnableButton->getToggleState());
 
 		if (canvas->foundInputSource())
 		{
@@ -710,11 +711,11 @@ void NeuropixV1Interface::buttonClicked(Button* button)
 
 		if (npx->isEnabled())
 		{
-			probeEnableButton->setLabel("ENABLED");
+			deviceEnableButton->setLabel("ENABLED");
 		}
 		else
 		{
-			probeEnableButton->setLabel("DISABLED");
+			deviceEnableButton->setLabel("DISABLED");
 		}
 
 		CoreServices::updateSignalChain(editor);
@@ -906,8 +907,8 @@ void NeuropixV1Interface::selectElectrodes(Array<int> electrodes)
 
 void NeuropixV1Interface::setInterfaceEnabledState(bool enabledState)
 {
-	if (probeEnableButton != nullptr)
-		probeEnableButton->setEnabled(enabledState);
+	if (deviceEnableButton != nullptr)
+		deviceEnableButton->setEnabled(enabledState);
 
 	if (enableButton != nullptr)
 		enableButton->setEnabled(enabledState);
@@ -1002,9 +1003,7 @@ bool NeuropixV1Interface::applyProbeSettings(ProbeSettings* p, bool shouldUpdate
 
 	if (referenceComboBox != 0)
 		referenceComboBox->setSelectedId(p->referenceIndex + 1, dontSendNotification);
-
-	auto npx = std::static_pointer_cast<Neuropixels_1>(device);
-
+	
 	for (int i = 0; i < npx->settings->electrodeMetadata.size(); i++)
 	{
 		if (npx->settings->electrodeMetadata[i].status == ElectrodeStatus::CONNECTED)
diff --git a/Source/UI/NeuropixV1Interface.h b/Source/UI/NeuropixV1Interface.h
index 02200e7..e970516 100644
--- a/Source/UI/NeuropixV1Interface.h
+++ b/Source/UI/NeuropixV1Interface.h
@@ -116,7 +116,7 @@ class NeuropixV1Interface : public SettingsInterface,
 	std::unique_ptr<Label> gainCalibrationFileLabel;
 
 	// BUTTONS
-	std::unique_ptr<UtilityButton> probeEnableButton;
+	std::unique_ptr<UtilityButton> deviceEnableButton;
 	std::unique_ptr<UtilityButton> enableButton;
 
 	std::unique_ptr<UtilityButton> enableViewButton;
diff --git a/Source/UI/OutputClockInterface.cpp b/Source/UI/OutputClockInterface.cpp
index a4648a2..479a581 100644
--- a/Source/UI/OutputClockInterface.cpp
+++ b/Source/UI/OutputClockInterface.cpp
@@ -39,9 +39,10 @@ OutputClockInterface::OutputClockInterface(std::shared_ptr<OutputClock> d, OnixS
 		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
 		deviceEnableButton->setTooltip("If disabled, Output Clock will not be active during acquisition");
+		deviceEnableButton->setToggleState(true, dontSendNotification);
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
-		deviceEnableButton->setToggleState(device->isEnabled(), dontSendNotification);
+		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
 
 		infoLabel = std::make_unique<Label>("INFO", "INFO");
 		infoLabel->setFont(FontOptions(15.0f));
@@ -111,7 +112,7 @@ void OutputClockInterface::buttonClicked(Button* b)
 	{
 		device->setEnabled(deviceEnableButton->getToggleState());
 		device->configureDevice();
-		//canvas->resetContext(); // TODO: Once issue-23 is merged, uncomment this line
+		if (canvas->foundInputSource()) canvas->resetContext();
 
 		if (device->isEnabled())
 		{

From c872a217926c49bc7611e15e9c403ac731e3d973 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Fri, 21 Mar 2025 14:13:47 -0400
Subject: [PATCH 14/25] Add Breakout Board as a tab that automatically appears

---
 Source/Devices/HarpSyncInput.cpp |  2 +-
 Source/Devices/OutputClock.cpp   |  2 ++
 Source/OnixSource.cpp            |  7 ++++++-
 Source/OnixSourceCanvas.cpp      | 34 ++++++++++++++++++++++++--------
 Source/OnixSourceCanvas.h        |  7 ++-----
 Source/OnixSourceEditor.cpp      |  9 +++------
 6 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/Source/Devices/HarpSyncInput.cpp b/Source/Devices/HarpSyncInput.cpp
index 4ff4634..04c316d 100644
--- a/Source/Devices/HarpSyncInput.cpp
+++ b/Source/Devices/HarpSyncInput.cpp
@@ -56,7 +56,7 @@ bool HarpSyncInput::updateSettings()
 {
 	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)HarpSyncInputRegisters::SOURCE, (oni_reg_val_t)HarpSyncSource::Breakout);
 
-	return 0;
+	return deviceContext->getLastResult() == ONI_ESUCCESS;
 }
 
 void HarpSyncInput::startAcquisition()
diff --git a/Source/Devices/OutputClock.cpp b/Source/Devices/OutputClock.cpp
index 8a8e0aa..07e8cb9 100644
--- a/Source/Devices/OutputClock.cpp
+++ b/Source/Devices/OutputClock.cpp
@@ -47,6 +47,8 @@ bool OutputClock::updateSettings()
 	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::DELAY_CYCLES, delayCycles); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
 
 	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::GATE_RUN, 1); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
+
+	return true;
 }
 
 void OutputClock::startAcquisition()
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index b41687a..62b1cc5 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -218,6 +218,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(memoryMonitor);
+			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_FMCCLKOUT1R3)
 		{
@@ -232,6 +233,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(outputClock);
+			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_HEARTBEAT)
 		{
@@ -246,6 +248,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(heartbeat);
+			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_HARPSYNCINPUT)
 		{
@@ -260,7 +263,8 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(harpSyncInput);
-		}
+			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
+			}
 		else if (device.id == ONIX_FMCANALOG1R3)
 		{
 			auto analogIO = std::make_shared<AnalogIO>("Analog IO", index, context);
@@ -274,6 +278,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(analogIO);
+			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 	}
 
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index db4f054..51ab18b 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -55,6 +55,8 @@ OnixSourceCanvas::OnixSourceCanvas(GenericProcessor* processor_, OnixSourceEdito
 {
 	topLevelTabComponent = std::make_unique<CustomTabComponent>(editor, true);
 	addAndMakeVisible(topLevelTabComponent.get());
+
+	addHub(BREAKOUT_BOARD_NAME, 0);
 }
 
 CustomTabComponent* OnixSourceCanvas::addTopLevelTab(String tabName, int index)
@@ -74,20 +76,31 @@ Parameter* OnixSourceCanvas::getSourceParameter(String name)
 	return source->getParameter(name);
 }
 
-void OnixSourceCanvas::addHeadstage(String headstage, PortName port)
+void OnixSourceCanvas::addHub(String hubName, int offset)
 {
-	int offset = PortController::getPortOffset(port);
 	CustomTabComponent* tab = nullptr;
 	OnixDeviceVector devices;
+	PortName port = PortController::getPortFromIndex(offset);
 
-	if (headstage == NEUROPIXELSV1F_HEADSTAGE_NAME)
+	if (hubName == NEUROPIXELSV1F_HEADSTAGE_NAME)
 	{
-		tab = addTopLevelTab(getTopLevelTabName(port, headstage), (int)port - 1);
+		tab = addTopLevelTab(getTopLevelTabName(port, hubName), (int)port);
 
 		devices.push_back(std::make_shared<Neuropixels_1>("Probe-A", offset, nullptr));
 		devices.push_back(std::make_shared<Neuropixels_1>("Probe-B", offset + 1, nullptr));
 		devices.push_back(std::make_shared<Bno055>("BNO055", offset + 2, nullptr));
 	}
+	else if (hubName == BREAKOUT_BOARD_NAME)
+	{
+		tab = addTopLevelTab(hubName, 0);
+
+		devices.push_back(std::make_shared<Heartbeat>("Heartbeat", 0, nullptr));
+		devices.push_back(std::make_shared<OutputClock>("Output Clock", 5, nullptr));
+		devices.push_back(std::make_shared<AnalogIO>("Analog IO", 6, nullptr));
+		//devices.push_back(std::make_shared<DigitalIO>("Digital IO", 7, nullptr));
+		devices.push_back(std::make_shared<MemoryMonitor>("Memory Monitor", 10, nullptr));
+		devices.push_back(std::make_shared<HarpSyncInput>("Harp Sync Input", 12, nullptr));
+	}
 
 	if (tab != nullptr && devices.size() > 0)
 	{
@@ -239,7 +252,12 @@ void OnixSourceCanvas::removeTabs(PortName port)
 	}
 
 	if (tabExists)
-		topLevelTabComponent->removeTab((int)port - 1);
+	{
+		if (port == PortName::PortB && headstageTabs.size() == 1 && headstageTabs[0]->getName().contains(BREAKOUT_BOARD_NAME))
+			topLevelTabComponent->removeTab((int)port - 1); // NB: If only one headstage is selected in the editor, the index needs to be corrected here.
+		else
+			topLevelTabComponent->removeTab((int)port);
+	}
 }
 
 void OnixSourceCanvas::removeAllTabs()
@@ -360,7 +378,7 @@ void OnixSourceCanvas::refreshTabs()
 		{
 			for (auto& [port, headstageName] : source->getHeadstageMap())
 			{
-				addHeadstage(headstageName, port);
+				addHub(headstageName, PortController::getPortOffset(port));
 			}
 		}
 		else if (selectedPorts.size() == foundPorts.size()) // NB: Same number of ports selected and found
@@ -383,7 +401,7 @@ void OnixSourceCanvas::refreshTabs()
 				{
 					askKeepRemove(selectedPorts[0]);
 
-					addHeadstage(headstages[foundPorts[0]], foundPorts[0]);
+					addHub(headstages[foundPorts[0]], PortController::getPortOffset(foundPorts[0]));
 				}
 			}
 			else // NB: Two headstages are selected on different ports, and at least one of those headstages does not match the found headstages
@@ -431,7 +449,7 @@ void OnixSourceCanvas::refreshTabs()
 					}
 					else
 					{
-						addHeadstage(headstages[port], port);
+						addHub(headstages[port], PortController::getPortOffset(port));
 					}
 				}
 			}
diff --git a/Source/OnixSourceCanvas.h b/Source/OnixSourceCanvas.h
index fce0820..de2e113 100644
--- a/Source/OnixSourceCanvas.h
+++ b/Source/OnixSourceCanvas.h
@@ -116,11 +116,8 @@ class OnixSourceCanvas : public Visualizer
 	/** Stops animation of sub-interfaces */
 	void stopAcquisition();
 
-	/** Add the headstage and all of its devices to the canvas */
-	void addHeadstage(String headstage, PortName port);
-
-	/** Adds the Breakout Board as a tab, and adds all of its devices as sub-tabs */
-	void addBreakoutBoardTab();
+	/** Add the hub and all of its devices to the canvas */
+	void addHub(String, int);
 
 	/** Called when the basestation is created or refreshed */
 	void populateSourceTabs(CustomTabComponent*, OnixDeviceVector);
diff --git a/Source/OnixSourceEditor.cpp b/Source/OnixSourceEditor.cpp
index 09299ca..431c8d1 100644
--- a/Source/OnixSourceEditor.cpp
+++ b/Source/OnixSourceEditor.cpp
@@ -266,17 +266,14 @@ void OnixSourceEditor::updateComboBox(ComboBox* cb)
 	bool otherHeadstageSelected = isPortA ? headstageComboBoxB->getSelectedId() > 1 : headstageComboBoxA->getSelectedId() > 1;
 	bool currentHeadstageSelected = isPortA ? headstageComboBoxA->getSelectedId() > 1 : headstageComboBoxB->getSelectedId() > 1;
 
-	if (otherHeadstageSelected)
-		canvas->removeTabs(currentPort);
-	else
-		canvas->removeAllTabs();
+	canvas->removeTabs(currentPort);
 
 	if (currentHeadstageSelected)
 	{
 		String headstage = isPortA ? headstageComboBoxA->getText() : headstageComboBoxB->getText();
 
 		source->updateDiscoveryParameters(currentPort, PortController::getHeadstageDiscoveryParameters(headstage));
-		canvas->addHeadstage(headstage, currentPort);
+		canvas->addHub(headstage, PortController::getPortOffset(currentPort));
 
 		String passthroughName = isPortA ? "passthroughA" : "passthroughB";
 
@@ -315,7 +312,7 @@ void OnixSourceEditor::startAcquisition()
 
 void OnixSourceEditor::stopAcquisition()
 {
-  // TODO: Re-enable all of the UI elements 
+	// TODO: Re-enable all of the UI elements 
 	connectButton->setEnabled(true);
 
 	for (const auto& source : source->getDataSources())

From 1236ed76e3ec7315b0fae247d0f67e036018a554 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Mon, 24 Mar 2025 09:36:39 -0400
Subject: [PATCH 15/25] Change variable name to streamInfos

---
 Source/Devices/AnalogIO.cpp       |  4 ++--
 Source/Devices/Bno055.cpp         | 12 ++++++------
 Source/Devices/HarpSyncInput.cpp  |  4 ++--
 Source/Devices/MemoryMonitor.cpp  | 10 +++++-----
 Source/Devices/Neuropixels2e.cpp  |  4 ++--
 Source/Devices/Neuropixels_1.cpp  |  6 +++---
 Source/Devices/PortController.cpp |  4 ----
 Source/Devices/PortController.h   |  2 --
 Source/OnixDevice.h               |  2 +-
 Source/OnixSource.cpp             |  2 +-
 10 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/Source/Devices/AnalogIO.cpp b/Source/Devices/AnalogIO.cpp
index 8bac1cf..94c35d2 100644
--- a/Source/Devices/AnalogIO.cpp
+++ b/Source/Devices/AnalogIO.cpp
@@ -35,7 +35,7 @@ AnalogIO::AnalogIO(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<
 	analogInputStream.channelPrefix = "AnalogInput";
 	analogInputStream.bitVolts = 1.0f;
 	analogInputStream.channelType = ContinuousChannel::Type::ADC;
-	streams.add(analogInputStream);
+	streamInfos.add(analogInputStream);
 
 	for (int i = 0; i < numFrames; i++)
 		eventCodes[i] = 0;
@@ -125,7 +125,7 @@ void AnalogIO::addFrame(oni_frame_t* frame)
 
 void AnalogIO::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
-	for (StreamInfo streamInfo : streams)
+	for (StreamInfo streamInfo : streamInfos)
 	{
 		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
 
diff --git a/Source/Devices/Bno055.cpp b/Source/Devices/Bno055.cpp
index d38ed90..14662d8 100644
--- a/Source/Devices/Bno055.cpp
+++ b/Source/Devices/Bno055.cpp
@@ -37,7 +37,7 @@ Bno055::Bno055(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix
 	eulerAngleStream.channelPrefix = "Euler";
 	eulerAngleStream.bitVolts = bitVolts;
 	eulerAngleStream.channelType = ContinuousChannel::Type::AUX;
-	streams.add(eulerAngleStream);
+	streamInfos.add(eulerAngleStream);
 
 	StreamInfo quaternionStream;
 	quaternionStream.name = name + "-Quaternion";
@@ -48,7 +48,7 @@ Bno055::Bno055(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix
 	quaternionStream.channelPrefix = "Quaternion";
 	quaternionStream.bitVolts = bitVolts;
 	quaternionStream.channelType = ContinuousChannel::Type::AUX;
-	streams.add(quaternionStream);
+	streamInfos.add(quaternionStream);
 
 	StreamInfo accelerationStream;
 	accelerationStream.name = name + "-Acceleration";
@@ -59,7 +59,7 @@ Bno055::Bno055(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix
 	accelerationStream.channelPrefix = "Acceleration";
 	accelerationStream.bitVolts = bitVolts;
 	accelerationStream.channelType = ContinuousChannel::Type::AUX;
-	streams.add(accelerationStream);
+	streamInfos.add(accelerationStream);
 
 	StreamInfo gravityStream;
 	gravityStream.name = name + "-Gravity";
@@ -70,7 +70,7 @@ Bno055::Bno055(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix
 	gravityStream.channelPrefix = "Gravity";
 	gravityStream.bitVolts = bitVolts;
 	gravityStream.channelType = ContinuousChannel::Type::AUX;
-	streams.add(gravityStream);
+	streamInfos.add(gravityStream);
 
 	StreamInfo temperatureStream;
 	temperatureStream.name = name + "-Temperature";
@@ -81,7 +81,7 @@ Bno055::Bno055(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix
 	temperatureStream.channelPrefix = "Temperature";
 	temperatureStream.bitVolts = bitVolts;
 	temperatureStream.channelType = ContinuousChannel::Type::AUX;
-	streams.add(temperatureStream);
+	streamInfos.add(temperatureStream);
 
 	for (int i = 0; i < numFrames; i++)
 		eventCodes[i] = 0;
@@ -127,7 +127,7 @@ void Bno055::addFrame(oni_frame_t* frame)
 
 void Bno055::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
-	for (StreamInfo streamInfo : streams)
+	for (StreamInfo streamInfo : streamInfos)
 	{
 		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
 
diff --git a/Source/Devices/HarpSyncInput.cpp b/Source/Devices/HarpSyncInput.cpp
index 04c316d..f04e7cc 100644
--- a/Source/Devices/HarpSyncInput.cpp
+++ b/Source/Devices/HarpSyncInput.cpp
@@ -37,7 +37,7 @@ HarpSyncInput::HarpSyncInput(String name, const oni_dev_idx_t deviceIdx_, std::s
 	harpTimeStream.channelPrefix = "HarpTime";
 	harpTimeStream.bitVolts = 1.0f;
 	harpTimeStream.channelType = ContinuousChannel::Type::AUX;
-	streams.add(harpTimeStream);
+	streamInfos.add(harpTimeStream);
 
 	for (int i = 0; i < numFrames; i++)
 		eventCodes[i] = 0;
@@ -82,7 +82,7 @@ void HarpSyncInput::addFrame(oni_frame_t* frame)
 
 void HarpSyncInput::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
-	for (StreamInfo streamInfo : streams)
+	for (StreamInfo streamInfo : streamInfos)
 	{
 		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
 
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index 98d1e69..33b140e 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -67,7 +67,7 @@ MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, std::s
 	percentUsedStream.channelPrefix = "Percent";
 	percentUsedStream.bitVolts = 1.0f;
 	percentUsedStream.channelType = ContinuousChannel::Type::AUX;
-	streams.add(percentUsedStream);
+	streamInfos.add(percentUsedStream);
 
 	StreamInfo bytesUsedStream;
 	bytesUsedStream.name = name + "-BytesUsed";
@@ -78,7 +78,7 @@ MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, std::s
 	bytesUsedStream.channelPrefix = "Bytes";
 	bytesUsedStream.bitVolts = 1.0f;
 	bytesUsedStream.channelType = ContinuousChannel::Type::AUX;
-	streams.add(bytesUsedStream);
+	streamInfos.add(bytesUsedStream);
 
 	for (int i = 0; i < numFrames; i++)
 		eventCodes[i] = 0;
@@ -132,7 +132,7 @@ void MemoryMonitor::addFrame(oni_frame_t* frame)
 
 void MemoryMonitor::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
-	for (StreamInfo streamInfo : streams)
+	for (StreamInfo streamInfo : streamInfos)
 	{
 		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
 
@@ -147,9 +147,9 @@ void MemoryMonitor::setSamplesPerSecond(uint32_t samplesPerSecond_)
 {
 	samplesPerSecond = samplesPerSecond_;
 
-	for (const auto& stream : streams)
+	for (const auto& stream : streamInfos)
 	{
-		streams.getReference(0).sampleRate = samplesPerSecond;
+		streamInfos.getReference(0).sampleRate = samplesPerSecond;
 	}
 }
 
diff --git a/Source/Devices/Neuropixels2e.cpp b/Source/Devices/Neuropixels2e.cpp
index 9f4f2b1..01d5531 100644
--- a/Source/Devices/Neuropixels2e.cpp
+++ b/Source/Devices/Neuropixels2e.cpp
@@ -16,7 +16,7 @@ void Neuropixels2e::createDataStream(int n)
 	apStream.channelPrefix = "CH";
 	apStream.bitVolts = 0.195f;
 	apStream.channelType = ContinuousChannel::Type::ELECTRODE;
-	streams.add(apStream);
+	streamInfos.add(apStream);
 }
 
 int Neuropixels2e::getNumProbes() const
@@ -211,7 +211,7 @@ void Neuropixels2e::addFrame(oni_frame_t* frame)
 void Neuropixels2e::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
 	int bufferIdx = 0;
-	for (StreamInfo streamInfo : streams)
+	for (StreamInfo streamInfo : streamInfos)
 	{
 		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
 		apBuffer[bufferIdx++] = sourceBuffers.getLast();
diff --git a/Source/Devices/Neuropixels_1.cpp b/Source/Devices/Neuropixels_1.cpp
index f742448..6f10d7e 100644
--- a/Source/Devices/Neuropixels_1.cpp
+++ b/Source/Devices/Neuropixels_1.cpp
@@ -182,7 +182,7 @@ Neuropixels_1::Neuropixels_1(String name, const oni_dev_idx_t deviceIdx_, std::s
 	apStream.channelPrefix = "AP";
 	apStream.bitVolts = 0.195f;
 	apStream.channelType = ContinuousChannel::Type::ELECTRODE;
-	streams.add(apStream);
+	streamInfos.add(apStream);
 
 	StreamInfo lfpStream;
 	lfpStream.name = name + "-LFP";
@@ -193,7 +193,7 @@ Neuropixels_1::Neuropixels_1(String name, const oni_dev_idx_t deviceIdx_, std::s
 	lfpStream.channelPrefix = "LFP";
 	lfpStream.bitVolts = 0.195f;
 	lfpStream.channelType = ContinuousChannel::Type::ELECTRODE;
-	streams.add(lfpStream);
+	streamInfos.add(lfpStream);
 
 	settings = std::make_unique<ProbeSettings>();
 	defineMetadata(settings.get());
@@ -399,7 +399,7 @@ void Neuropixels_1::stopAcquisition()
 
 void Neuropixels_1::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
-	for (StreamInfo streamInfo : streams)
+	for (StreamInfo streamInfo : streamInfos)
 	{
 		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
 
diff --git a/Source/Devices/PortController.cpp b/Source/Devices/PortController.cpp
index 741f34b..8b1d637 100644
--- a/Source/Devices/PortController.cpp
+++ b/Source/Devices/PortController.cpp
@@ -29,10 +29,6 @@ PortController::PortController(PortName port_, std::shared_ptr<Onix1> ctx_) :
 {
 }
 
-PortController::~PortController()
-{
-}
-
 int PortController::configureDevice()
 {
 	if (deviceContext == nullptr || !deviceContext->isInitialized()) return -5;
diff --git a/Source/Devices/PortController.h b/Source/Devices/PortController.h
index 823322c..6fcffff 100644
--- a/Source/Devices/PortController.h
+++ b/Source/Devices/PortController.h
@@ -84,8 +84,6 @@ class PortController : public OnixDevice
 public:
 	PortController(PortName port_, std::shared_ptr<Onix1> ctx_);
 
-	~PortController();
-
 	int configureDevice() override;
 
 	bool updateSettings() override { return true; }
diff --git a/Source/OnixDevice.h b/Source/OnixDevice.h
index 22c89e1..7187122 100644
--- a/Source/OnixDevice.h
+++ b/Source/OnixDevice.h
@@ -108,7 +108,7 @@ class OnixDevice
 
 	OnixDeviceType type;
 
-	Array<StreamInfo> streams;
+	Array<StreamInfo> streamInfos;
 
 	const int bufferSizeInSeconds = 10;
 
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 62b1cc5..466267b 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -500,7 +500,7 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 			}
 
 			// add data streams and channels
-			for (const auto& streamInfo : source->streams)
+			for (const auto& streamInfo : source->streamInfos)
 			{
 				DataStream::Settings streamSettings
 				{

From 30c2b64908d63b09de597e55901fde3949d9c951 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Mon, 24 Mar 2025 15:06:30 -0400
Subject: [PATCH 16/25] Add DigitalIO - Note: This is not currently saving the
 digital data as events. This will be added later

---
 Source/Devices/DeviceList.h       |  1 +
 Source/Devices/DigitalIO.cpp      | 80 ++++++++++++++++++++++++++
 Source/Devices/DigitalIO.h        | 96 +++++++++++++++++++++++++++++++
 Source/Devices/PortController.cpp | 12 ++++
 Source/Devices/PortController.h   |  2 +
 Source/OnixDevice.h               |  1 +
 Source/OnixSource.cpp             | 17 +++++-
 Source/OnixSourceCanvas.cpp       |  7 ++-
 Source/UI/DigitalIOInterface.cpp  | 67 +++++++++++++++++++++
 Source/UI/DigitalIOInterface.h    | 68 ++++++++++++++++++++++
 Source/UI/InterfaceList.h         |  1 +
 Source/UI/SettingsInterface.h     |  1 +
 12 files changed, 351 insertions(+), 2 deletions(-)
 create mode 100644 Source/Devices/DigitalIO.cpp
 create mode 100644 Source/Devices/DigitalIO.h
 create mode 100644 Source/UI/DigitalIOInterface.cpp
 create mode 100644 Source/UI/DigitalIOInterface.h

diff --git a/Source/Devices/DeviceList.h b/Source/Devices/DeviceList.h
index 9b1b2fd..b5c737a 100644
--- a/Source/Devices/DeviceList.h
+++ b/Source/Devices/DeviceList.h
@@ -8,4 +8,5 @@
 #include "Heartbeat.h"
 #include "HarpSyncInput.h"
 #include "AnalogIO.h"
+#include "DigitalIO.h"
 #include "PortController.h"
diff --git a/Source/Devices/DigitalIO.cpp b/Source/Devices/DigitalIO.cpp
new file mode 100644
index 0000000..5befa99
--- /dev/null
+++ b/Source/Devices/DigitalIO.cpp
@@ -0,0 +1,80 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "DigitalIO.h"
+
+DigitalIO::DigitalIO(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> oni_ctx)
+	: OnixDevice(name, OnixDeviceType::DIGITALIO, deviceIdx_, oni_ctx)
+{
+}
+
+int DigitalIO::configureDevice()
+{
+	if (deviceContext == nullptr || !deviceContext->isInitialized()) return -1;
+
+	deviceContext->writeRegister(deviceIdx, (uint32_t)DigitalIORegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0));
+
+	return deviceContext->getLastResult();
+}
+
+bool DigitalIO::updateSettings()
+{
+	return true;
+}
+
+void DigitalIO::startAcquisition()
+{
+}
+
+void DigitalIO::stopAcquisition()
+{
+	while (!frameArray.isEmpty())
+	{
+		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+		oni_destroy_frame(frameArray.removeAndReturn(0));
+	}
+}
+
+void DigitalIO::addFrame(oni_frame_t* frame)
+{
+	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+	frameArray.add(frame);
+}
+
+void DigitalIO::processFrames()
+{
+	while (!frameArray.isEmpty())
+	{
+		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+		oni_frame_t* frame = frameArray.removeAndReturn(0);
+
+		int16_t* dataPtr = (int16_t*)frame->data;
+
+		int dataOffset = 4;
+
+		int16_t portState = *(dataPtr + dataOffset);
+		int16_t buttonState = *(dataPtr + dataOffset + 1);
+		
+		oni_destroy_frame(frame);
+	}
+}
diff --git a/Source/Devices/DigitalIO.h b/Source/Devices/DigitalIO.h
new file mode 100644
index 0000000..241323c
--- /dev/null
+++ b/Source/Devices/DigitalIO.h
@@ -0,0 +1,96 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef __DIGITALIO_H__
+#define __DIGITALIO_H__
+
+#include "../OnixDevice.h"
+
+enum class DigitalIORegisters : uint32_t
+{
+	ENABLE = 0
+};
+
+enum class DigitalPortState : uint16_t
+{
+	Pin0 = 0x1,
+	Pin1 = 0x2,
+	Pin2 = 0x4,
+	Pin3 = 0x8,
+	Pin4 = 0x10,
+	Pin5 = 0x20,
+	Pin6 = 0x40,
+	Pin7 = 0x80
+};
+
+enum class BreakoutButtonState : uint16_t
+{
+	Moon = 0x1,
+	Triangle = 0x2,
+	X = 0x4,
+	Check = 0x8,
+	Circle = 0x10,
+	Square = 0x20,
+	Reserved0 = 0x40,
+	Reserved1 = 0x80,
+	PortDOn = 0x100,
+	PortCOn = 0x200,
+	PortBOn = 0x400,
+	PortAOn = 0x800
+};
+
+/*
+	Configures and streams data from an AnalogIO device on a Breakout Board
+*/
+class DigitalIO : public OnixDevice
+{
+public:
+	DigitalIO(String name, const oni_dev_idx_t, std::shared_ptr<Onix1> oni_ctx);
+
+	/** Configures the device so that it is ready to stream with default settings */
+	int configureDevice() override;
+
+	/** Update the settings of the device */
+	bool updateSettings() override;
+
+	/** Starts probe data streaming */
+	void startAcquisition() override;
+
+	/** Stops probe data streaming*/
+	void stopAcquisition() override;
+
+	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
+	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override {};
+
+	void addFrame(oni_frame_t*) override;
+
+	void processFrames() override;
+
+private:
+
+	Array<oni_frame_t*, CriticalSection, 10> frameArray;
+
+	JUCE_LEAK_DETECTOR(DigitalIO);
+};
+
+#endif
diff --git a/Source/Devices/PortController.cpp b/Source/Devices/PortController.cpp
index 8b1d637..6068c1c 100644
--- a/Source/Devices/PortController.cpp
+++ b/Source/Devices/PortController.cpp
@@ -160,6 +160,18 @@ PortName PortController::getPortFromIndex(oni_dev_idx_t index)
 	return index & (1 << 8) ? PortName::PortA : PortName::PortB;
 }
 
+Array<int> PortController::getUniqueOffsetsFromIndices(std::vector<int> indices)
+{
+	Array<int> offsets;
+
+	for (auto index : indices)
+	{
+		offsets.addIfNotAlreadyThere(index & 0b1100000000);
+	}
+
+	return offsets;
+}
+
 Array<PortName> PortController::getUniquePortsFromIndices(std::vector<int> indices)
 {
 	Array<PortName> ports;
diff --git a/Source/Devices/PortController.h b/Source/Devices/PortController.h
index 6fcffff..f26cc2a 100644
--- a/Source/Devices/PortController.h
+++ b/Source/Devices/PortController.h
@@ -118,6 +118,8 @@ class PortController : public OnixDevice
 
 	static PortName getPortFromIndex(oni_dev_idx_t index);
 
+	static Array<int> getUniqueOffsetsFromIndices(std::vector<int> indices);
+
 	static Array<PortName> getUniquePortsFromIndices(std::vector<int>);
 
 	/** Check if the port status changed and there is an error reported */
diff --git a/Source/OnixDevice.h b/Source/OnixDevice.h
index 7187122..90d298d 100644
--- a/Source/OnixDevice.h
+++ b/Source/OnixDevice.h
@@ -55,6 +55,7 @@ enum class OnixDeviceType {
 	HEARTBEAT,
 	HARPSYNCINPUT,
 	ANALOGIO,
+	DIGITALIO,
 };
 
 struct StreamInfo {
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 466267b..aae51b5 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -264,7 +264,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 
 			sources.push_back(harpSyncInput);
 			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
-			}
+		}
 		else if (device.id == ONIX_FMCANALOG1R3)
 		{
 			auto analogIO = std::make_shared<AnalogIO>("Analog IO", index, context);
@@ -280,6 +280,21 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			sources.push_back(analogIO);
 			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
+		else if (device.id == ONIX_BREAKDIG1R3)
+		{
+			auto digitalIO = std::make_shared<DigitalIO>("Digital IO", index, context);
+
+			int result = digitalIO->configureDevice();
+
+			if (result != 0)
+			{
+				LOGE("Device Idx: ", index, " Error enabling device stream.");
+				continue;
+			}
+
+			sources.push_back(digitalIO);
+			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
+		}
 	}
 
 	if (portA->configureDevice() != ONI_ESUCCESS) LOGE("Unable to configure Port A.");
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index 51ab18b..d7c46b4 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -97,7 +97,7 @@ void OnixSourceCanvas::addHub(String hubName, int offset)
 		devices.push_back(std::make_shared<Heartbeat>("Heartbeat", 0, nullptr));
 		devices.push_back(std::make_shared<OutputClock>("Output Clock", 5, nullptr));
 		devices.push_back(std::make_shared<AnalogIO>("Analog IO", 6, nullptr));
-		//devices.push_back(std::make_shared<DigitalIO>("Digital IO", 7, nullptr));
+		devices.push_back(std::make_shared<DigitalIO>("Digital IO", 7, nullptr));
 		devices.push_back(std::make_shared<MemoryMonitor>("Memory Monitor", 10, nullptr));
 		devices.push_back(std::make_shared<HarpSyncInput>("Harp Sync Input", 12, nullptr));
 	}
@@ -149,6 +149,11 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* tab, OnixDeviceVec
 			auto analogIOInterface = std::make_shared<AnalogIOInterface>(std::static_pointer_cast<AnalogIO>(device), editor, this);
 			addInterfaceToTab(getDeviceTabName(device), tab, analogIOInterface);
 		}
+		else if (device->type == OnixDeviceType::DIGITALIO)
+		{
+			auto digitalIOInterface = std::make_shared<DigitalIOInterface>(std::static_pointer_cast<DigitalIO>(device), editor, this);
+			addInterfaceToTab(getDeviceTabName(device), tab, digitalIOInterface);
+		}
 	}
 }
 
diff --git a/Source/UI/DigitalIOInterface.cpp b/Source/UI/DigitalIOInterface.cpp
new file mode 100644
index 0000000..4b89ad8
--- /dev/null
+++ b/Source/UI/DigitalIOInterface.cpp
@@ -0,0 +1,67 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright(C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software : you can redistribute it and /or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.If not, see < http://www.gnu.org/licenses/>.
+
+*/
+
+#include "DigitalIOInterface.h"
+
+DigitalIOInterface::DigitalIOInterface(std::shared_ptr<DigitalIO> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
+	SettingsInterface(d, e, c)
+{
+	device = d;
+
+	if (device != nullptr)
+	{
+		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->setTooltip("If disabled, the Digital IO device will not stream events during acquisition");
+		deviceEnableButton->setToggleState(true, dontSendNotification);
+		deviceEnableButton->addListener(this);
+		addAndMakeVisible(deviceEnableButton.get());
+		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
+	}
+
+	type = SettingsInterface::Type::DIGITALIO_SETTINGS_INTERFACE;
+}
+
+void DigitalIOInterface::buttonClicked(Button* button)
+{
+	if (button == deviceEnableButton.get())
+	{
+		device->setEnabled(deviceEnableButton->getToggleState());
+		device->configureDevice();
+		if (canvas->foundInputSource()) canvas->resetContext();
+
+		if (device->isEnabled())
+		{
+			deviceEnableButton->setLabel("ENABLED");
+		}
+		else
+		{
+			deviceEnableButton->setLabel("DISABLED");
+		}
+
+		CoreServices::updateSignalChain(editor);
+	}
+}
diff --git a/Source/UI/DigitalIOInterface.h b/Source/UI/DigitalIOInterface.h
new file mode 100644
index 0000000..670fcfa
--- /dev/null
+++ b/Source/UI/DigitalIOInterface.h
@@ -0,0 +1,68 @@
+/*
+	------------------------------------------------------------------
+
+	This file is part of the Open Ephys GUI
+	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#ifndef __DIGITALIOINTERFACE_H__
+#define __DIGITALIOINTERFACE_H__
+
+#include <VisualizerEditorHeaders.h>
+
+#include "../OnixSourceEditor.h"
+#include "../OnixSourceCanvas.h"
+
+#include "../Devices/DigitalIO.h"
+
+class DigitalIOInterface : public SettingsInterface,
+	public Button::Listener
+{
+public:
+	/** Constructor */
+	DigitalIOInterface(std::shared_ptr<DigitalIO> d, OnixSourceEditor* e, OnixSourceCanvas* c);
+
+	/** Disables buttons and starts animation if necessary */
+	void startAcquisition() override {};
+
+	/** Enables buttons and start animation if necessary */
+	void stopAcquisition() override {};
+
+	/** Save parameters to XML */
+	void saveParameters(XmlElement* xml) override {};
+
+	/** Load parameters from XML */
+	void loadParameters(XmlElement* xml) override {};
+
+	/** Updates the info string on the right-hand side of the component */
+	void updateInfoString() override {};
+
+	/** Listener methods*/
+	void buttonClicked(Button*) override;
+
+private:
+
+	std::shared_ptr<DigitalIO> device;
+
+	std::unique_ptr<UtilityButton> deviceEnableButton;
+
+	JUCE_LEAK_DETECTOR(DigitalIOInterface);
+};
+
+#endif
diff --git a/Source/UI/InterfaceList.h b/Source/UI/InterfaceList.h
index 3e45f17..2f73763 100644
--- a/Source/UI/InterfaceList.h
+++ b/Source/UI/InterfaceList.h
@@ -6,3 +6,4 @@
 #include "HeartbeatInterface.h"
 #include "HarpSyncInputInterface.h"
 #include "AnalogIOInterface.h"
+#include "DigitalIOInterface.h"
diff --git a/Source/UI/SettingsInterface.h b/Source/UI/SettingsInterface.h
index d0959f1..47a525b 100644
--- a/Source/UI/SettingsInterface.h
+++ b/Source/UI/SettingsInterface.h
@@ -50,6 +50,7 @@ class SettingsInterface : public Component
         HEARTBEAT_SETTINGS_INTERFACE,
         HARPSYNCINPUT_SETTINGS_INTERFACE,
         ANALOGIO_SETTINGS_INTERFACE,
+        DIGITALIO_SETTINGS_INTERFACE,
         UNKNOWN_SETTINGS_INTERFACE
     };
 

From d087f18526fb603ffa1821a4d905a8f5a4cd0c6b Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Mon, 24 Mar 2025 15:18:18 -0400
Subject: [PATCH 17/25] Save acquisition clock instead of hub clock for
 timestamps

---
 Source/Devices/AnalogIO.cpp      | 2 +-
 Source/Devices/Bno055.cpp        | 2 +-
 Source/Devices/DigitalIO.cpp     | 1 +
 Source/Devices/HarpSyncInput.cpp | 2 +-
 Source/Devices/MemoryMonitor.cpp | 3 ++-
 Source/Devices/Neuropixels2e.cpp | 1 +
 Source/Devices/Neuropixels_1.cpp | 8 +-------
 7 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/Source/Devices/AnalogIO.cpp b/Source/Devices/AnalogIO.cpp
index 94c35d2..f127382 100644
--- a/Source/Devices/AnalogIO.cpp
+++ b/Source/Devices/AnalogIO.cpp
@@ -166,7 +166,7 @@ void AnalogIO::processFrames()
 
 			currentFrame++;
 
-			timestamps[currentFrame] = *(uint64_t*)frame->data;
+			timestamps[currentFrame] = frame->time;
 			sampleNumbers[currentFrame] = sampleNumber++;
 		}
 
diff --git a/Source/Devices/Bno055.cpp b/Source/Devices/Bno055.cpp
index 14662d8..e584d9a 100644
--- a/Source/Devices/Bno055.cpp
+++ b/Source/Devices/Bno055.cpp
@@ -153,7 +153,7 @@ void Bno055::processFrames()
 
 		int16_t* dataPtr = (int16_t*)frame->data;
 
-		bnoTimestamps[currentFrame] = *(uint64_t*)frame->data;
+		bnoTimestamps[currentFrame] = frame->time;
 
 		int dataOffset = 4;
 
diff --git a/Source/Devices/DigitalIO.cpp b/Source/Devices/DigitalIO.cpp
index 5befa99..36e829a 100644
--- a/Source/Devices/DigitalIO.cpp
+++ b/Source/Devices/DigitalIO.cpp
@@ -69,6 +69,7 @@ void DigitalIO::processFrames()
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 		int16_t* dataPtr = (int16_t*)frame->data;
+		uint64_t timestamp = frame->time;
 
 		int dataOffset = 4;
 
diff --git a/Source/Devices/HarpSyncInput.cpp b/Source/Devices/HarpSyncInput.cpp
index f04e7cc..42affd1 100644
--- a/Source/Devices/HarpSyncInput.cpp
+++ b/Source/Devices/HarpSyncInput.cpp
@@ -100,7 +100,7 @@ void HarpSyncInput::processFrames()
 
 		uint32_t* dataPtr = (uint32_t*)frame->data;
 
-		timestamps[currentFrame] = *(uint64_t*)frame->data;
+		timestamps[currentFrame] = frame->time;
 
 		harpTimeSamples[currentFrame] = *(dataPtr + 2) + 1;
 
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index 33b140e..af0af50 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -166,8 +166,9 @@ void MemoryMonitor::processFrames()
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
 		uint32_t* dataPtr = (uint32_t*)frame->data;
+		uint64_t timestamp = frame->time;
 
-		timestamps[currentFrame] = *(uint64_t*)frame->data;
+		timestamps[currentFrame] = *(uint64_t*)frame->time;
 
 		percentUsedSamples[currentFrame] = 100.0f * float(*(dataPtr + 2)) / totalMemory;
 
diff --git a/Source/Devices/Neuropixels2e.cpp b/Source/Devices/Neuropixels2e.cpp
index 01d5531..5af6b4d 100644
--- a/Source/Devices/Neuropixels2e.cpp
+++ b/Source/Devices/Neuropixels2e.cpp
@@ -229,6 +229,7 @@ void Neuropixels2e::processFrames()
 		dataPtr = (uint16_t*)frame->data;
 		uint16_t probeIndex = *(dataPtr + 4);
 		uint16_t* amplifierData = dataPtr + 6;
+		uint64_t timestamp = frame->time;
 
 		if (m_numProbes == 1)
 		{
diff --git a/Source/Devices/Neuropixels_1.cpp b/Source/Devices/Neuropixels_1.cpp
index 6f10d7e..fd3b22e 100644
--- a/Source/Devices/Neuropixels_1.cpp
+++ b/Source/Devices/Neuropixels_1.cpp
@@ -428,13 +428,7 @@ void Neuropixels_1::processFrames()
 
 		uint16_t* dataPtr = (uint16_t*)frame->data;
 
-		auto dataclock = (unsigned char*)frame->data + 936;
-		uint64 hubClock = ((uint64_t)(*(uint16_t*)dataclock) << 48) |
-			((uint64_t)(*(uint16_t*)(dataclock + 2)) << 32) |
-			((uint64_t)(*(uint16_t*)(dataclock + 4)) << 16) |
-			((uint64_t)(*(uint16_t*)(dataclock + 6)) << 0);
-		int64_t clockCounter = hubClock;
-		apTimestamps[superFrameCount] = clockCounter;
+		apTimestamps[superFrameCount] = frame->time;
 		apSampleNumbers[superFrameCount] = apSampleNumber++;
 
 		for (int i = 0; i < framesPerSuperFrame; i++)

From 96203f788d536042bc3c4f106f67230139085d11 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Mon, 24 Mar 2025 17:11:02 -0400
Subject: [PATCH 18/25] Removed Heartbeat and Memory Monitor settings
 interfaces - These devices are hard-coded with default settings and should
 not be changed - Reformatted how found vs. selected maps are compared to
 provide more flexibility for these "missing" interfaces

---
 Source/Devices/Heartbeat.cpp         |  20 ++---
 Source/Devices/Heartbeat.h           |   8 +-
 Source/Devices/MemoryMonitor.cpp     |  81 +----------------
 Source/Devices/MemoryMonitor.h       |  27 +-----
 Source/Devices/PortController.cpp    |  24 ++++-
 Source/Devices/PortController.h      |   4 +
 Source/OnixSource.cpp                |  40 ++++++---
 Source/OnixSource.h                  |  12 +--
 Source/OnixSourceCanvas.cpp          |  89 +++++++++----------
 Source/OnixSourceCanvas.h            |   4 +-
 Source/OnixSourceEditor.cpp          |  21 ++++-
 Source/OnixSourceEditor.h            |   2 +
 Source/UI/HeartbeatInterface.cpp     | 126 ---------------------------
 Source/UI/HeartbeatInterface.h       |  74 ----------------
 Source/UI/InterfaceList.h            |   2 -
 Source/UI/MemoryMonitorInterface.cpp | 126 ---------------------------
 Source/UI/MemoryMonitorInterface.h   |  74 ----------------
 17 files changed, 137 insertions(+), 597 deletions(-)
 delete mode 100644 Source/UI/HeartbeatInterface.cpp
 delete mode 100644 Source/UI/HeartbeatInterface.h
 delete mode 100644 Source/UI/MemoryMonitorInterface.cpp
 delete mode 100644 Source/UI/MemoryMonitorInterface.h

diff --git a/Source/Devices/Heartbeat.cpp b/Source/Devices/Heartbeat.cpp
index f7a9a2c..4275be2 100644
--- a/Source/Devices/Heartbeat.cpp
+++ b/Source/Devices/Heartbeat.cpp
@@ -30,27 +30,21 @@ Heartbeat::Heartbeat(String name, const oni_dev_idx_t deviceIdx_, std::shared_pt
 
 int Heartbeat::configureDevice()
 {
+	setEnabled(true);
+
 	if (deviceContext == nullptr || !deviceContext->isInitialized()) return -1;
 
-	deviceContext->writeRegister(deviceIdx, (uint32_t)HeartbeatRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0));
+	deviceContext->writeRegister(deviceIdx, (uint32_t)HeartbeatRegisters::ENABLE, 1);
 
 	return deviceContext->getLastResult();
 }
 
 bool Heartbeat::updateSettings()
-{
-	writeBeatsPerSecondRegister();
-	return deviceContext->getLastResult() == ONI_ESUCCESS;
-}
-
-void Heartbeat::setBeatsPerSecond(uint32_t beats, bool writeToRegister)
-{
-	beatsPerSecond = beats;
-	if (writeToRegister) writeBeatsPerSecondRegister();
-}
-
-void Heartbeat::writeBeatsPerSecondRegister()
 {
 	oni_reg_val_t clkHz = deviceContext->readRegister(deviceIdx, (oni_reg_addr_t)HeartbeatRegisters::CLK_HZ);
 	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)HeartbeatRegisters::CLK_DIV, clkHz / beatsPerSecond);
+
+	if (deviceContext->getLastResult() == ONI_EREADONLY) return true; // NB: Ignore read-only errors
+
+	return deviceContext->getLastResult() == ONI_ESUCCESS;
 }
diff --git a/Source/Devices/Heartbeat.h b/Source/Devices/Heartbeat.h
index 6a3a1bc..1f2b232 100644
--- a/Source/Devices/Heartbeat.h
+++ b/Source/Devices/Heartbeat.h
@@ -60,15 +60,9 @@ class Heartbeat : public OnixDevice
 
 	void processFrames() override {};
 
-	uint32_t getBeatsPerSecond() const { return beatsPerSecond; }
-
-	void setBeatsPerSecond(uint32_t beats, bool writeToRegister = false);
-
 private:
 
-	uint32_t beatsPerSecond = 100;
-
-	void writeBeatsPerSecondRegister();
+	const uint32_t beatsPerSecond = 100;
 
 	JUCE_LEAK_DETECTOR(Heartbeat);
 };
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index af0af50..cda95ff 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -58,37 +58,15 @@ void MemoryMonitorUsage::stopAcquisition()
 MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> oni_ctx)
 	: OnixDevice(name, OnixDeviceType::MEMORYMONITOR, deviceIdx_, oni_ctx)
 {
-	StreamInfo percentUsedStream;
-	percentUsedStream.name = name + "-PercentUsed";
-	percentUsedStream.description = "Percent of available memory that is currently used";
-	percentUsedStream.identifier = "onix-memorymonitor.data.percentused";
-	percentUsedStream.numChannels = 1;
-	percentUsedStream.sampleRate = samplesPerSecond;
-	percentUsedStream.channelPrefix = "Percent";
-	percentUsedStream.bitVolts = 1.0f;
-	percentUsedStream.channelType = ContinuousChannel::Type::AUX;
-	streamInfos.add(percentUsedStream);
-
-	StreamInfo bytesUsedStream;
-	bytesUsedStream.name = name + "-BytesUsed";
-	bytesUsedStream.description = "Number of bytes that are currently used";
-	bytesUsedStream.identifier = "onix-memorymonitor.data.bytesused";
-	bytesUsedStream.numChannels = 1;
-	bytesUsedStream.sampleRate = samplesPerSecond;
-	bytesUsedStream.channelPrefix = "Bytes";
-	bytesUsedStream.bitVolts = 1.0f;
-	bytesUsedStream.channelType = ContinuousChannel::Type::AUX;
-	streamInfos.add(bytesUsedStream);
-
-	for (int i = 0; i < numFrames; i++)
-		eventCodes[i] = 0;
 }
 
 int MemoryMonitor::configureDevice()
 {
+	setEnabled(true);
+
 	if (deviceContext == nullptr || !deviceContext->isInitialized()) return -1;
 
-	deviceContext->writeRegister(deviceIdx, (uint32_t)MemoryMonitorRegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0));
+	deviceContext->writeRegister(deviceIdx, (uint32_t)MemoryMonitorRegisters::ENABLE, 1);
 	if (deviceContext->getLastResult() != ONI_ESUCCESS) return deviceContext->getLastResult();
 
 	totalMemory = deviceContext->readRegister(deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::TOTAL_MEM);
@@ -107,8 +85,6 @@ bool MemoryMonitor::updateSettings()
 
 void MemoryMonitor::startAcquisition()
 {
-	currentFrame = 0;
-	sampleNumber = 0;
 	lastPercentUsedValue = 0.0f;
 }
 
@@ -119,9 +95,6 @@ void MemoryMonitor::stopAcquisition()
 		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
 		oni_destroy_frame(frameArray.removeAndReturn(0));
 	}
-
-	currentFrame = 0;
-	sampleNumber = 0;
 }
 
 void MemoryMonitor::addFrame(oni_frame_t* frame)
@@ -130,29 +103,6 @@ void MemoryMonitor::addFrame(oni_frame_t* frame)
 	frameArray.add(frame);
 }
 
-void MemoryMonitor::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
-{
-	for (StreamInfo streamInfo : streamInfos)
-	{
-		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
-
-		if (streamInfo.channelPrefix.equalsIgnoreCase("Percent"))
-			percentUsedBuffer = sourceBuffers.getLast();
-		else if (streamInfo.channelPrefix.equalsIgnoreCase("Bytes"))
-			bytesUsedBuffer = sourceBuffers.getLast();
-	}
-}
-
-void MemoryMonitor::setSamplesPerSecond(uint32_t samplesPerSecond_) 
-{
-	samplesPerSecond = samplesPerSecond_;
-
-	for (const auto& stream : streamInfos)
-	{
-		streamInfos.getReference(0).sampleRate = samplesPerSecond;
-	}
-}
-
 float MemoryMonitor::getLastPercentUsedValue()
 {
 	return lastPercentUsedValue;
@@ -168,31 +118,8 @@ void MemoryMonitor::processFrames()
 		uint32_t* dataPtr = (uint32_t*)frame->data;
 		uint64_t timestamp = frame->time;
 
-		timestamps[currentFrame] = *(uint64_t*)frame->time;
-
-		percentUsedSamples[currentFrame] = 100.0f * float(*(dataPtr + 2)) / totalMemory;
-
-		lastPercentUsedValue = percentUsedSamples[currentFrame];
-
-		bytesUsedSamples[currentFrame] = float(*(dataPtr + 2)) * 4.0f;
+		lastPercentUsedValue = 100.0f * float(*(dataPtr + 2)) / totalMemory;
 
 		oni_destroy_frame(frame);
-
-		sampleNumbers[currentFrame] = sampleNumber++;
-
-		currentFrame++;
-
-		if (currentFrame >= numFrames)
-		{
-			shouldAddToBuffer = true;
-			currentFrame = 0;
-		}
-
-		if (shouldAddToBuffer)
-		{
-			shouldAddToBuffer = false;
-			percentUsedBuffer->addToBuffer(percentUsedSamples, sampleNumbers, timestamps, eventCodes, numFrames);
-			bytesUsedBuffer->addToBuffer(bytesUsedSamples, sampleNumbers, timestamps, eventCodes, numFrames);
-		}
 	}
 }
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index c1150fd..23026cc 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -55,45 +55,24 @@ class MemoryMonitor : public OnixDevice
 	void stopAcquisition() override;
 
 	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
-	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override;
+	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override {};
 
 	void addFrame(oni_frame_t*) override;
 
 	void processFrames() override;
 
-	uint32_t getSamplesPerSecond() const { return samplesPerSecond; }
-
-	void setSamplesPerSecond(uint32_t samplesPerSecond_);
-
 	float getLastPercentUsedValue();
 
 private:
 
-	DataBuffer* percentUsedBuffer;
-	DataBuffer* bytesUsedBuffer;
-
-	static const int numFrames = 2;
-
-	Array<oni_frame_t*, CriticalSection, numFrames> frameArray;
+	Array<oni_frame_t*, CriticalSection, 10> frameArray;
 
-	unsigned short currentFrame = 0;
-	int sampleNumber = 0;
-	
 	/** The frequency at which memory use is recorded in Hz. */
-	uint32_t samplesPerSecond = 10;
+	const uint32_t samplesPerSecond = 10;
 
 	/** The total amount of memory, in 32-bit words, on the hardware that is available for data buffering*/
 	uint32_t totalMemory;
 
-	bool shouldAddToBuffer = false;
-
-	float percentUsedSamples[numFrames];
-	float bytesUsedSamples[numFrames];
-
-	double timestamps[numFrames];
-	int64 sampleNumbers[numFrames];
-	uint64 eventCodes[numFrames];
-
 	std::atomic<float> lastPercentUsedValue = 0.0f;
 
 	JUCE_LEAK_DETECTOR(MemoryMonitor);
diff --git a/Source/Devices/PortController.cpp b/Source/Devices/PortController.cpp
index 6068c1c..b92352e 100644
--- a/Source/Devices/PortController.cpp
+++ b/Source/Devices/PortController.cpp
@@ -95,6 +95,21 @@ DiscoveryParameters PortController::getHeadstageDiscoveryParameters(String heads
 	return DiscoveryParameters();
 }
 
+String PortController::getPortName(int offset)
+{
+	switch (offset)
+	{
+	case 0:
+		return "";
+	case 256: // NB: Port A
+		return "Port A";
+	case 512: // NB: Port B
+		return "Port B";
+	default:
+		return "";
+	}
+}
+
 bool PortController::configureVoltage(float voltage)
 {
 	if (voltage == defaultVoltage)
@@ -140,7 +155,7 @@ void PortController::setVoltage(float voltage)
 	deviceContext->writeRegister((oni_dev_idx_t)port, (oni_reg_addr_t)PortControllerRegister::PORTVOLTAGE, 0);
 	if (deviceContext->getLastResult() != ONI_ESUCCESS) return;
 	sleep_for(std::chrono::milliseconds(300));
-	
+
 	deviceContext->writeRegister((oni_dev_idx_t)port, (oni_reg_addr_t)PortControllerRegister::PORTVOLTAGE, voltage * 10);
 	if (deviceContext->getLastResult() != ONI_ESUCCESS) return;
 	sleep_for(std::chrono::milliseconds(500));
@@ -160,13 +175,18 @@ PortName PortController::getPortFromIndex(oni_dev_idx_t index)
 	return index & (1 << 8) ? PortName::PortA : PortName::PortB;
 }
 
+int PortController::getOffsetFromIndex(oni_dev_idx_t index)
+{
+	return index & 0b1100000000;
+}
+
 Array<int> PortController::getUniqueOffsetsFromIndices(std::vector<int> indices)
 {
 	Array<int> offsets;
 
 	for (auto index : indices)
 	{
-		offsets.addIfNotAlreadyThere(index & 0b1100000000);
+		offsets.addIfNotAlreadyThere(getOffsetFromIndex(index));
 	}
 
 	return offsets;
diff --git a/Source/Devices/PortController.h b/Source/Devices/PortController.h
index f26cc2a..9de3c7a 100644
--- a/Source/Devices/PortController.h
+++ b/Source/Devices/PortController.h
@@ -114,10 +114,14 @@ class PortController : public OnixDevice
 
 	static int getPortOffset(PortName port) { return (uint32_t)port << 8; }
 
+	static String getPortName(int offset);
+
 	static String getPortName(PortName port) { return port == PortName::PortA ? "Port A" : "Port B"; }
 
 	static PortName getPortFromIndex(oni_dev_idx_t index);
 
+	static int getOffsetFromIndex(oni_dev_idx_t index);
+
 	static Array<int> getUniqueOffsetsFromIndices(std::vector<int> indices);
 
 	static Array<PortName> getUniquePortsFromIndices(std::vector<int>);
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index aae51b5..14bead9 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -158,7 +158,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(np1);
-			headstages.insert({ PortController::getPortFromIndex(index), NEUROPIXELSV1F_HEADSTAGE_NAME });
+			headstages.insert({ PortController::getOffsetFromIndex(index), NEUROPIXELSV1F_HEADSTAGE_NAME });
 
 			npxProbeIdx++;
 		}
@@ -218,7 +218,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(memoryMonitor);
-			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
+			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_FMCCLKOUT1R3)
 		{
@@ -233,7 +233,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(outputClock);
-			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
+			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_HEARTBEAT)
 		{
@@ -248,7 +248,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(heartbeat);
-			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
+			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_HARPSYNCINPUT)
 		{
@@ -263,7 +263,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(harpSyncInput);
-			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
+			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_FMCANALOG1R3)
 		{
@@ -278,7 +278,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(analogIO);
-			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
+			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_BREAKDIG1R3)
 		{
@@ -293,7 +293,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 			}
 
 			sources.push_back(digitalIO);
-			headstages.insert({ PortController::getPortFromIndex(index), BREAKOUT_BOARD_NAME });
+			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 	}
 
@@ -340,24 +340,40 @@ OnixDeviceVector OnixSource::getDataSourcesFromPort(PortName port) const
 	return devices;
 }
 
-std::map<int, OnixDeviceType> OnixSource::createDeviceMap(OnixDeviceVector devices)
+OnixDeviceVector OnixSource::getDataSourcesFromOffset(int offset) const
+{
+	OnixDeviceVector devices{};
+	offset = PortController::getOffsetFromIndex(offset);
+
+	for (const auto& source : sources)
+	{
+		if (PortController::getOffsetFromIndex(source->getDeviceIdx()) == offset)
+			devices.push_back(source);
+	}
+
+	return devices;
+}
+
+std::map<int, OnixDeviceType> OnixSource::createDeviceMap(OnixDeviceVector devices, bool filterDevices)
 {
 	std::map<int, OnixDeviceType> deviceMap;
 
 	for (const auto& device : devices)
 	{
+		if (filterDevices && (device->type == OnixDeviceType::HEARTBEAT || device->type == OnixDeviceType::MEMORYMONITOR)) continue;
+
 		deviceMap.insert({ device->getDeviceIdx(), device->type });
 	}
 
 	return deviceMap;
 }
 
-std::map<int, OnixDeviceType> OnixSource::createDeviceMap()
+std::map<int, OnixDeviceType> OnixSource::createDeviceMap(bool filterDevices) const
 {
-	return createDeviceMap(getDataSources());
+	return createDeviceMap(getDataSources(), filterDevices);
 }
 
-std::map<PortName, String> OnixSource::getHeadstageMap()
+std::map<int, String> OnixSource::getHeadstageMap()
 {
 	return headstages;
 }
@@ -550,7 +566,7 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 bool OnixSource::isDevicesReady()
 {
 	auto tabMap = editor->createTabMapFromCanvas();
-	auto sourceMap = createDeviceMap(sources);
+	auto sourceMap = createDeviceMap(true);
 
 	return tabMap == sourceMap;
 }
diff --git a/Source/OnixSource.h b/Source/OnixSource.h
index 821f2e1..b2d55cb 100644
--- a/Source/OnixSource.h
+++ b/Source/OnixSource.h
@@ -96,11 +96,13 @@ class OnixSource : public DataThread
 
 	OnixDeviceVector getDataSourcesFromPort(PortName port) const;
 
-	std::map<int, OnixDeviceType> createDeviceMap(OnixDeviceVector);
+	OnixDeviceVector getDataSourcesFromOffset(int offset) const;
 
-	std::map<int, OnixDeviceType> createDeviceMap();
+	static std::map<int, OnixDeviceType> createDeviceMap(OnixDeviceVector, bool filterDevices = false);
 
-	std::map<PortName, String> getHeadstageMap();
+	std::map<int, OnixDeviceType> createDeviceMap(bool filterDevices = false) const;
+
+	std::map<int, String> getHeadstageMap();
 
 	void updateSourceBuffers();
 
@@ -117,8 +119,8 @@ class OnixSource : public DataThread
 	/** Available data sources */
 	OnixDeviceVector sources;
 
-	/** Available headstages */
-	std::map<PortName, String> headstages;
+	/** Available headstages, indexed by their offset value */
+	std::map<int, String> headstages;
 
 	/** Pointer to the editor */
 	OnixSourceEditor* editor;
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index d7c46b4..da0502c 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -94,11 +94,9 @@ void OnixSourceCanvas::addHub(String hubName, int offset)
 	{
 		tab = addTopLevelTab(hubName, 0);
 
-		devices.push_back(std::make_shared<Heartbeat>("Heartbeat", 0, nullptr));
 		devices.push_back(std::make_shared<OutputClock>("Output Clock", 5, nullptr));
 		devices.push_back(std::make_shared<AnalogIO>("Analog IO", 6, nullptr));
 		devices.push_back(std::make_shared<DigitalIO>("Digital IO", 7, nullptr));
-		devices.push_back(std::make_shared<MemoryMonitor>("Memory Monitor", 10, nullptr));
 		devices.push_back(std::make_shared<HarpSyncInput>("Harp Sync Input", 12, nullptr));
 	}
 
@@ -124,21 +122,11 @@ void OnixSourceCanvas::populateSourceTabs(CustomTabComponent* tab, OnixDeviceVec
 			auto bno055Interface = std::make_shared<Bno055Interface>(std::static_pointer_cast<Bno055>(device), editor, this);
 			addInterfaceToTab(getDeviceTabName(device), tab, bno055Interface);
 		}
-		else if (device->type == OnixDeviceType::MEMORYMONITOR)
-		{
-			auto memoryMonitorInterface = std::make_shared<MemoryMonitorInterface>(std::static_pointer_cast<MemoryMonitor>(device), editor, this);
-			addInterfaceToTab(getDeviceTabName(device), tab, memoryMonitorInterface);
-		}
 		else if (device->type == OnixDeviceType::OUTPUTCLOCK)
 		{
 			auto outputClockInterface = std::make_shared<OutputClockInterface>(std::static_pointer_cast<OutputClock>(device), editor, this);
 			addInterfaceToTab(getDeviceTabName(device), tab, outputClockInterface);
 		}
-		else if (device->type == OnixDeviceType::HEARTBEAT)
-		{
-			auto heartbeatInterface = std::make_shared<HeartbeatInterface>(std::static_pointer_cast<Heartbeat>(device), editor, this);
-			addInterfaceToTab(getDeviceTabName(device), tab, heartbeatInterface);
-		}
 		else if (device->type == OnixDeviceType::HARPSYNCINPUT)
 		{
 			auto harpSyncInputInterface = std::make_shared<HarpSyncInputInterface>(std::static_pointer_cast<HarpSyncInput>(device), editor, this);
@@ -285,11 +273,11 @@ std::map<int, OnixDeviceType> OnixSourceCanvas::createSelectedMap(std::vector<st
 	return tabMap;
 }
 
-void OnixSourceCanvas::askKeepRemove(PortName port)
+void OnixSourceCanvas::askKeepRemove(int offset)
 {
-	String selectedHeadstage = editor->getHeadstageSelected(port);
+	String selectedHeadstage = editor->getHeadstageSelected(offset);
 
-	String msg = "Headstage " + selectedHeadstage + " is selected on " + PortController::getPortName(port) + ", but was not discovered there.\n\n";
+	String msg = "Headstage " + selectedHeadstage + " is selected on " + PortController::getPortName(offset) + ", but was not discovered there.\n\n";
 	msg += "Select one of the options below to continue:\n";
 	msg += " [Keep Current] to keep " + selectedHeadstage + " selected.\n";
 	msg += " [Remove] to remove " + selectedHeadstage + ".\n - Note: this will delete any settings that were modified.";
@@ -306,7 +294,7 @@ void OnixSourceCanvas::askKeepRemove(PortName port)
 	switch (result)
 	{
 	case 0: // Remove
-		removeTabs(port);
+		removeTabs(PortController::getPortFromIndex(offset));
 		break;
 	case 1: // Keep Current
 		break;
@@ -315,12 +303,12 @@ void OnixSourceCanvas::askKeepRemove(PortName port)
 	}
 }
 
-void OnixSourceCanvas::askKeepUpdate(PortName port, String foundHeadstage, OnixDeviceVector devices)
+void OnixSourceCanvas::askKeepUpdate(int offset, String foundHeadstage, OnixDeviceVector devices)
 {
-	String selectedHeadstage = editor->getHeadstageSelected(port);
+	String selectedHeadstage = editor->getHeadstageSelected(offset);
 
-	String msg = "Headstage " + selectedHeadstage + " is selected on " + PortController::getPortName(port) + ". ";
-	msg += "However, headstage " + foundHeadstage + " was found on " + PortController::getPortName(port) + ". \n\n";
+	String msg = "Headstage " + selectedHeadstage + " is selected on " + PortController::getPortName(offset) + ". ";
+	msg += "However, headstage " + foundHeadstage + " was found on " + PortController::getPortName(offset) + ". \n\n";
 	msg += "Select one of the options below to continue:\n";
 	msg += " [Keep Current] to keep " + selectedHeadstage + " selected.\n";
 	msg += " [Update] to change the selected headstage to " + foundHeadstage + ".\n - Note: this will delete any settings that were modified.";
@@ -337,13 +325,14 @@ void OnixSourceCanvas::askKeepUpdate(PortName port, String foundHeadstage, OnixD
 	switch (result)
 	{
 	case 0: // Update
+	{
+		PortName port = PortController::getPortFromIndex(offset);
 		removeTabs(port);
 
-		{
-			CustomTabComponent* tab = addTopLevelTab(getTopLevelTabName(port, foundHeadstage), (int)port);
-			populateSourceTabs(tab, devices);
-		}
-		break;
+		CustomTabComponent* tab = addTopLevelTab(getTopLevelTabName(port, foundHeadstage), (int)port);
+		populateSourceTabs(tab, devices);
+	}
+	break;
 	case 1: // Keep Current
 		break;
 	default:
@@ -354,7 +343,7 @@ void OnixSourceCanvas::askKeepUpdate(PortName port, String foundHeadstage, OnixD
 void OnixSourceCanvas::refreshTabs()
 {
 	auto selectedMap = createSelectedMap(settingsInterfaces);
-	auto foundMap = source->createDeviceMap();
+	auto foundMap = source->createDeviceMap(true);
 
 	if (selectedMap != foundMap)
 	{
@@ -363,8 +352,8 @@ void OnixSourceCanvas::refreshTabs()
 		for (const auto& [key, _] : selectedMap) { selectedIndices.push_back(key); }
 		for (const auto& [key, _] : foundMap) { foundIndices.push_back(key); }
 
-		auto selectedPorts = PortController::getUniquePortsFromIndices(selectedIndices);
-		auto foundPorts = PortController::getUniquePortsFromIndices(foundIndices);
+		auto selectedOffsets = PortController::getUniqueOffsetsFromIndices(selectedIndices);
+		auto foundOffsets = PortController::getUniqueOffsetsFromIndices(foundIndices);
 
 		if (foundIndices.size() == 0) // NB: No devices found, inform the user if they were expecting to find something
 		{
@@ -381,16 +370,16 @@ void OnixSourceCanvas::refreshTabs()
 		}
 		else if (selectedIndices.size() == 0) // NB: No headstages selected, add all found headstages
 		{
-			for (auto& [port, headstageName] : source->getHeadstageMap())
+			for (auto& [offset, headstageName] : source->getHeadstageMap())
 			{
-				addHub(headstageName, PortController::getPortOffset(port));
+				addHub(headstageName, offset);
 			}
 		}
-		else if (selectedPorts.size() == foundPorts.size()) // NB: Same number of ports selected and found
+		else if (selectedOffsets.size() == foundOffsets.size()) // NB: Same number of ports selected and found
 		{
 			auto headstages = source->getHeadstageMap();
 
-			if (selectedPorts.size() == 1)
+			if (selectedOffsets.size() == 1)
 			{
 				if (headstages.size() != 1)
 				{
@@ -398,24 +387,24 @@ void OnixSourceCanvas::refreshTabs()
 					return;
 				}
 
-				if (selectedPorts[0] == foundPorts[0]) // NB: Selected headstage is different from the found headstage on the same port
+				if (selectedOffsets[0] == foundOffsets[0]) // NB: Selected headstage is different from the found headstage on the same port
 				{
-					askKeepUpdate(selectedPorts[0], headstages[foundPorts[0]], source->getDataSources());
+					askKeepUpdate(selectedOffsets[0], headstages[foundOffsets[0]], source->getDataSources());
 				}
 				else // NB: Selected headstage on one port is not found, and the found headstage is not selected on the other port
 				{
-					askKeepRemove(selectedPorts[0]);
+					askKeepRemove(selectedOffsets[0]);
 
-					addHub(headstages[foundPorts[0]], PortController::getPortOffset(foundPorts[0]));
+					addHub(headstages[foundOffsets[0]], foundOffsets[0]);
 				}
 			}
 			else // NB: Two headstages are selected on different ports, and at least one of those headstages does not match the found headstages
 			{
-				for (auto port : foundPorts)
+				for (auto offset : foundOffsets)
 				{
-					if (headstages[port] != editor->getHeadstageSelected(port))
+					if (headstages[offset] != editor->getHeadstageSelected(offset))
 					{
-						askKeepUpdate(port, headstages[port], source->getDataSourcesFromPort(port));
+						askKeepUpdate(offset, headstages[offset], source->getDataSourcesFromOffset(offset));
 					}
 				}
 			}
@@ -424,37 +413,37 @@ void OnixSourceCanvas::refreshTabs()
 		{
 			auto headstages = source->getHeadstageMap();
 
-			if (selectedPorts.size() > foundPorts.size()) // NB: More headstages selected than found
+			if (selectedOffsets.size() > foundOffsets.size()) // NB: More headstages selected than found
 			{
-				for (auto port : selectedPorts)
+				for (auto offset : selectedOffsets)
 				{
-					if (port == foundPorts[0])
+					if (offset == foundOffsets[0])
 					{
-						if (headstages[port] != editor->getHeadstageSelected(port))
+						if (headstages[offset] != editor->getHeadstageSelected(offset))
 						{
-							askKeepUpdate(port, headstages[port], source->getDataSourcesFromPort(port));
+							askKeepUpdate(offset, headstages[offset], source->getDataSourcesFromOffset(offset));
 						}
 					}
 					else
 					{
-						askKeepRemove(port);
+						askKeepRemove(offset);
 					}
 				}
 			}
 			else // NB: More headstages found than selected
 			{
-				for (auto port : foundPorts)
+				for (auto offset : foundOffsets)
 				{
-					if (port == selectedPorts[0])
+					if (offset == selectedOffsets[0])
 					{
-						if (headstages[port] != editor->getHeadstageSelected(port))
+						if (headstages[offset] != editor->getHeadstageSelected(offset))
 						{
-							askKeepUpdate(port, headstages[port], source->getDataSourcesFromPort(port));
+							askKeepUpdate(offset, headstages[offset], source->getDataSourcesFromOffset(offset));
 						}
 					}
 					else
 					{
-						addHub(headstages[port], PortController::getPortOffset(port));
+						addHub(headstages[offset], offset);
 					}
 				}
 			}
diff --git a/Source/OnixSourceCanvas.h b/Source/OnixSourceCanvas.h
index de2e113..bb15e12 100644
--- a/Source/OnixSourceCanvas.h
+++ b/Source/OnixSourceCanvas.h
@@ -170,13 +170,13 @@ class OnixSourceCanvas : public Visualizer
 		Create an alert window that asks whether to keep the selected headstage on the given port,
 		or to remove it since the hardware was not found
 	*/
-	void askKeepRemove(PortName port);
+	void askKeepRemove(int offset);
 
 	/**
 		Create an alert window that asks whether to keep the selected headstage on the given port,
 		or to update to the headstage that was found
 	*/
-	void askKeepUpdate(PortName port, String foundHeadstage, OnixDeviceVector devices);
+	void askKeepUpdate(int offset, String foundHeadstage, OnixDeviceVector devices);
 
 	JUCE_LEAK_DETECTOR(OnixSourceCanvas);
 };
diff --git a/Source/OnixSourceEditor.cpp b/Source/OnixSourceEditor.cpp
index 431c8d1..bbc59b3 100644
--- a/Source/OnixSourceEditor.cpp
+++ b/Source/OnixSourceEditor.cpp
@@ -237,7 +237,7 @@ void OnixSourceEditor::comboBoxChanged(ComboBox* cb)
 
 void OnixSourceEditor::updateComboBox(ComboBox* cb)
 {
-	auto deviceMap = source->createDeviceMap(source->getDataSources());
+	auto deviceMap = source->createDeviceMap();
 	auto tabMap = canvas->createSelectedMap(canvas->settingsInterfaces);
 	std::vector<int> deviceIndices;
 	std::vector<int> tabIndices;
@@ -372,14 +372,29 @@ bool OnixSourceEditor::isHeadstageSelected(PortName port)
 	}
 }
 
+String OnixSourceEditor::getHeadstageSelected(int offset)
+{
+	switch (offset)
+	{
+	case 0:
+		return "Breakout Board";
+	case 256: // NB: Port A
+		return headstageComboBoxA->getText();
+	case 512: // NB: Port B
+		return headstageComboBoxB->getText();
+	default:
+		return "";
+	}
+}
+
 String OnixSourceEditor::getHeadstageSelected(PortName port)
 {
 	switch (port)
 	{
 	case PortName::PortA:
-		return headstageComboBoxA->getText();
+		return getHeadstageSelected(PortController::getPortOffset(port));
 	case PortName::PortB:
-		return headstageComboBoxB->getText();
+		return getHeadstageSelected(PortController::getPortOffset(port));
 	default:
 		return "";
 	}
diff --git a/Source/OnixSourceEditor.h b/Source/OnixSourceEditor.h
index decf9d4..a8d97ab 100644
--- a/Source/OnixSourceEditor.h
+++ b/Source/OnixSourceEditor.h
@@ -76,6 +76,8 @@ class OnixSourceEditor : public VisualizerEditor,
 
     bool isHeadstageSelected(PortName port);
 
+    String getHeadstageSelected(int offset);
+
     String getHeadstageSelected(PortName port);
 
     /** Updates the combo boxes based on the headstages found in the canvas tabs */
diff --git a/Source/UI/HeartbeatInterface.cpp b/Source/UI/HeartbeatInterface.cpp
deleted file mode 100644
index 1d91c53..0000000
--- a/Source/UI/HeartbeatInterface.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-	------------------------------------------------------------------
-
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
-
-	------------------------------------------------------------------
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "HeartbeatInterface.h"
-
-HeartbeatInterface::HeartbeatInterface(std::shared_ptr<Heartbeat> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
-	SettingsInterface(d, e, c)
-{
-	if (device != nullptr)
-	{
-		nameLabel = std::make_unique<Label>("MAIN", "NAME");
-		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
-		nameLabel->setBounds(50, 40, 370, 45);
-		addAndMakeVisible(nameLabel.get());
-
-		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
-		deviceEnableButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
-		deviceEnableButton->setRadius(3.0f);
-		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
-		deviceEnableButton->setClickingTogglesState(true);
-		deviceEnableButton->setTooltip("If disabled, Heartbeat will not stream data during acquisition");
-		deviceEnableButton->setToggleState(true, dontSendNotification);
-		deviceEnableButton->addListener(this);
-		addAndMakeVisible(deviceEnableButton.get());
-		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
-
-		infoLabel = std::make_unique<Label>("INFO", "INFO");
-		infoLabel->setFont(FontOptions(15.0f));
-		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
-		infoLabel->setJustificationType(Justification::topLeft);
-		addAndMakeVisible(infoLabel.get());
-
-		beatsPerSecondLabel = std::make_unique<Label>("beatsPerSecondLabel", "Beats Per Second [Hz]");
-		beatsPerSecondLabel->setBounds(infoLabel->getX(), infoLabel->getBottom() + 10, 170, 20);
-		addAndMakeVisible(beatsPerSecondLabel.get());
-
-		beatsPerSecondValue = std::make_unique<Label>("beatsPerSecondValue", String(std::static_pointer_cast<Heartbeat>(device)->getBeatsPerSecond()));
-		beatsPerSecondValue->setEditable(true);
-		beatsPerSecondValue->setBounds(beatsPerSecondLabel->getRight() + 3, beatsPerSecondLabel->getY(), 50, 20);
-		beatsPerSecondValue->setTooltip("Sets the rate at which beats are produced. Must be between 1 and 10 MHz.");
-		beatsPerSecondValue->setColour(Label::ColourIds::backgroundColourId, Colours::lightgrey);
-		beatsPerSecondValue->setJustificationType(Justification::centred);
-		beatsPerSecondValue->addListener(this);
-		addAndMakeVisible(beatsPerSecondValue.get());
-
-		updateInfoString();
-	}
-
-	type = SettingsInterface::Type::HEARTBEAT_SETTINGS_INTERFACE;
-}
-
-void HeartbeatInterface::buttonClicked(Button* button)
-{
-	if (button == deviceEnableButton.get())
-	{
-		device->setEnabled(deviceEnableButton->getToggleState());
-		device->configureDevice();
-		if (canvas->foundInputSource()) canvas->resetContext();
-
-		if (device->isEnabled())
-		{
-			deviceEnableButton->setLabel("ENABLED");
-		}
-		else
-		{
-			deviceEnableButton->setLabel("DISABLED");
-		}
-
-		CoreServices::updateSignalChain(editor);
-	}
-}
-
-void HeartbeatInterface::labelTextChanged(Label* l)
-{
-	if (l == beatsPerSecondValue.get())
-	{
-		auto d = std::static_pointer_cast<Heartbeat>(device);
-
-		int rate = l->getText().getIntValue();
-
-		if (rate < 1 || rate > 10e6)
-		{
-			l->setText(String(d->getBeatsPerSecond()), dontSendNotification);
-			return;
-		}
-
-		d->setBeatsPerSecond((uint32_t)rate, editor->acquisitionIsActive);
-	}
-}
-
-void HeartbeatInterface::updateInfoString()
-{
-	String nameString, infoString;
-
-	nameString = "Breakout Board";
-
-	if (device != nullptr)
-	{
-		infoString = "Device: Heartbeat";
-		infoString += "\n";
-		infoString += "\n";
-	}
-
-	infoLabel->setText(infoString, dontSendNotification);
-	nameLabel->setText(nameString, dontSendNotification);
-}
diff --git a/Source/UI/HeartbeatInterface.h b/Source/UI/HeartbeatInterface.h
deleted file mode 100644
index 41b90fe..0000000
--- a/Source/UI/HeartbeatInterface.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-	------------------------------------------------------------------
-
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
-
-	------------------------------------------------------------------
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#ifndef __HEARTBEATINTERFACE_H__
-#define __HEARTBEATINTERFACE_H__
-
-#include <VisualizerEditorHeaders.h>
-
-#include "../OnixSourceEditor.h"
-#include "../OnixSourceCanvas.h"
-
-#include "../Devices/Heartbeat.h"
-
-class HeartbeatInterface : public SettingsInterface,
-	public Label::Listener,
-	public Button::Listener
-{
-public:
-
-	HeartbeatInterface(std::shared_ptr<Heartbeat> d, OnixSourceEditor* e, OnixSourceCanvas* c);
-
-	/** Disables buttons and starts animation if necessary */
-	void startAcquisition() override {};
-
-	/** Enables buttons and start animation if necessary */
-	void stopAcquisition() override {};
-
-	/** Save parameters to XML */
-	void saveParameters(XmlElement* xml) override {};
-
-	/** Load parameters from XML */
-	void loadParameters(XmlElement* xml) override {};
-
-	/** Updates the info string on the right-hand side of the component */
-	void updateInfoString() override;
-
-	/** Listener methods*/
-	void buttonClicked(Button*) override;
-	void labelTextChanged(Label* l) override;
-
-private:
-
-	std::unique_ptr<Label> nameLabel;
-	std::unique_ptr<Label> infoLabel;
-
-	std::unique_ptr<Label> beatsPerSecondLabel;
-	std::unique_ptr<Label> beatsPerSecondValue;
-
-	std::unique_ptr<UtilityButton> deviceEnableButton;
-
-	JUCE_LEAK_DETECTOR(HeartbeatInterface);
-};
-
-#endif
diff --git a/Source/UI/InterfaceList.h b/Source/UI/InterfaceList.h
index 2f73763..31f003a 100644
--- a/Source/UI/InterfaceList.h
+++ b/Source/UI/InterfaceList.h
@@ -1,9 +1,7 @@
 #include "CustomViewport.h"
 #include "NeuropixV1Interface.h"
 #include "Bno055Interface.h"
-#include "MemoryMonitorInterface.h"
 #include "OutputClockInterface.h"
-#include "HeartbeatInterface.h"
 #include "HarpSyncInputInterface.h"
 #include "AnalogIOInterface.h"
 #include "DigitalIOInterface.h"
diff --git a/Source/UI/MemoryMonitorInterface.cpp b/Source/UI/MemoryMonitorInterface.cpp
deleted file mode 100644
index 13c0353..0000000
--- a/Source/UI/MemoryMonitorInterface.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-	------------------------------------------------------------------
-
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
-
-	------------------------------------------------------------------
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#include "MemoryMonitorInterface.h"
-
-MemoryMonitorInterface::MemoryMonitorInterface(std::shared_ptr<MemoryMonitor> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
-	SettingsInterface(d, e, c)
-{
-	if (device != nullptr)
-	{
-		nameLabel = std::make_unique<Label>("MAIN", "NAME");
-		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
-		nameLabel->setBounds(50, 40, 370, 45);
-		addAndMakeVisible(nameLabel.get());
-
-		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
-		deviceEnableButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
-		deviceEnableButton->setRadius(3.0f);
-		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
-		deviceEnableButton->setClickingTogglesState(true);
-		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
-		deviceEnableButton->setToggleState(true, dontSendNotification);
-		deviceEnableButton->addListener(this);
-		addAndMakeVisible(deviceEnableButton.get());
-		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
-
-		infoLabel = std::make_unique<Label>("INFO", "INFO");
-		infoLabel->setFont(FontOptions(15.0f));
-		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
-		infoLabel->setJustificationType(Justification::topLeft);
-		addAndMakeVisible(infoLabel.get());
-
-		sampleRateLabel = std::make_unique<Label>("sampleRateLabel", "Sample Rate [Hz]");
-		sampleRateLabel->setBounds(infoLabel->getX(), infoLabel->getBottom() + 10, 130, 20);
-		addAndMakeVisible(sampleRateLabel.get());
-
-		sampleRateValue = std::make_unique<Label>("sampleRateValue", String(std::static_pointer_cast<MemoryMonitor>(device)->getSamplesPerSecond()));
-		sampleRateValue->setEditable(true);
-		sampleRateValue->setBounds(sampleRateLabel->getRight() + 3, sampleRateLabel->getY(), 50, 20);
-		sampleRateValue->setTooltip("Sets the sample rate of the Memory Monitor device in Hz. Must be between 1 and 1000 Hz.");
-		sampleRateValue->setColour(Label::ColourIds::backgroundColourId, Colours::lightgrey);
-		sampleRateValue->setJustificationType(Justification::centred);
-		sampleRateValue->addListener(this);
-		addAndMakeVisible(sampleRateValue.get());
-
-		updateInfoString();
-	}
-
-	type = SettingsInterface::Type::MEMORYMONITOR_SETTINGS_INTERFACE;
-}
-
-void MemoryMonitorInterface::buttonClicked(Button* button)
-{
-	if (button == deviceEnableButton.get())
-	{
-		device->setEnabled(deviceEnableButton->getToggleState());
-		device->configureDevice();
-		if (canvas->foundInputSource()) canvas->resetContext();
-
-		if (device->isEnabled())
-		{
-			deviceEnableButton->setLabel("ENABLED");
-		}
-		else
-		{
-			deviceEnableButton->setLabel("DISABLED");
-		}
-
-		CoreServices::updateSignalChain(editor);
-	}
-}
-
-void MemoryMonitorInterface::labelTextChanged(Label* l)
-{
-	if (l == sampleRateValue.get())
-	{
-		auto d = std::static_pointer_cast<MemoryMonitor>(device);
-
-		int rate = l->getText().getIntValue();
-
-		if (rate < 1 || rate > 1000)
-		{
-			l->setText(String(d->getSamplesPerSecond()), dontSendNotification);
-			return;
-		}
-
-		d->setSamplesPerSecond((uint32_t)rate);
-	}
-}
-
-void MemoryMonitorInterface::updateInfoString()
-{
-	String nameString, infoString;
-
-	nameString = "Breakout Board";
-
-	if (device != nullptr)
-	{
-		infoString = "Device: Memory Monitor";
-		infoString += "\n";
-		infoString += "\n";
-	}
-
-	infoLabel->setText(infoString, dontSendNotification);
-	nameLabel->setText(nameString, dontSendNotification);
-}
diff --git a/Source/UI/MemoryMonitorInterface.h b/Source/UI/MemoryMonitorInterface.h
deleted file mode 100644
index 9b511c1..0000000
--- a/Source/UI/MemoryMonitorInterface.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-	------------------------------------------------------------------
-
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
-
-	------------------------------------------------------------------
-
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-*/
-
-#ifndef MEMORYMONITORINTERFACE_H
-#define MEMORYMONITORINTERFACE_H
-
-#include <VisualizerEditorHeaders.h>
-
-#include "../OnixSourceEditor.h"
-#include "../OnixSourceCanvas.h"
-
-#include "../Devices/MemoryMonitor.h"
-
-class MemoryMonitorInterface : public SettingsInterface,
-	public Label::Listener,
-	public Button::Listener
-{
-public:
-
-	MemoryMonitorInterface(std::shared_ptr<MemoryMonitor> d, OnixSourceEditor* e, OnixSourceCanvas* c);
-
-	/** Disables buttons and starts animation if necessary */
-	void startAcquisition() override {};
-
-	/** Enables buttons and start animation if necessary */
-	void stopAcquisition() override {};
-
-	/** Save parameters to XML */
-	void saveParameters(XmlElement* xml) override {};
-
-	/** Load parameters from XML */
-	void loadParameters(XmlElement* xml) override {};
-
-	/** Updates the info string on the right-hand side of the component */
-	void updateInfoString() override;
-
-	/** Listener methods*/
-	void buttonClicked(Button*) override;
-	void labelTextChanged(Label* l) override;
-
-private:
-
-	std::unique_ptr<Label> nameLabel;
-	std::unique_ptr<Label> infoLabel;
-
-	std::unique_ptr<Label> sampleRateLabel;
-	std::unique_ptr<Label> sampleRateValue;
-
-	std::unique_ptr<UtilityButton> deviceEnableButton;
-
-	JUCE_LEAK_DETECTOR(MemoryMonitorInterface);
-};
-
-#endif

From bcbb7418fe1fc86dae45bc3be2b081ba073114e6 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Fri, 28 Mar 2025 12:45:42 -0400
Subject: [PATCH 19/25] Remove unnecessary device variable from interface

---
 Source/UI/Bno055Interface.cpp    | 2 --
 Source/UI/Bno055Interface.h      | 2 --
 Source/UI/DigitalIOInterface.cpp | 2 --
 Source/UI/DigitalIOInterface.h   | 2 --
 4 files changed, 8 deletions(-)

diff --git a/Source/UI/Bno055Interface.cpp b/Source/UI/Bno055Interface.cpp
index 5c86184..d076786 100644
--- a/Source/UI/Bno055Interface.cpp
+++ b/Source/UI/Bno055Interface.cpp
@@ -26,8 +26,6 @@
 Bno055Interface::Bno055Interface(std::shared_ptr<Bno055> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
 	SettingsInterface(d, e, c)
 {
-	device = d;
-
 	if (device != nullptr)
 	{
 		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
diff --git a/Source/UI/Bno055Interface.h b/Source/UI/Bno055Interface.h
index 433fa74..a7478d5 100644
--- a/Source/UI/Bno055Interface.h
+++ b/Source/UI/Bno055Interface.h
@@ -58,8 +58,6 @@ class Bno055Interface : public SettingsInterface,
 
 private:
 
-	std::shared_ptr<Bno055> device;
-
 	std::unique_ptr<UtilityButton> deviceEnableButton;
 
 	JUCE_LEAK_DETECTOR(Bno055Interface);
diff --git a/Source/UI/DigitalIOInterface.cpp b/Source/UI/DigitalIOInterface.cpp
index 4b89ad8..e8e765c 100644
--- a/Source/UI/DigitalIOInterface.cpp
+++ b/Source/UI/DigitalIOInterface.cpp
@@ -26,8 +26,6 @@
 DigitalIOInterface::DigitalIOInterface(std::shared_ptr<DigitalIO> d, OnixSourceEditor* e, OnixSourceCanvas* c) :
 	SettingsInterface(d, e, c)
 {
-	device = d;
-
 	if (device != nullptr)
 	{
 		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
diff --git a/Source/UI/DigitalIOInterface.h b/Source/UI/DigitalIOInterface.h
index 670fcfa..3bb4d89 100644
--- a/Source/UI/DigitalIOInterface.h
+++ b/Source/UI/DigitalIOInterface.h
@@ -58,8 +58,6 @@ class DigitalIOInterface : public SettingsInterface,
 
 private:
 
-	std::shared_ptr<DigitalIO> device;
-
 	std::unique_ptr<UtilityButton> deviceEnableButton;
 
 	JUCE_LEAK_DETECTOR(DigitalIOInterface);

From 2d24c2de0ba53ca29f9c2ee5489daf94a0527e1e Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Fri, 28 Mar 2025 13:34:16 -0400
Subject: [PATCH 20/25] Add DigitalIO events to MemoryMonitor data stream

---
 Source/Devices/AnalogIO.cpp      |  4 +--
 Source/Devices/DigitalIO.cpp     | 47 ++++++++++++++++++++++++---
 Source/Devices/DigitalIO.h       | 10 ++++++
 Source/Devices/MemoryMonitor.cpp | 54 +++++++++++++++++++++++++++++++-
 Source/Devices/MemoryMonitor.h   | 30 ++++++++++++++++--
 Source/OnixSource.cpp            | 41 +++++++++++++++++++++---
 Source/OnixSource.h              | 10 +++---
 Source/OnixSourceCanvas.cpp      |  8 ++++-
 8 files changed, 185 insertions(+), 19 deletions(-)

diff --git a/Source/Devices/AnalogIO.cpp b/Source/Devices/AnalogIO.cpp
index f127382..179e6f6 100644
--- a/Source/Devices/AnalogIO.cpp
+++ b/Source/Devices/AnalogIO.cpp
@@ -164,10 +164,10 @@ void AnalogIO::processFrames()
 
 			currentAverageFrame = 0;
 
-			currentFrame++;
-
 			timestamps[currentFrame] = frame->time;
 			sampleNumbers[currentFrame] = sampleNumber++;
+
+			currentFrame++;
 		}
 
 		oni_destroy_frame(frame);
diff --git a/Source/Devices/DigitalIO.cpp b/Source/Devices/DigitalIO.cpp
index 36e829a..01fd656 100644
--- a/Source/Devices/DigitalIO.cpp
+++ b/Source/Devices/DigitalIO.cpp
@@ -55,6 +55,21 @@ void DigitalIO::stopAcquisition()
 	}
 }
 
+EventChannel::Settings DigitalIO::getEventChannelSettings()
+{
+	// NB: The stream must be assigned before adding the channel
+	EventChannel::Settings settings{
+		EventChannel::Type::TTL,
+		"DigitalIO Event Channel",
+		"Digital inputs and breakout button states coming from a DigitalIO device",
+		"onix-digitalio.events",
+		nullptr,
+		numButtons + numDigitalInputs
+	};
+
+	return settings;
+}
+
 void DigitalIO::addFrame(oni_frame_t* frame)
 {
 	const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
@@ -66,16 +81,40 @@ void DigitalIO::processFrames()
 	while (!frameArray.isEmpty())
 	{
 		const GenericScopedLock<CriticalSection> frameLock(frameArray.getLock());
+		const GenericScopedLock<CriticalSection> digitalInputsLock(eventWords.getLock());
 		oni_frame_t* frame = frameArray.removeAndReturn(0);
 
-		int16_t* dataPtr = (int16_t*)frame->data;
+		uint16_t* dataPtr = (uint16_t*)frame->data;
 		uint64_t timestamp = frame->time;
 
 		int dataOffset = 4;
 
-		int16_t portState = *(dataPtr + dataOffset);
-		int16_t buttonState = *(dataPtr + dataOffset + 1);
-		
+		uint64_t portState = *(dataPtr + dataOffset);
+		uint64_t buttonState = *(dataPtr + dataOffset + 1);
+
+		if (portState != 0 || buttonState != 0)
+		{
+			uint64_t ttlEventWord = (portState & 255) << 6 | (buttonState & 63);
+			eventWords.add(ttlEventWord);
+		}
+
 		oni_destroy_frame(frame);
 	}
 }
+
+uint64_t DigitalIO::getEventWord()
+{
+	const GenericScopedLock<CriticalSection> digitalInputsLock(eventWords.getLock());
+
+	if (eventWords.size() != 0)
+		return eventWords.removeAndReturn(0);
+
+	return 0;
+}
+
+bool DigitalIO::hasEventWord()
+{
+	const GenericScopedLock<CriticalSection> digitalInputsLock(eventWords.getLock());
+
+	return eventWords.size() > 0;
+}
diff --git a/Source/Devices/DigitalIO.h b/Source/Devices/DigitalIO.h
index 241323c..3c641c6 100644
--- a/Source/Devices/DigitalIO.h
+++ b/Source/Devices/DigitalIO.h
@@ -82,13 +82,23 @@ class DigitalIO : public OnixDevice
 	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
 	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override {};
 
+	EventChannel::Settings getEventChannelSettings();
+
 	void addFrame(oni_frame_t*) override;
 
 	void processFrames() override;
 
+	uint64_t getEventWord();
+
+	bool hasEventWord();
+
 private:
 
+	static const int numDigitalInputs = 8;
+	static const int numButtons = 6;
+
 	Array<oni_frame_t*, CriticalSection, 10> frameArray;
+	Array<uint64_t, CriticalSection, 64> eventWords;
 
 	JUCE_LEAK_DETECTOR(DigitalIO);
 };
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index cda95ff..d99979e 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -22,6 +22,7 @@
 */
 
 #include "MemoryMonitor.h"
+#include "DigitalIO.h"
 
 MemoryMonitorUsage::MemoryMonitorUsage(GenericProcessor* p)
 	: LevelMonitor(p)
@@ -58,6 +59,19 @@ void MemoryMonitorUsage::stopAcquisition()
 MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> oni_ctx)
 	: OnixDevice(name, OnixDeviceType::MEMORYMONITOR, deviceIdx_, oni_ctx)
 {
+	StreamInfo percentUsedStream;
+	percentUsedStream.name = name + "-PercentUsed";
+	percentUsedStream.description = "Percent of available memory that is currently used";
+	percentUsedStream.identifier = "onix-memorymonitor.data.percentused";
+	percentUsedStream.numChannels = 1;
+	percentUsedStream.sampleRate = samplesPerSecond;
+	percentUsedStream.channelPrefix = "Percent";
+	percentUsedStream.bitVolts = 1.0f;
+	percentUsedStream.channelType = ContinuousChannel::Type::AUX;
+	streamInfos.add(percentUsedStream);
+
+	for (int i = 0; i < numFrames; i++)
+		eventCodes[i] = 0;
 }
 
 int MemoryMonitor::configureDevice()
@@ -85,6 +99,9 @@ bool MemoryMonitor::updateSettings()
 
 void MemoryMonitor::startAcquisition()
 {
+	currentFrame = 0;
+	sampleNumber = 0;
+
 	lastPercentUsedValue = 0.0f;
 }
 
@@ -103,6 +120,17 @@ void MemoryMonitor::addFrame(oni_frame_t* frame)
 	frameArray.add(frame);
 }
 
+void MemoryMonitor::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
+{
+	for (StreamInfo streamInfo : streamInfos)
+	{
+		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
+
+		if (streamInfo.channelPrefix.equalsIgnoreCase("Percent"))
+			percentUsedBuffer = sourceBuffers.getLast();
+	}
+}
+
 float MemoryMonitor::getLastPercentUsedValue()
 {
 	return lastPercentUsedValue;
@@ -118,8 +146,32 @@ void MemoryMonitor::processFrames()
 		uint32_t* dataPtr = (uint32_t*)frame->data;
 		uint64_t timestamp = frame->time;
 
-		lastPercentUsedValue = 100.0f * float(*(dataPtr + 2)) / totalMemory;
+		timestamps[currentFrame] = frame->time;
+
+		percentUsedSamples[currentFrame] = 100.0f * float(*(dataPtr + 2)) / totalMemory;
+
+		lastPercentUsedValue = percentUsedSamples[currentFrame];
 
 		oni_destroy_frame(frame);
+
+		sampleNumbers[currentFrame] = sampleNumber++;
+
+		prevWord = m_digitalIO != nullptr && m_digitalIO->hasEventWord() ? m_digitalIO->getEventWord() : prevWord;
+
+		eventCodes[currentFrame] = prevWord;
+
+		currentFrame++;
+
+		if (currentFrame >= numFrames)
+		{
+			shouldAddToBuffer = true;
+			currentFrame = 0;
+		}
+
+		if (shouldAddToBuffer)
+		{
+			shouldAddToBuffer = false;
+			percentUsedBuffer->addToBuffer(percentUsedSamples, sampleNumbers, timestamps, eventCodes, numFrames);
+		}
 	}
 }
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index 23026cc..e796226 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -26,6 +26,8 @@
 
 #include "../OnixDevice.h"
 
+class DigitalIO;
+
 enum class MemoryMonitorRegisters : uint32_t
 {
 	ENABLE = 0,
@@ -55,7 +57,7 @@ class MemoryMonitor : public OnixDevice
 	void stopAcquisition() override;
 
 	/** Given the sourceBuffers from OnixSource, add all streams for the current device to the array */
-	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override {};
+	void addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers) override;
 
 	void addFrame(oni_frame_t*) override;
 
@@ -63,12 +65,34 @@ class MemoryMonitor : public OnixDevice
 
 	float getLastPercentUsedValue();
 
+	void setDigitalIO(std::shared_ptr<DigitalIO> digitalIO) { m_digitalIO = digitalIO; }
+
 private:
 
-	Array<oni_frame_t*, CriticalSection, 10> frameArray;
+	DataBuffer* percentUsedBuffer;
+
+	std::shared_ptr<DigitalIO> m_digitalIO;
+
+	uint64_t prevWord = 0;
+
+	static const int numFrames = 10;
+
+	Array<oni_frame_t*, CriticalSection, numFrames> frameArray;
+
+	unsigned short currentFrame = 0;
+	int sampleNumber = 0;
 
 	/** The frequency at which memory use is recorded in Hz. */
-	const uint32_t samplesPerSecond = 10;
+	const uint32_t samplesPerSecond = 100;
+
+	bool shouldAddToBuffer = false;
+
+	float percentUsedSamples[numFrames];
+	float bytesUsedSamples[numFrames];
+
+	double timestamps[numFrames];
+	int64_t sampleNumbers[numFrames];
+	uint64_t eventCodes[numFrames];
 
 	/** The total amount of memory, in 32-bit words, on the hardware that is available for data buffering*/
 	uint32_t totalMemory;
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 14bead9..0f559f8 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -315,7 +315,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 	LOGD("All devices initialized.");
 }
 
-OnixDeviceVector OnixSource::getDataSources() const
+OnixDeviceVector OnixSource::getDataSources()
 {
 	OnixDeviceVector devices{};
 
@@ -327,7 +327,7 @@ OnixDeviceVector OnixSource::getDataSources() const
 	return devices;
 }
 
-OnixDeviceVector OnixSource::getDataSourcesFromPort(PortName port) const
+OnixDeviceVector OnixSource::getDataSourcesFromPort(PortName port)
 {
 	OnixDeviceVector devices{};
 
@@ -340,7 +340,7 @@ OnixDeviceVector OnixSource::getDataSourcesFromPort(PortName port) const
 	return devices;
 }
 
-OnixDeviceVector OnixSource::getDataSourcesFromOffset(int offset) const
+OnixDeviceVector OnixSource::getDataSourcesFromOffset(int offset)
 {
 	OnixDeviceVector devices{};
 	offset = PortController::getOffsetFromIndex(offset);
@@ -354,6 +354,16 @@ OnixDeviceVector OnixSource::getDataSourcesFromOffset(int offset) const
 	return devices;
 }
 
+std::shared_ptr<OnixDevice> OnixSource::getDevice(OnixDeviceType type)
+{
+	for (const auto& device : sources)
+	{
+		if (device->type == type) return device;
+	}
+
+	return nullptr;
+}
+
 std::map<int, OnixDeviceType> OnixSource::createDeviceMap(OnixDeviceVector devices, bool filterDevices)
 {
 	std::map<int, OnixDeviceType> deviceMap;
@@ -368,7 +378,7 @@ std::map<int, OnixDeviceType> OnixSource::createDeviceMap(OnixDeviceVector devic
 	return deviceMap;
 }
 
-std::map<int, OnixDeviceType> OnixSource::createDeviceMap(bool filterDevices) const
+std::map<int, OnixDeviceType> OnixSource::createDeviceMap(bool filterDevices)
 {
 	return createDeviceMap(getDataSources(), filterDevices);
 }
@@ -462,6 +472,8 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 
 	updateSourceBuffers();
 
+	std::shared_ptr<DigitalIO> digitalIO = std::static_pointer_cast<DigitalIO>(getDevice(OnixDeviceType::DIGITALIO));
+
 	if (devicesFound)
 	{
 		for (const auto& source : sources)
@@ -529,6 +541,18 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 
 				deviceInfos->add(new DeviceInfo(deviceSettings));
 			}
+			else if (source->type == OnixDeviceType::DIGITALIO)
+			{
+				DeviceInfo::Settings deviceSettings{
+					source->getName(),
+					"Digital IO",
+					"digitalio",
+					"0000000",
+					""
+				};
+
+				deviceInfos->add(new DeviceInfo(deviceSettings));
+			}
 
 			// add data streams and channels
 			for (const auto& streamInfo : source->streamInfos)
@@ -558,6 +582,15 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 					};
 					continuousChannels->add(new ContinuousChannel(channelSettings));
 				}
+
+				if (source->type == OnixDeviceType::MEMORYMONITOR && digitalIO != nullptr && digitalIO->isEnabled())
+				{
+					auto ttlChannelSettings = digitalIO->getEventChannelSettings();
+					ttlChannelSettings.stream = stream;
+					eventChannels->add(new EventChannel(ttlChannelSettings));
+
+					std::static_pointer_cast<MemoryMonitor>(source)->setDigitalIO(digitalIO);
+				}
 			}
 		}
 	}
diff --git a/Source/OnixSource.h b/Source/OnixSource.h
index b2d55cb..e8e75b4 100644
--- a/Source/OnixSource.h
+++ b/Source/OnixSource.h
@@ -92,15 +92,17 @@ class OnixSource : public DataThread
 
 	void disconnectDevices(bool updateStreamInfo = false);
 
-	OnixDeviceVector getDataSources() const;
+	OnixDeviceVector getDataSources();
 
-	OnixDeviceVector getDataSourcesFromPort(PortName port) const;
+	OnixDeviceVector getDataSourcesFromPort(PortName port);
 
-	OnixDeviceVector getDataSourcesFromOffset(int offset) const;
+	OnixDeviceVector getDataSourcesFromOffset(int offset);
+
+	std::shared_ptr<OnixDevice> getDevice(OnixDeviceType type);
 
 	static std::map<int, OnixDeviceType> createDeviceMap(OnixDeviceVector, bool filterDevices = false);
 
-	std::map<int, OnixDeviceType> createDeviceMap(bool filterDevices = false) const;
+	std::map<int, OnixDeviceType> createDeviceMap(bool filterDevices = false);
 
 	std::map<int, String> getHeadstageMap();
 
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index da0502c..e2eba78 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -165,7 +165,13 @@ void OnixSourceCanvas::updateSettingsInterfaceDataSource(std::shared_ptr<OnixDev
 		}
 	}
 
-	if (ind == -1) { LOGD("Unable to match " + device->getName() + " to an open tab."); return; }
+	if (ind == -1)
+	{
+		if (device->type != OnixDeviceType::MEMORYMONITOR && device->type != OnixDeviceType::HEARTBEAT)
+			LOGD("Unable to match " + device->getName() + " to an open tab."); 
+		
+		return;
+	}
 
 	if (device->type == OnixDeviceType::NEUROPIXELS_1)
 	{

From 442a6d12e2715e8633dc3554c1de85f5c8fbdbbd Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Fri, 28 Mar 2025 14:25:58 -0400
Subject: [PATCH 21/25] Update StreamInfo instantiation

---
 Source/Devices/AnalogIO.cpp      | 24 +++++++++++++-----------
 Source/Devices/HarpSyncInput.cpp | 24 +++++++++++++-----------
 Source/Devices/MemoryMonitor.cpp | 24 +++++++++++++-----------
 Source/OnixDevice.h              |  6 ++++--
 Source/OnixSource.cpp            | 11 +++++------
 5 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/Source/Devices/AnalogIO.cpp b/Source/Devices/AnalogIO.cpp
index 179e6f6..a5f39b8 100644
--- a/Source/Devices/AnalogIO.cpp
+++ b/Source/Devices/AnalogIO.cpp
@@ -26,15 +26,17 @@
 AnalogIO::AnalogIO(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> oni_ctx)
 	: OnixDevice(name, OnixDeviceType::ANALOGIO, deviceIdx_, oni_ctx)
 {
-	StreamInfo analogInputStream;
-	analogInputStream.name = name + "-AnalogInput";
-	analogInputStream.description = "Analog Input data";
-	analogInputStream.identifier = "onix-analogio.data.input";
-	analogInputStream.numChannels = 12;
-	analogInputStream.sampleRate = std::floor(100000 / framesToAverage);
-	analogInputStream.channelPrefix = "AnalogInput";
-	analogInputStream.bitVolts = 1.0f;
-	analogInputStream.channelType = ContinuousChannel::Type::ADC;
+	StreamInfo analogInputStream = StreamInfo(
+		name + "-AnalogInput",
+		"Analog Input data",
+		"onix-analogio.data.input",
+		12,
+		std::floor(100000 / framesToAverage),
+		"AnalogInput",
+		ContinuousChannel::Type::ADC,
+		1.0f,
+		"V",
+		{});
 	streamInfos.add(analogInputStream);
 
 	for (int i = 0; i < numFrames; i++)
@@ -127,9 +129,9 @@ void AnalogIO::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
 	for (StreamInfo streamInfo : streamInfos)
 	{
-		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
+		sourceBuffers.add(new DataBuffer(streamInfo.getNumChannels(), (int)streamInfo.getSampleRate() * bufferSizeInSeconds));
 
-		if (streamInfo.channelPrefix.equalsIgnoreCase("AnalogInput"))
+		if (streamInfo.getChannelPrefix().equalsIgnoreCase("AnalogInput"))
 			analogInputBuffer = sourceBuffers.getLast();
 	}
 }
diff --git a/Source/Devices/HarpSyncInput.cpp b/Source/Devices/HarpSyncInput.cpp
index 42affd1..8fdd11d 100644
--- a/Source/Devices/HarpSyncInput.cpp
+++ b/Source/Devices/HarpSyncInput.cpp
@@ -28,15 +28,17 @@ HarpSyncInput::HarpSyncInput(String name, const oni_dev_idx_t deviceIdx_, std::s
 {
 	setEnabled(false);
 
-	StreamInfo harpTimeStream;
-	harpTimeStream.name = name + "-HarpTime";
-	harpTimeStream.description = "Harp clock time corresponding to the local acquisition ONIX clock count";
-	harpTimeStream.identifier = "onix-harpsyncinput.data.harptime";
-	harpTimeStream.numChannels = 1;
-	harpTimeStream.sampleRate = 1;
-	harpTimeStream.channelPrefix = "HarpTime";
-	harpTimeStream.bitVolts = 1.0f;
-	harpTimeStream.channelType = ContinuousChannel::Type::AUX;
+	StreamInfo harpTimeStream = StreamInfo(
+		name + "-HarpTime",
+		"Harp clock time corresponding to the local acquisition ONIX clock count",
+		"onix-harpsyncinput.data.harptime",
+		1,
+		1,
+		"HarpTime",
+		ContinuousChannel::Type::AUX,
+		1.0f,
+		"s",
+		{""});
 	streamInfos.add(harpTimeStream);
 
 	for (int i = 0; i < numFrames; i++)
@@ -84,9 +86,9 @@ void HarpSyncInput::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
 	for (StreamInfo streamInfo : streamInfos)
 	{
-		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
+		sourceBuffers.add(new DataBuffer(streamInfo.getNumChannels(), (int)streamInfo.getSampleRate() * bufferSizeInSeconds));
 
-		if (streamInfo.channelPrefix.equalsIgnoreCase("HarpTime"))
+		if (streamInfo.getChannelPrefix().equalsIgnoreCase("HarpTime"))
 			harpTimeBuffer = sourceBuffers.getLast();
 	}
 }
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index d99979e..a969030 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -59,15 +59,17 @@ void MemoryMonitorUsage::stopAcquisition()
 MemoryMonitor::MemoryMonitor(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> oni_ctx)
 	: OnixDevice(name, OnixDeviceType::MEMORYMONITOR, deviceIdx_, oni_ctx)
 {
-	StreamInfo percentUsedStream;
-	percentUsedStream.name = name + "-PercentUsed";
-	percentUsedStream.description = "Percent of available memory that is currently used";
-	percentUsedStream.identifier = "onix-memorymonitor.data.percentused";
-	percentUsedStream.numChannels = 1;
-	percentUsedStream.sampleRate = samplesPerSecond;
-	percentUsedStream.channelPrefix = "Percent";
-	percentUsedStream.bitVolts = 1.0f;
-	percentUsedStream.channelType = ContinuousChannel::Type::AUX;
+	StreamInfo percentUsedStream = StreamInfo(
+		name + "-PercentUsed",
+		"Percent of available memory that is currently used",
+		"onix - memorymonitor.data.percentused",
+		1,
+		samplesPerSecond,
+		"Percent",
+		ContinuousChannel::Type::AUX,
+		1.0f,
+		"%",
+		{""});
 	streamInfos.add(percentUsedStream);
 
 	for (int i = 0; i < numFrames; i++)
@@ -124,9 +126,9 @@ void MemoryMonitor::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
 	for (StreamInfo streamInfo : streamInfos)
 	{
-		sourceBuffers.add(new DataBuffer(streamInfo.numChannels, (int)streamInfo.sampleRate * bufferSizeInSeconds));
+		sourceBuffers.add(new DataBuffer(streamInfo.getNumChannels(), (int)streamInfo.getSampleRate() * bufferSizeInSeconds));
 
-		if (streamInfo.channelPrefix.equalsIgnoreCase("Percent"))
+		if (streamInfo.getChannelPrefix().equalsIgnoreCase("Percent"))
 			percentUsedBuffer = sourceBuffers.getLast();
 	}
 }
diff --git a/Source/OnixDevice.h b/Source/OnixDevice.h
index 5fa5e15..fb32c77 100644
--- a/Source/OnixDevice.h
+++ b/Source/OnixDevice.h
@@ -90,7 +90,9 @@ struct StreamInfo {
 
 		if (numChannels_ != suffixes_.size())
 		{
-			LOGE("Difference between number of channels and suffixes. Generating default suffixes instead.");
+			if (suffixes_.size() != 0)
+				LOGE("Difference between number of channels and suffixes. Generating default suffixes instead.");
+
 			suffixes_.clear();
 			suffixes_.ensureStorageAllocated(numChannels);
 			
@@ -103,7 +105,7 @@ struct StreamInfo {
 
 	String getName() const { return name_; }
 	String getDescription() const { return description_; }
-	String getIdentifer() const { return identifier_; }
+	String getIdentifier() const { return identifier_; }
 	int getNumChannels() const { return numChannels_; }
 	float getSampleRate() const { return sampleRate_; }
 	String getChannelPrefix() const { return channelPrefix_; }
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 4bae2a5..68dead0 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -601,7 +601,7 @@ void OnixSource::addCombinedStreams(DataStream::Settings dataStreamSettings,
 				streamInfo.getChannelType(),
 				streamInfo.getChannelPrefix() + streamInfo.getSuffixes()[chan],
 				streamInfo.getDescription(),
-				streamInfo.getIdentifer(),
+				streamInfo.getIdentifier(),
 				streamInfo.getBitVolts(),
 				stream
 			};
@@ -622,7 +622,7 @@ void OnixSource::addIndividualStreams(Array<StreamInfo> streamInfos,
 		{
 			streamInfo.getName(),
 			streamInfo.getDescription(),
-			streamInfo.getIdentifer(),
+			streamInfo.getIdentifier(),
 			streamInfo.getSampleRate()
 		};
 
@@ -637,7 +637,7 @@ void OnixSource::addIndividualStreams(Array<StreamInfo> streamInfos,
 				streamInfo.getChannelType(),
 				streamInfo.getChannelPrefix() + streamInfo.getSuffixes()[chan],
 				streamInfo.getDescription(),
-				streamInfo.getIdentifer(),
+				streamInfo.getIdentifier(),
 				streamInfo.getBitVolts(),
 				stream
 			};
@@ -697,6 +697,8 @@ bool OnixSource::startAcquisition()
 
 	for (const auto& source : sources)
 	{
+		if (!source->isEnabled()) continue;
+
 		devices.emplace_back(source);
 	}
 
@@ -705,8 +707,6 @@ bool OnixSource::startAcquisition()
 
 	for (const auto& source : devices)
 	{
-		if (!source->isEnabled()) continue;
-
 		source->startAcquisition();
 	}
 
@@ -733,7 +733,6 @@ bool OnixSource::stopAcquisition()
 	{
 		oni_size_t reg = 0;
 		context->setOption(ONI_OPT_RUNNING, reg);
-		if (context->getLastResult() != ONI_ESUCCESS) return false;
 
 		uint32_t val = 1;
 		context->setOption(ONI_OPT_RESET, val);

From 7f10f2f5ec13949a5a157832dd2d9e2d3ac0beee Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Fri, 28 Mar 2025 15:23:48 -0400
Subject: [PATCH 22/25] Update Output Clock - Modify the interface and backend
 so that there is a checkbox the user can check that either ties the clock to
 the acquisition status, or is free-running

Miscellaneous updates:
- Use emplace_back instead of push_back
- Remove info/name labels from interfaces that don't need them=
---
 Source/Devices/Bno055.cpp            |  2 +-
 Source/Devices/OutputClock.cpp       | 10 ++--
 Source/Devices/OutputClock.h         | 14 ++---
 Source/OnixSource.cpp                | 44 +++++++--------
 Source/OnixSourceCanvas.cpp          |  8 +--
 Source/UI/ActivityView.h             |  4 +-
 Source/UI/AnalogIOInterface.cpp      | 32 +----------
 Source/UI/AnalogIOInterface.h        |  5 +-
 Source/UI/HarpSyncInputInterface.cpp | 32 +----------
 Source/UI/HarpSyncInputInterface.h   |  6 +-
 Source/UI/OutputClockInterface.cpp   | 82 ++++------------------------
 Source/UI/OutputClockInterface.h     |  9 +--
 12 files changed, 60 insertions(+), 188 deletions(-)

diff --git a/Source/Devices/Bno055.cpp b/Source/Devices/Bno055.cpp
index bd83833..9a69600 100644
--- a/Source/Devices/Bno055.cpp
+++ b/Source/Devices/Bno055.cpp
@@ -50,7 +50,7 @@ Bno055::Bno055(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix
 		"Quaternion",
 		ContinuousChannel::Type::AUX,
 		bitVolts,
-		"",
+		"u",
 		{ "W", "X", "Y", "Z" });
 	streamInfos.add(quaternionStream);
 
diff --git a/Source/Devices/OutputClock.cpp b/Source/Devices/OutputClock.cpp
index 07e8cb9..e6b0bbd 100644
--- a/Source/Devices/OutputClock.cpp
+++ b/Source/Devices/OutputClock.cpp
@@ -30,7 +30,7 @@ OutputClock::OutputClock(String name, const oni_dev_idx_t deviceIdx_, std::share
 
 OutputClock::~OutputClock()
 {
-	if (deviceContext != nullptr && deviceContext->isInitialized()) setClockGate(false, true);
+	if (deviceContext != nullptr && deviceContext->isInitialized()) setGateRun(false, true);
 }
 
 bool OutputClock::updateSettings()
@@ -42,21 +42,23 @@ bool OutputClock::updateSettings()
 	auto l = periodCycles - h;
 	auto delayCycles = (uint32_t)(delay * baseFreqHz);
 
+	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::CLOCK_GATE, 1); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
+
 	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::HIGH_CYCLES, h); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
 	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::LOW_CYCLES, l); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
 	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::DELAY_CYCLES, delayCycles); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
 
-	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::GATE_RUN, 1); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
+	deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::GATE_RUN, gateRun ? 1 : 0); if (deviceContext->getLastResult() != ONI_ESUCCESS) return false;
 
 	return true;
 }
 
 void OutputClock::startAcquisition()
 {
-	writeClockGateRegister();
+	writeGateRunRegister();
 }
 
 void OutputClock::stopAcquisition()
 {
-	setClockGate(false, true);
+	setGateRun(false, true);
 }
\ No newline at end of file
diff --git a/Source/Devices/OutputClock.h b/Source/Devices/OutputClock.h
index 64df433..aaec942 100644
--- a/Source/Devices/OutputClock.h
+++ b/Source/Devices/OutputClock.h
@@ -48,7 +48,7 @@ class OutputClock : public OnixDevice
 	~OutputClock();
 
 	/** Device is always enabled */
-	int configureDevice() override { return 0; };
+	int configureDevice() override { setEnabled(true); return 0; };
 
 	/** Update the settings of the device */
 	bool updateSettings() override;
@@ -78,12 +78,12 @@ class OutputClock : public OnixDevice
 
 	void setDelay(uint32_t delay_) { delay = delay_; }
 
-	bool getClockGate() const { return clockGate; }
+	bool getGateRun() const { return gateRun; }
 
-	void setClockGate(bool gate, bool writeToRegister = false)
+	void setGateRun(bool gate, bool writeToRegister = false)
 	{ 
-		clockGate = gate;
-		if (writeToRegister) writeClockGateRegister();
+		gateRun = gate;
+		if (writeToRegister) writeGateRunRegister();
 	}
 
 private:
@@ -92,9 +92,9 @@ class OutputClock : public OnixDevice
 	uint32_t dutyCycle = 50;
 	uint32_t delay = 0;
 
-	bool clockGate = false;
+	bool gateRun = true;
 
-	void writeClockGateRegister() { deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::CLOCK_GATE, clockGate ? 1 : 0); }
+	void writeGateRunRegister() { deviceContext->writeRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::GATE_RUN, gateRun ? 1 : 0); }
 
 	JUCE_LEAK_DETECTOR(OutputClock);
 };
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index 68dead0..c761449 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -229,7 +229,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				continue;
 			}
 
-			sources.push_back(memoryMonitor);
+			sources.emplace_back(memoryMonitor);
 			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_FMCCLKOUT1R3)
@@ -244,7 +244,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				continue;
 			}
 
-			sources.push_back(outputClock);
+			sources.emplace_back(outputClock);
 			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_HEARTBEAT)
@@ -259,7 +259,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				continue;
 			}
 
-			sources.push_back(heartbeat);
+			sources.emplace_back(heartbeat);
 			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_HARPSYNCINPUT)
@@ -274,7 +274,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				continue;
 			}
 
-			sources.push_back(harpSyncInput);
+			sources.emplace_back(harpSyncInput);
 			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_FMCANALOG1R3)
@@ -289,7 +289,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				continue;
 			}
 
-			sources.push_back(analogIO);
+			sources.emplace_back(analogIO);
 			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 		else if (device.id == ONIX_BREAKDIG1R3)
@@ -304,7 +304,7 @@ void OnixSource::initializeDevices(bool updateStreamInfo)
 				continue;
 			}
 
-			sources.push_back(digitalIO);
+			sources.emplace_back(digitalIO);
 			headstages.insert({ PortController::getOffsetFromIndex(index), BREAKOUT_BOARD_NAME });
 		}
 	}
@@ -360,7 +360,7 @@ OnixDeviceVector OnixSource::getDataSourcesFromOffset(int offset)
 	for (const auto& source : sources)
 	{
 		if (PortController::getOffsetFromIndex(source->getDeviceIdx()) == offset)
-			devices.push_back(source);
+			devices.emplace_back(source);
 	}
 
 	return devices;
@@ -553,17 +553,17 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 				};
 
 				deviceInfos->add(new DeviceInfo(deviceSettings));
-        
+
 				addIndividualStreams(source->streamInfos, dataStreams, deviceInfos, continuousChannels);
-        
-        if (digitalIO != nullptr && digitalIO->isEnabled())
-        {
-          auto ttlChannelSettings = digitalIO->getEventChannelSettings();
-          ttlChannelSettings.stream = dataStreams->getLast();
-          eventChannels->add(new EventChannel(ttlChannelSettings));
-
-          std::static_pointer_cast<MemoryMonitor>(source)->setDigitalIO(digitalIO);
-        }
+
+				if (digitalIO != nullptr && digitalIO->isEnabled())
+				{
+					auto ttlChannelSettings = digitalIO->getEventChannelSettings();
+					ttlChannelSettings.stream = dataStreams->getLast();
+					eventChannels->add(new EventChannel(ttlChannelSettings));
+
+					std::static_pointer_cast<MemoryMonitor>(source)->setDigitalIO(digitalIO);
+				}
 			}
 			else if (source->type == OnixDeviceType::ANALOGIO)
 			{
@@ -576,7 +576,7 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 				};
 
 				deviceInfos->add(new DeviceInfo(deviceSettings));
-        
+
 				addIndividualStreams(source->streamInfos, dataStreams, deviceInfos, continuousChannels);
 			}
 		}
@@ -611,9 +611,9 @@ void OnixSource::addCombinedStreams(DataStream::Settings dataStreamSettings,
 	}
 }
 
-void OnixSource::addIndividualStreams(Array<StreamInfo> streamInfos, 
-	OwnedArray<DataStream>* dataStreams, 
-	OwnedArray<DeviceInfo>* deviceInfos, 
+void OnixSource::addIndividualStreams(Array<StreamInfo> streamInfos,
+	OwnedArray<DataStream>* dataStreams,
+	OwnedArray<DeviceInfo>* deviceInfos,
 	OwnedArray<ContinuousChannel>* continuousChannels)
 {
 	for (StreamInfo streamInfo : streamInfos)
@@ -643,7 +643,7 @@ void OnixSource::addIndividualStreams(Array<StreamInfo> streamInfos,
 			};
 			continuousChannels->add(new ContinuousChannel(channelSettings));
 			continuousChannels->getLast()->setUnits(streamInfo.getUnits());
-    }
+		}
 	}
 }
 
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index 4fe7890..4180422 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -94,10 +94,10 @@ void OnixSourceCanvas::addHub(String hubName, int offset)
 	{
 		tab = addTopLevelTab(hubName, 0);
 
-		devices.push_back(std::make_shared<OutputClock>("Output Clock", 5, nullptr));
-		devices.push_back(std::make_shared<AnalogIO>("Analog IO", 6, nullptr));
-		devices.push_back(std::make_shared<DigitalIO>("Digital IO", 7, nullptr));
-		devices.push_back(std::make_shared<HarpSyncInput>("Harp Sync Input", 12, nullptr));
+		devices.emplace_back(std::make_shared<OutputClock>("Output Clock", 5, nullptr));
+		devices.emplace_back(std::make_shared<AnalogIO>("Analog IO", 6, nullptr));
+		devices.emplace_back(std::make_shared<DigitalIO>("Digital IO", 7, nullptr));
+		devices.emplace_back(std::make_shared<HarpSyncInput>("Harp Sync Input", 12, nullptr));
 	}
 
 	if (tab != nullptr && devices.size() > 0)
diff --git a/Source/UI/ActivityView.h b/Source/UI/ActivityView.h
index 7c79c1c..f9f82f9 100644
--- a/Source/UI/ActivityView.h
+++ b/Source/UI/ActivityView.h
@@ -52,9 +52,9 @@ class ActivityView
             std::vector<int> block;
             for (int i = 0; i < numChannels; i++)
             {
-                block.push_back(i);
+                block.emplace_back(i);
             }
-            blocks.push_back(block);
+            blocks.emplace_back(block);
         }
         else
         {
diff --git a/Source/UI/AnalogIOInterface.cpp b/Source/UI/AnalogIOInterface.cpp
index 77282d4..ff5b105 100644
--- a/Source/UI/AnalogIOInterface.cpp
+++ b/Source/UI/AnalogIOInterface.cpp
@@ -28,17 +28,12 @@ AnalogIOInterface::AnalogIOInterface(std::shared_ptr<AnalogIO> d, OnixSourceEdit
 {
 	if (device != nullptr)
 	{
-		nameLabel = std::make_unique<Label>("MAIN", "NAME");
-		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
-		nameLabel->setBounds(50, 40, 370, 45);
-		addAndMakeVisible(nameLabel.get());
-
 		FontOptions font = FontOptions("Fira Code", "Regular", 12.0f);
 
 		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
 		deviceEnableButton->setFont(font);
 		deviceEnableButton->setRadius(3.0f);
-		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
+		deviceEnableButton->setBounds(50, 40, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
 		deviceEnableButton->setTooltip("If disabled, AnalogIO will not stream or receive data during acquisition");
 		deviceEnableButton->setToggleState(true, dontSendNotification);
@@ -46,15 +41,9 @@ AnalogIOInterface::AnalogIOInterface(std::shared_ptr<AnalogIO> d, OnixSourceEdit
 		addAndMakeVisible(deviceEnableButton.get());
 		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
 
-		infoLabel = std::make_unique<Label>("INFO", "INFO");
-		infoLabel->setFont(FontOptions(15.0f));
-		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
-		infoLabel->setJustificationType(Justification::topLeft);
-		addAndMakeVisible(infoLabel.get());
-
 		dataTypeLabel = std::make_unique<Label>("dataTypeLabel", "Data Type");
 		dataTypeLabel->setFont(font);
-		dataTypeLabel->setBounds(infoLabel->getX(), infoLabel->getBottom() + 5, 80, 20);
+		dataTypeLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 5, 80, 20);
 		addAndMakeVisible(dataTypeLabel.get());
 
 		dataTypeComboBox = std::make_unique<ComboBox>("dataTypeComboBox");
@@ -172,23 +161,6 @@ void AnalogIOInterface::comboBoxChanged(ComboBox* cb)
 	}
 }
 
-void AnalogIOInterface::updateInfoString()
-{
-	String nameString, infoString;
-
-	nameString = "Breakout Board";
-
-	if (device != nullptr)
-	{
-		infoString = "Device: Analog IO";
-		infoString += "\n";
-		infoString += "\n";
-	}
-
-	infoLabel->setText(infoString, dontSendNotification);
-	nameLabel->setText(nameString, dontSendNotification);
-}
-
 int AnalogIOInterface::getChannelDirectionId(std::shared_ptr<AnalogIO> device, int channelNumber)
 {
 	switch (device->getChannelDirection(channelNumber))
diff --git a/Source/UI/AnalogIOInterface.h b/Source/UI/AnalogIOInterface.h
index 65ea650..33251f5 100644
--- a/Source/UI/AnalogIOInterface.h
+++ b/Source/UI/AnalogIOInterface.h
@@ -52,7 +52,7 @@ class AnalogIOInterface : 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 {};
 
 	/** Listener methods*/
 	void buttonClicked(Button*) override;
@@ -62,9 +62,6 @@ class AnalogIOInterface : public SettingsInterface,
 
 	static const int numChannels = 12;
 
-	std::unique_ptr<Label> nameLabel;
-	std::unique_ptr<Label> infoLabel;
-
 	std::unique_ptr<Label> dataTypeLabel;
 	std::unique_ptr<ComboBox> dataTypeComboBox;
 
diff --git a/Source/UI/HarpSyncInputInterface.cpp b/Source/UI/HarpSyncInputInterface.cpp
index 409c221..5634ee1 100644
--- a/Source/UI/HarpSyncInputInterface.cpp
+++ b/Source/UI/HarpSyncInputInterface.cpp
@@ -28,29 +28,16 @@ HarpSyncInputInterface::HarpSyncInputInterface(std::shared_ptr<HarpSyncInput> d,
 {
 	if (device != nullptr)
 	{
-		nameLabel = std::make_unique<Label>("MAIN", "NAME");
-		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
-		nameLabel->setBounds(50, 40, 370, 45);
-		addAndMakeVisible(nameLabel.get());
-
 		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
 		deviceEnableButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
 		deviceEnableButton->setRadius(3.0f);
-		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
+		deviceEnableButton->setBounds(50, 40, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
 		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
 		deviceEnableButton->setToggleState(true, dontSendNotification);
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
 		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
-
-		infoLabel = std::make_unique<Label>("INFO", "INFO");
-		infoLabel->setFont(FontOptions(15.0f));
-		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
-		infoLabel->setJustificationType(Justification::topLeft);
-		addAndMakeVisible(infoLabel.get());
-
-		updateInfoString();
 	}
 
 	type = SettingsInterface::Type::HARPSYNCINPUT_SETTINGS_INTERFACE;
@@ -76,20 +63,3 @@ void HarpSyncInputInterface::buttonClicked(Button* button)
 		CoreServices::updateSignalChain(editor);
 	}
 }
-
-void HarpSyncInputInterface::updateInfoString()
-{
-	String nameString, infoString;
-
-	nameString = "Breakout Board";
-
-	if (device != nullptr)
-	{
-		infoString = "Device: Harp Sync Input";
-		infoString += "\n";
-		infoString += "\n";
-	}
-
-	infoLabel->setText(infoString, dontSendNotification);
-	nameLabel->setText(nameString, dontSendNotification);
-}
diff --git a/Source/UI/HarpSyncInputInterface.h b/Source/UI/HarpSyncInputInterface.h
index a6c6781..1842b35 100644
--- a/Source/UI/HarpSyncInputInterface.h
+++ b/Source/UI/HarpSyncInputInterface.h
@@ -50,17 +50,13 @@ class HarpSyncInputInterface : public SettingsInterface,
 	/** Load parameters from XML */
 	void loadParameters(XmlElement* xml) override {};
 
-	/** Updates the info string on the right-hand side of the component */
-	void updateInfoString() override;
+	void updateInfoString() override {};
 
 	/** Listener methods*/
 	void buttonClicked(Button*) override;
 
 private:
 
-	std::unique_ptr<Label> nameLabel;
-	std::unique_ptr<Label> infoLabel;
-
 	std::unique_ptr<UtilityButton> deviceEnableButton;
 
 	JUCE_LEAK_DETECTOR(HarpSyncInputInterface);
diff --git a/Source/UI/OutputClockInterface.cpp b/Source/UI/OutputClockInterface.cpp
index 479a581..79742f4 100644
--- a/Source/UI/OutputClockInterface.cpp
+++ b/Source/UI/OutputClockInterface.cpp
@@ -28,30 +28,8 @@ OutputClockInterface::OutputClockInterface(std::shared_ptr<OutputClock> d, OnixS
 {
 	if (device != nullptr)
 	{
-		nameLabel = std::make_unique<Label>("MAIN", "NAME");
-		nameLabel->setFont(FontOptions("Fira Code", "Medium", 30.0f));
-		nameLabel->setBounds(50, 40, 370, 45);
-		addAndMakeVisible(nameLabel.get());
-
-		deviceEnableButton = std::make_unique<UtilityButton>("ENABLED");
-		deviceEnableButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
-		deviceEnableButton->setRadius(3.0f);
-		deviceEnableButton->setBounds(nameLabel->getX(), nameLabel->getBottom() + 3, 100, 22);
-		deviceEnableButton->setClickingTogglesState(true);
-		deviceEnableButton->setTooltip("If disabled, Output Clock will not be active during acquisition");
-		deviceEnableButton->setToggleState(true, dontSendNotification);
-		deviceEnableButton->addListener(this);
-		addAndMakeVisible(deviceEnableButton.get());
-		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
-
-		infoLabel = std::make_unique<Label>("INFO", "INFO");
-		infoLabel->setFont(FontOptions(15.0f));
-		infoLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 10, 300, 20);
-		infoLabel->setJustificationType(Justification::topLeft);
-		addAndMakeVisible(infoLabel.get());
-
 		frequencyHzLabel = std::make_unique<Label>("frequencyHz", "Frequency [Hz]");
-		frequencyHzLabel->setBounds(infoLabel->getX(), infoLabel->getBottom() + 10, 130, 20);
+		frequencyHzLabel->setBounds(50, 40, 130, 20);
 		addAndMakeVisible(frequencyHzLabel.get());
 
 		frequencyHzValue = std::make_unique<Label>("frequencyHzValue", String(std::static_pointer_cast<OutputClock>(device)->getFrequencyHz()));
@@ -89,18 +67,14 @@ OutputClockInterface::OutputClockInterface(std::shared_ptr<OutputClock> d, OnixS
 		delayValue->addListener(this);
 		addAndMakeVisible(delayValue.get());
 
-		clockGateButton = std::make_unique<UtilityButton>("Gate Status");
-		clockGateButton->setFont(FontOptions("Fira Code", "Regular", 12.0f));
-		clockGateButton->setRadius(3.0f);
-		clockGateButton->setBounds(delayLabel->getX(), delayLabel->getBottom() + 5, 100, 22);
-		clockGateButton->setClickingTogglesState(true);
-		clockGateButton->setToggleState(std::static_pointer_cast<OutputClock>(device)->getClockGate(), dontSendNotification);
-		clockGateButton->setTooltip("Toggles the output clock gate. If enabled, the clock output will be connected to the clock output line." + 
-			String(" If disabled, the clock output line will be held low."));
-		clockGateButton->addListener(this);
-		addAndMakeVisible(clockGateButton.get());
-
-		updateInfoString();
+		gateRunButton = std::make_unique<ToggleButton>("Synchronize clock to acquisition status");
+		gateRunButton->setBounds(delayLabel->getX(), delayLabel->getBottom() + 5, 250, 22);
+		gateRunButton->setClickingTogglesState(true);
+		gateRunButton->setToggleState(std::static_pointer_cast<OutputClock>(device)->getGateRun(), dontSendNotification);
+		gateRunButton->setTooltip("Toggles the output clock gate. If checked, the clock output will follow the acquisition status." + 
+			String(" If unchecked, the clock output will run continuously."));
+		gateRunButton->addListener(this);
+		addAndMakeVisible(gateRunButton.get());
 	}
 
 	type = Type::OUTPUTCLOCK_SETTINGS_INTERFACE;
@@ -108,28 +82,11 @@ OutputClockInterface::OutputClockInterface(std::shared_ptr<OutputClock> d, OnixS
 
 void OutputClockInterface::buttonClicked(Button* b)
 {
-	if (b == deviceEnableButton.get())
-	{
-		device->setEnabled(deviceEnableButton->getToggleState());
-		device->configureDevice();
-		if (canvas->foundInputSource()) canvas->resetContext();
-
-		if (device->isEnabled())
-		{
-			deviceEnableButton->setLabel("ENABLED");
-		}
-		else
-		{
-			deviceEnableButton->setLabel("DISABLED");
-		}
-
-		CoreServices::updateSignalChain(editor);
-	}
-	else if (b == clockGateButton.get())
+	if (b == gateRunButton.get())
 	{
 		auto clockOutput = std::static_pointer_cast<OutputClock>(device);
 
-		clockOutput->setClockGate(clockGateButton->getToggleState(), editor->acquisitionIsActive);
+		clockOutput->setGateRun(gateRunButton->getToggleState(), editor->acquisitionIsActive);
 	}
 }
 
@@ -178,20 +135,3 @@ void OutputClockInterface::labelTextChanged(Label* l)
 		d->setDelay(rate);
 	}
 }
-
-void OutputClockInterface::updateInfoString()
-{
-	String nameString, infoString;
-
-	nameString = "Breakout Board";
-
-	if (device != nullptr)
-	{
-		infoString = "Device: Output Clock";
-		infoString += "\n";
-		infoString += "\n";
-	}
-
-	infoLabel->setText(infoString, dontSendNotification);
-	nameLabel->setText(nameString, dontSendNotification);
-}
diff --git a/Source/UI/OutputClockInterface.h b/Source/UI/OutputClockInterface.h
index ab41f81..40531d5 100644
--- a/Source/UI/OutputClockInterface.h
+++ b/Source/UI/OutputClockInterface.h
@@ -52,7 +52,7 @@ class OutputClockInterface : 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 {};
 
 	/** Listener methods*/
 	void buttonClicked(Button*) override;
@@ -60,11 +60,6 @@ class OutputClockInterface : public SettingsInterface,
 
 private:
 
-	std::unique_ptr<Label> nameLabel;
-	std::unique_ptr<Label> infoLabel;
-
-	std::unique_ptr<UtilityButton> deviceEnableButton;
-
 	std::unique_ptr<Label> frequencyHzLabel;
 	std::unique_ptr<Label> frequencyHzValue;
 
@@ -74,7 +69,7 @@ class OutputClockInterface : public SettingsInterface,
 	std::unique_ptr<Label> delayLabel;
 	std::unique_ptr<Label> delayValue;
 
-	std::unique_ptr<UtilityButton> clockGateButton;
+	std::unique_ptr<ToggleButton> gateRunButton;
 
 	JUCE_LEAK_DETECTOR(OutputClockInterface);
 };

From b7e8a11a21a29661d0d78c256f13df8ea9fbd767 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Tue, 1 Apr 2025 12:10:27 -0400
Subject: [PATCH 23/25] Address review comments - Removed UI elements from
 AnalogIOInterface, now hard-coded to be in Volts, with a range of +/- 10
 Volts - Fixed OutputClock register writes, now they correctly set parameters
 chosen in the settings interface - Added manual update to the settings of
 specific devices. Note: This infrastructure will be modified at a later date
 to be less brittle - Unified the location of the enable button across tabs -
 Removed additional context resets that were leading to slow-downs in reading
 frames

---
 Source/Devices/AnalogIO.cpp          |  6 ++--
 Source/Devices/AnalogIO.h            |  4 ++-
 Source/Devices/OutputClock.cpp       |  2 +-
 Source/Devices/OutputClock.h         |  2 +-
 Source/FrameReader.cpp               |  4 ---
 Source/FrameReader.h                 |  2 --
 Source/OnixSource.cpp                | 18 +++++++---
 Source/OnixSourceCanvas.cpp          | 24 ++++++++++---
 Source/UI/AnalogIOInterface.cpp      | 50 ++--------------------------
 Source/UI/AnalogIOInterface.h        |  5 ---
 Source/UI/Bno055Interface.cpp        |  3 +-
 Source/UI/DigitalIOInterface.cpp     |  3 +-
 Source/UI/HarpSyncInputInterface.cpp |  3 +-
 13 files changed, 47 insertions(+), 79 deletions(-)

diff --git a/Source/Devices/AnalogIO.cpp b/Source/Devices/AnalogIO.cpp
index a5f39b8..91019d3 100644
--- a/Source/Devices/AnalogIO.cpp
+++ b/Source/Devices/AnalogIO.cpp
@@ -34,7 +34,7 @@ AnalogIO::AnalogIO(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<
 		std::floor(100000 / framesToAverage),
 		"AnalogInput",
 		ContinuousChannel::Type::ADC,
-		1.0f,
+		20.0f / numberOfDivisions, // NB: +/- 10 Volts
 		"V",
 		{});
 	streamInfos.add(analogInputStream);
@@ -45,10 +45,10 @@ AnalogIO::AnalogIO(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<
 	for (int i = 0; i < numChannels; i += 1)
 	{
 		channelDirection[i] = AnalogIODirection::Input;
-		channelVoltageRange[i] = AnalogIOVoltageRange::FiveVolts;
+		channelVoltageRange[i] = AnalogIOVoltageRange::TenVolts;
 	}
 
-	dataType = AnalogIODataType::S16;
+	dataType = AnalogIODataType::Volts;
 }
 
 int AnalogIO::configureDevice()
diff --git a/Source/Devices/AnalogIO.h b/Source/Devices/AnalogIO.h
index 4efeea7..7a623c1 100644
--- a/Source/Devices/AnalogIO.h
+++ b/Source/Devices/AnalogIO.h
@@ -138,6 +138,8 @@ class AnalogIO : public OnixDevice
 
 	void setDataType(AnalogIODataType type) { dataType = type; }
 
+	int getNumChannels() { return numChannels; }
+
 private:
 
 	DataBuffer* analogInputBuffer = nullptr;
@@ -152,7 +154,7 @@ class AnalogIO : public OnixDevice
 	std::array<AnalogIODirection, numChannels> channelDirection;
 	std::array<AnalogIOVoltageRange, numChannels> channelVoltageRange;
 
-	AnalogIODataType dataType = AnalogIODataType::S16;
+	AnalogIODataType dataType = AnalogIODataType::Volts;
 
 	Array<oni_frame_t*, CriticalSection, numFrames> frameArray;
 
diff --git a/Source/Devices/OutputClock.cpp b/Source/Devices/OutputClock.cpp
index e6b0bbd..5da4b1c 100644
--- a/Source/Devices/OutputClock.cpp
+++ b/Source/Devices/OutputClock.cpp
@@ -38,7 +38,7 @@ bool OutputClock::updateSettings()
 	oni_reg_val_t baseFreqHz = deviceContext->readRegister(deviceIdx, (oni_reg_addr_t)OutputClockRegisters::BASE_FREQ_HZ);
 
 	auto periodCycles = (uint32_t)(baseFreqHz / frequencyHz);
-	auto h = (uint32_t)(periodCycles * (dutyCycle / 100));
+	auto h = (uint32_t)(periodCycles * ((double)dutyCycle / 100.0));
 	auto l = periodCycles - h;
 	auto delayCycles = (uint32_t)(delay * baseFreqHz);
 
diff --git a/Source/Devices/OutputClock.h b/Source/Devices/OutputClock.h
index aaec942..934b2c8 100644
--- a/Source/Devices/OutputClock.h
+++ b/Source/Devices/OutputClock.h
@@ -88,7 +88,7 @@ class OutputClock : public OnixDevice
 
 private:
 
-	float frequencyHz = 1e6;
+	double frequencyHz = 1e6;
 	uint32_t dutyCycle = 50;
 	uint32_t delay = 0;
 
diff --git a/Source/FrameReader.cpp b/Source/FrameReader.cpp
index c61db8c..1f2ad09 100644
--- a/Source/FrameReader.cpp
+++ b/Source/FrameReader.cpp
@@ -30,10 +30,6 @@ FrameReader::FrameReader(OnixDeviceVector sources_, std::shared_ptr<Onix1> ctx_)
 	context = ctx_;
 }
 
-FrameReader::~FrameReader()
-{
-}
-
 void FrameReader::run()
 {
 	while (!threadShouldExit())
diff --git a/Source/FrameReader.h b/Source/FrameReader.h
index 1bfb6c6..6ecf901 100644
--- a/Source/FrameReader.h
+++ b/Source/FrameReader.h
@@ -34,8 +34,6 @@ class FrameReader : public Thread
 public:
 	FrameReader(OnixDeviceVector sources_, std::shared_ptr<Onix1>);
 
-	~FrameReader();
-
 	void run() override;
 
 private:
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index c761449..f5d5d3f 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -492,7 +492,6 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 		{
 			if (!source->isEnabled()) continue;
 
-			// create device info object
 			if (source->type == OnixDeviceType::NEUROPIXELS_1)
 			{
 				DeviceInfo::Settings deviceSettings{
@@ -577,6 +576,20 @@ void OnixSource::updateSettings(OwnedArray<ContinuousChannel>* continuousChannel
 
 				deviceInfos->add(new DeviceInfo(deviceSettings));
 
+				addIndividualStreams(source->streamInfos, dataStreams, deviceInfos, continuousChannels);
+			}
+			else if (source->type == OnixDeviceType::HARPSYNCINPUT)
+			{
+				DeviceInfo::Settings deviceSettings{
+					source->getName(),
+					"Harp Sync Input",
+					"harpsyncinput",
+					"0000000",
+					""
+				};
+
+				deviceInfos->add(new DeviceInfo(deviceSettings));
+
 				addIndividualStreams(source->streamInfos, dataStreams, deviceInfos, continuousChannels);
 			}
 		}
@@ -733,9 +746,6 @@ bool OnixSource::stopAcquisition()
 	{
 		oni_size_t reg = 0;
 		context->setOption(ONI_OPT_RUNNING, reg);
-
-		uint32_t val = 1;
-		context->setOption(ONI_OPT_RESET, val);
 	}
 
 	for (const auto& source : sources)
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index 4180422..ec6a15e 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -168,21 +168,37 @@ void OnixSourceCanvas::updateSettingsInterfaceDataSource(std::shared_ptr<OnixDev
 	if (ind == -1)
 	{
 		if (device->type != OnixDeviceType::MEMORYMONITOR && device->type != OnixDeviceType::HEARTBEAT)
-			LOGD("Unable to match " + device->getName() + " to an open tab."); 
-		
+			LOGD("Unable to match " + device->getName() + " to an open tab.");
+
 		return;
 	}
 
 	if (device->type == OnixDeviceType::NEUROPIXELS_1)
 	{
-		// NB: Neuropixels-specific settings need to be updated
 		auto npx1Found = std::static_pointer_cast<Neuropixels_1>(device);
 		auto npx1Selected = std::static_pointer_cast<Neuropixels_1>(settingsInterfaces[ind]->device);
 		npx1Found->setSettings(npx1Selected->settings.get());
 		npx1Found->adcCalibrationFilePath = npx1Selected->adcCalibrationFilePath;
 		npx1Found->gainCalibrationFilePath = npx1Selected->gainCalibrationFilePath;
 	}
-	// TODO: Add more devices, since they will have device-specific settings to be updated
+	else if (device->type == OnixDeviceType::OUTPUTCLOCK)
+	{
+		auto outputClockFound = std::static_pointer_cast<OutputClock>(device);
+		auto outputClockSelected = std::static_pointer_cast<OutputClock>(settingsInterfaces[ind]->device);
+		outputClockFound->setDelay(outputClockSelected->getDelay());
+		outputClockFound->setDutyCycle(outputClockSelected->getDutyCycle());
+		outputClockFound->setFrequencyHz(outputClockSelected->getFrequencyHz());
+		outputClockFound->setGateRun(outputClockSelected->getGateRun());
+	}
+	else if (device->type == OnixDeviceType::ANALOGIO)
+	{
+		auto analogIOFound = std::static_pointer_cast<AnalogIO>(device);
+		auto analogIOSelected = std::static_pointer_cast<AnalogIO>(settingsInterfaces[ind]->device);
+		for (int i = 0; i < analogIOFound->getNumChannels(); i++)
+		{
+			analogIOFound->setChannelDirection(i, analogIOSelected->getChannelDirection(i));
+		}
+	}
 
 	device->setEnabled(settingsInterfaces[ind]->device->isEnabled());
 	settingsInterfaces[ind]->device.reset();
diff --git a/Source/UI/AnalogIOInterface.cpp b/Source/UI/AnalogIOInterface.cpp
index ff5b105..baaa198 100644
--- a/Source/UI/AnalogIOInterface.cpp
+++ b/Source/UI/AnalogIOInterface.cpp
@@ -41,23 +41,9 @@ AnalogIOInterface::AnalogIOInterface(std::shared_ptr<AnalogIO> d, OnixSourceEdit
 		addAndMakeVisible(deviceEnableButton.get());
 		deviceEnableButton->setToggleState(device->isEnabled(), sendNotification);
 
-		dataTypeLabel = std::make_unique<Label>("dataTypeLabel", "Data Type");
-		dataTypeLabel->setFont(font);
-		dataTypeLabel->setBounds(deviceEnableButton->getX(), deviceEnableButton->getBottom() + 5, 80, 20);
-		addAndMakeVisible(dataTypeLabel.get());
-
-		dataTypeComboBox = std::make_unique<ComboBox>("dataTypeComboBox");
-		dataTypeComboBox->setBounds(dataTypeLabel->getRight() + 5, dataTypeLabel->getY(), 65, dataTypeLabel->getHeight());
-		dataTypeComboBox->addListener(this);
-		dataTypeComboBox->setTooltip("Set the data type output by this device. S16 outputs signed 16-bit data, while Volts outputs 32-bit floating point data.");
-		dataTypeComboBox->addItem("S16", 1);
-		dataTypeComboBox->addItem("Volts", 2);
-		dataTypeComboBox->setSelectedId(getDataTypeId(std::static_pointer_cast<AnalogIO>(device)), dontSendNotification);
-		addAndMakeVisible(dataTypeComboBox.get());
-
-		auto prevLabelRectangle = dataTypeLabel->getBounds().translated(0, 10);
+		auto prevLabelRectangle = deviceEnableButton->getBounds().translated(0, 20);
 		prevLabelRectangle.setWidth(140);
-		auto prevComboBoxRectangle = dataTypeComboBox->getBounds().translated(0, 10);
+		auto prevComboBoxRectangle = deviceEnableButton->getBounds().translated(100, 20);
 		prevComboBoxRectangle.setWidth(80);
 		prevComboBoxRectangle.setX(prevLabelRectangle.getRight() + 5);
 
@@ -88,19 +74,6 @@ AnalogIOInterface::AnalogIOInterface(std::shared_ptr<AnalogIO> d, OnixSourceEdit
 			addAndMakeVisible(channelDirectionComboBoxes[i].get());
 
 			prevComboBoxRectangle = channelDirectionComboBoxes[i]->getBounds();
-
-			voltageRangeLabels[i] = std::make_unique<Label>("voltageRangeLabel" + String(i), "Voltage Range");
-			voltageRangeLabels[i]->setBounds(prevComboBoxRectangle.getRight() + 10, prevComboBoxRectangle.getY(), 110, prevComboBoxRectangle.getHeight());
-			voltageRangeLabels[i]->setFont(font);
-			addAndMakeVisible(voltageRangeLabels[i].get());
-
-			voltageRangeComboBoxes[i] = std::make_unique<ComboBox>("voltageRangeComboBox" + String(i));
-			voltageRangeComboBoxes[i]->setBounds(voltageRangeLabels[i]->getRight() + 4, voltageRangeLabels[i]->getY(), prevComboBoxRectangle.getWidth(), prevComboBoxRectangle.getHeight());
-			voltageRangeComboBoxes[i]->addListener(this);
-			voltageRangeComboBoxes[i]->setTooltip("Sets the voltage range of channel " + String(i));
-			voltageRangeComboBoxes[i]->addItemList(voltageRangeList, 1);
-			voltageRangeComboBoxes[i]->setSelectedId(getChannelVoltageRangeId(std::static_pointer_cast<AnalogIO>(device), i), dontSendNotification);
-			addAndMakeVisible(voltageRangeComboBoxes[i].get());
 		}
 
 		updateInfoString();
@@ -115,7 +88,6 @@ void AnalogIOInterface::buttonClicked(Button* button)
 	{
 		device->setEnabled(deviceEnableButton->getToggleState());
 		device->configureDevice();
-		if (canvas->foundInputSource()) canvas->resetContext();
 
 		if (device->isEnabled())
 		{
@@ -132,13 +104,6 @@ void AnalogIOInterface::buttonClicked(Button* button)
 
 void AnalogIOInterface::comboBoxChanged(ComboBox* cb)
 {
-	if (cb == dataTypeComboBox.get())
-	{
-		AnalogIODataType newType = dataTypeComboBox->getText() == "S16" ? AnalogIODataType::S16 : AnalogIODataType::Volts;
-		std::static_pointer_cast<AnalogIO>(device)->setDataType(newType);
-		return;
-	}
-
 	for (int i = 0; i < numChannels; i += 1)
 	{
 		if (cb == channelDirectionComboBoxes[i].get())
@@ -147,17 +112,6 @@ void AnalogIOInterface::comboBoxChanged(ComboBox* cb)
 			std::static_pointer_cast<AnalogIO>(device)->setChannelDirection(i, newDirection);
 			return;
 		}
-		else if (cb == voltageRangeComboBoxes[i].get())
-		{
-			AnalogIOVoltageRange newVoltageRange = AnalogIOVoltageRange::TwoPointFiveVolts;
-			
-			if (voltageRangeComboBoxes[i]->getText() == "+/- 2.5 V") newVoltageRange = AnalogIOVoltageRange::TwoPointFiveVolts;
-			else if (voltageRangeComboBoxes[i]->getText() == "+/- 5.0 V") newVoltageRange = AnalogIOVoltageRange::FiveVolts;
-			else if (voltageRangeComboBoxes[i]->getText() == "+/- 10.0 V") newVoltageRange = AnalogIOVoltageRange::TenVolts;
-
-			std::static_pointer_cast<AnalogIO>(device)->setChannelVoltageRange(i, newVoltageRange);
-			return;
-		}
 	}
 }
 
diff --git a/Source/UI/AnalogIOInterface.h b/Source/UI/AnalogIOInterface.h
index 33251f5..80fd308 100644
--- a/Source/UI/AnalogIOInterface.h
+++ b/Source/UI/AnalogIOInterface.h
@@ -62,11 +62,6 @@ class AnalogIOInterface : public SettingsInterface,
 
 	static const int numChannels = 12;
 
-	std::unique_ptr<Label> dataTypeLabel;
-	std::unique_ptr<ComboBox> dataTypeComboBox;
-
-	std::array<std::unique_ptr<Label>, numChannels> voltageRangeLabels;
-	std::array<std::unique_ptr<ComboBox>, numChannels> voltageRangeComboBoxes;
 	std::array<std::unique_ptr<Label>, numChannels> channelDirectionLabels;
 	std::array<std::unique_ptr<ComboBox>, numChannels> channelDirectionComboBoxes;
 
diff --git a/Source/UI/Bno055Interface.cpp b/Source/UI/Bno055Interface.cpp
index d076786..ebbbc8f 100644
--- a/Source/UI/Bno055Interface.cpp
+++ b/Source/UI/Bno055Interface.cpp
@@ -31,7 +31,7 @@ Bno055Interface::Bno055Interface(std::shared_ptr<Bno055> d, OnixSourceEditor* e,
 		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->setBounds(50, 40, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
 		deviceEnableButton->setTooltip("If disabled, BNO055 device will not stream data during acquisition");
 		deviceEnableButton->setToggleState(true, dontSendNotification);
@@ -49,7 +49,6 @@ void Bno055Interface::buttonClicked(Button* button)
 	{
 		device->setEnabled(deviceEnableButton->getToggleState());
 		device->configureDevice();
-		if (canvas->foundInputSource()) canvas->resetContext();
 
 		if (device->isEnabled())
 		{
diff --git a/Source/UI/DigitalIOInterface.cpp b/Source/UI/DigitalIOInterface.cpp
index e8e765c..09ff1c3 100644
--- a/Source/UI/DigitalIOInterface.cpp
+++ b/Source/UI/DigitalIOInterface.cpp
@@ -31,7 +31,7 @@ DigitalIOInterface::DigitalIOInterface(std::shared_ptr<DigitalIO> d, OnixSourceE
 		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->setBounds(50, 40, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
 		deviceEnableButton->setTooltip("If disabled, the Digital IO device will not stream events during acquisition");
 		deviceEnableButton->setToggleState(true, dontSendNotification);
@@ -49,7 +49,6 @@ void DigitalIOInterface::buttonClicked(Button* button)
 	{
 		device->setEnabled(deviceEnableButton->getToggleState());
 		device->configureDevice();
-		if (canvas->foundInputSource()) canvas->resetContext();
 
 		if (device->isEnabled())
 		{
diff --git a/Source/UI/HarpSyncInputInterface.cpp b/Source/UI/HarpSyncInputInterface.cpp
index 5634ee1..4ec467b 100644
--- a/Source/UI/HarpSyncInputInterface.cpp
+++ b/Source/UI/HarpSyncInputInterface.cpp
@@ -33,7 +33,7 @@ HarpSyncInputInterface::HarpSyncInputInterface(std::shared_ptr<HarpSyncInput> d,
 		deviceEnableButton->setRadius(3.0f);
 		deviceEnableButton->setBounds(50, 40, 100, 22);
 		deviceEnableButton->setClickingTogglesState(true);
-		deviceEnableButton->setTooltip("If disabled, Memory Monitor will not stream data during acquisition");
+		deviceEnableButton->setTooltip("If disabled, Harp Sync Input will not stream data during acquisition");
 		deviceEnableButton->setToggleState(true, dontSendNotification);
 		deviceEnableButton->addListener(this);
 		addAndMakeVisible(deviceEnableButton.get());
@@ -49,7 +49,6 @@ void HarpSyncInputInterface::buttonClicked(Button* button)
 	{
 		device->setEnabled(deviceEnableButton->getToggleState());
 		device->configureDevice();
-		if (canvas->foundInputSource()) canvas->resetContext();
 
 		if (device->isEnabled())
 		{

From 3dc3531e2f881c5f737a2d45b22bdd1bc1bf3b74 Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Thu, 3 Apr 2025 12:25:22 -0400
Subject: [PATCH 24/25] Update copyright - Change to using #pragma instead of
 #ifndef

---
 Source/Devices/AnalogIO.cpp          |  3 +--
 Source/Devices/AnalogIO.h            |  8 ++-----
 Source/Devices/Bno055.cpp            |  3 +--
 Source/Devices/Bno055.h              |  8 ++-----
 Source/Devices/DS90UB9x.h            | 23 ++++++++++++++++++++
 Source/Devices/DeviceList.h          | 22 +++++++++++++++++++
 Source/Devices/DigitalIO.cpp         |  3 +--
 Source/Devices/DigitalIO.h           |  8 ++-----
 Source/Devices/HarpSyncInput.cpp     |  3 +--
 Source/Devices/HarpSyncInput.h       |  8 ++-----
 Source/Devices/HeadStageEEPROM.cpp   | 22 +++++++++++++++++++
 Source/Devices/HeadStageEEPROM.h     | 23 ++++++++++++++++++++
 Source/Devices/Heartbeat.cpp         |  3 +--
 Source/Devices/Heartbeat.h           |  8 ++-----
 Source/Devices/MemoryMonitor.cpp     |  3 +--
 Source/Devices/MemoryMonitor.h       |  8 ++-----
 Source/Devices/Neuropixels2e.cpp     | 22 +++++++++++++++++++
 Source/Devices/Neuropixels2e.h       | 23 ++++++++++++++++++++
 Source/Devices/Neuropixels_1.cpp     |  3 +--
 Source/Devices/Neuropixels_1.h       |  8 ++-----
 Source/Devices/OutputClock.cpp       |  3 +--
 Source/Devices/OutputClock.h         |  8 ++-----
 Source/Devices/PortController.cpp    |  3 +--
 Source/Devices/PortController.h      |  8 ++-----
 Source/Formats/ProbeInterface.h      |  8 ++-----
 Source/FrameReader.cpp               |  3 +--
 Source/FrameReader.h                 |  8 ++-----
 Source/I2CRegisterContext.cpp        |  4 +---
 Source/I2CRegisterContext.h          |  8 ++-----
 Source/NeuropixComponents.h          |  8 ++-----
 Source/Onix1.cpp                     |  3 +--
 Source/Onix1.h                       |  8 ++-----
 Source/OnixDevice.cpp                |  3 +--
 Source/OnixDevice.h                  |  8 ++-----
 Source/OnixSource.cpp                |  3 +--
 Source/OnixSource.h                  |  8 ++-----
 Source/OnixSourceCanvas.cpp          | 27 +++++++++++------------
 Source/OnixSourceCanvas.h            |  8 ++-----
 Source/OnixSourceEditor.cpp          |  3 +--
 Source/OnixSourceEditor.h            |  8 ++-----
 Source/UI/ActivityView.h             | 32 ++++++++++++----------------
 Source/UI/AnalogIOInterface.cpp      |  3 +--
 Source/UI/AnalogIOInterface.h        |  8 ++-----
 Source/UI/Bno055Interface.cpp        |  3 +--
 Source/UI/Bno055Interface.h          |  8 ++-----
 Source/UI/CustomViewport.h           |  8 ++-----
 Source/UI/DigitalIOInterface.cpp     |  3 +--
 Source/UI/DigitalIOInterface.h       |  8 ++-----
 Source/UI/HarpSyncInputInterface.cpp |  3 +--
 Source/UI/HarpSyncInputInterface.h   |  8 ++-----
 Source/UI/InterfaceList.h            | 22 +++++++++++++++++++
 Source/UI/NeuropixV1Interface.cpp    |  3 +--
 Source/UI/NeuropixV1Interface.h      |  8 ++-----
 Source/UI/OutputClockInterface.cpp   |  3 +--
 Source/UI/OutputClockInterface.h     |  8 ++-----
 Source/UI/ProbeBrowser.cpp           | 27 +++++++++++------------
 Source/UI/ProbeBrowser.h             | 32 ++++++++++++----------------
 Source/UI/SettingsInterface.h        |  8 ++-----
 58 files changed, 284 insertions(+), 263 deletions(-)

diff --git a/Source/Devices/AnalogIO.cpp b/Source/Devices/AnalogIO.cpp
index 91019d3..bc6eaaa 100644
--- a/Source/Devices/AnalogIO.cpp
+++ b/Source/Devices/AnalogIO.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/Devices/AnalogIO.h b/Source/Devices/AnalogIO.h
index 7a623c1..ef5772a 100644
--- a/Source/Devices/AnalogIO.h
+++ b/Source/Devices/AnalogIO.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __ANALOGIO_H__
-#define __ANALOGIO_H__
+#pragma once
 
 #include "../OnixDevice.h"
 
@@ -176,5 +174,3 @@ class AnalogIO : public OnixDevice
 
 	JUCE_LEAK_DETECTOR(AnalogIO);
 };
-
-#endif
diff --git a/Source/Devices/Bno055.cpp b/Source/Devices/Bno055.cpp
index 9a69600..49cc3e3 100644
--- a/Source/Devices/Bno055.cpp
+++ b/Source/Devices/Bno055.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/Devices/Bno055.h b/Source/Devices/Bno055.h
index 10b2731..9f4c6cf 100644
--- a/Source/Devices/Bno055.h
+++ b/Source/Devices/Bno055.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef BNO055_H_DEFINED
-#define BNO055_H_DEFINED
+#pragma once
 
 #include "../OnixDevice.h"
 
@@ -82,5 +80,3 @@ class Bno055 : public OnixDevice
 
 	JUCE_LEAK_DETECTOR(Bno055);
 };
-
-#endif
diff --git a/Source/Devices/DS90UB9x.h b/Source/Devices/DS90UB9x.h
index 57ca7b7..93463b9 100644
--- a/Source/Devices/DS90UB9x.h
+++ b/Source/Devices/DS90UB9x.h
@@ -1,4 +1,27 @@
+/*
+    ------------------------------------------------------------------
+
+    Copyright (C) Open Ephys
+
+    ------------------------------------------------------------------
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
 #pragma once
+
 #include <cstdint>
 
 static class DS90UB9x
diff --git a/Source/Devices/DeviceList.h b/Source/Devices/DeviceList.h
index b5c737a..30ebb78 100644
--- a/Source/Devices/DeviceList.h
+++ b/Source/Devices/DeviceList.h
@@ -1,3 +1,25 @@
+/*
+	------------------------------------------------------------------
+
+	Copyright (C) Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
 #include "Bno055.h"
 #include "DS90UB9x.h"
 #include "HeadStageEEPROM.h"
diff --git a/Source/Devices/DigitalIO.cpp b/Source/Devices/DigitalIO.cpp
index 01fd656..32dff0f 100644
--- a/Source/Devices/DigitalIO.cpp
+++ b/Source/Devices/DigitalIO.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/Devices/DigitalIO.h b/Source/Devices/DigitalIO.h
index 3c641c6..3e9d02c 100644
--- a/Source/Devices/DigitalIO.h
+++ b/Source/Devices/DigitalIO.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __DIGITALIO_H__
-#define __DIGITALIO_H__
+#pragma once
 
 #include "../OnixDevice.h"
 
@@ -102,5 +100,3 @@ class DigitalIO : public OnixDevice
 
 	JUCE_LEAK_DETECTOR(DigitalIO);
 };
-
-#endif
diff --git a/Source/Devices/HarpSyncInput.cpp b/Source/Devices/HarpSyncInput.cpp
index 8fdd11d..1af5d66 100644
--- a/Source/Devices/HarpSyncInput.cpp
+++ b/Source/Devices/HarpSyncInput.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/Devices/HarpSyncInput.h b/Source/Devices/HarpSyncInput.h
index c76253a..cabdc2d 100644
--- a/Source/Devices/HarpSyncInput.h
+++ b/Source/Devices/HarpSyncInput.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __HARPSYNCINPUT_H__
-#define __HARPSYNCINPUT_H__
+#pragma once
 
 #include "../OnixDevice.h"
 
@@ -86,5 +84,3 @@ class HarpSyncInput : public OnixDevice
 
 	JUCE_LEAK_DETECTOR(HarpSyncInput);
 };
-
-#endif
diff --git a/Source/Devices/HeadStageEEPROM.cpp b/Source/Devices/HeadStageEEPROM.cpp
index 1ae4cc4..7f2577c 100644
--- a/Source/Devices/HeadStageEEPROM.cpp
+++ b/Source/Devices/HeadStageEEPROM.cpp
@@ -1,3 +1,25 @@
+/*
+	------------------------------------------------------------------
+
+	Copyright (C) Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
 #include "HeadStageEEPROM.h"
 #include "DS90UB9x.h"
 #include <iostream>
diff --git a/Source/Devices/HeadStageEEPROM.h b/Source/Devices/HeadStageEEPROM.h
index c5936db..c211a0c 100644
--- a/Source/Devices/HeadStageEEPROM.h
+++ b/Source/Devices/HeadStageEEPROM.h
@@ -1,3 +1,26 @@
+/*
+	------------------------------------------------------------------
+
+	Copyright (C) Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+
 #pragma once
 
 #include "../I2CRegisterContext.h"
diff --git a/Source/Devices/Heartbeat.cpp b/Source/Devices/Heartbeat.cpp
index 4275be2..6ddd99f 100644
--- a/Source/Devices/Heartbeat.cpp
+++ b/Source/Devices/Heartbeat.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/Devices/Heartbeat.h b/Source/Devices/Heartbeat.h
index 1f2b232..e23bcfc 100644
--- a/Source/Devices/Heartbeat.h
+++ b/Source/Devices/Heartbeat.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __HEARTBEAT_H__
-#define __HEARTBEAT_H__
+#pragma once
 
 #include "../OnixDevice.h"
 
@@ -66,5 +64,3 @@ class Heartbeat : public OnixDevice
 
 	JUCE_LEAK_DETECTOR(Heartbeat);
 };
-
-#endif
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index a969030..3af439c 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index e796226..678fc17 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef MEMORYMONITOR_H_DEFINED
-#define MEMORYMONITOR_H_DEFINED
+#pragma once
 
 #include "../OnixDevice.h"
 
@@ -128,5 +126,3 @@ class MemoryMonitorUsage : public LevelMonitor
 
 	JUCE_LEAK_DETECTOR(MemoryMonitorUsage);
 };
-
-#endif
diff --git a/Source/Devices/Neuropixels2e.cpp b/Source/Devices/Neuropixels2e.cpp
index fe4e480..8ccb09d 100644
--- a/Source/Devices/Neuropixels2e.cpp
+++ b/Source/Devices/Neuropixels2e.cpp
@@ -1,3 +1,25 @@
+/*
+	------------------------------------------------------------------
+
+	Copyright (C) Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
 #include "Neuropixels2e.h"
 #include "DS90UB9x.h"
 
diff --git a/Source/Devices/Neuropixels2e.h b/Source/Devices/Neuropixels2e.h
index 2bf1d09..2c7f692 100644
--- a/Source/Devices/Neuropixels2e.h
+++ b/Source/Devices/Neuropixels2e.h
@@ -1,4 +1,27 @@
+/*
+	------------------------------------------------------------------
+
+	Copyright (C) Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
 #pragma once
+
 #include "../OnixDevice.h"
 #include "../I2CRegisterContext.h"
 
diff --git a/Source/Devices/Neuropixels_1.cpp b/Source/Devices/Neuropixels_1.cpp
index 1657179..3854746 100644
--- a/Source/Devices/Neuropixels_1.cpp
+++ b/Source/Devices/Neuropixels_1.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/Devices/Neuropixels_1.h b/Source/Devices/Neuropixels_1.h
index 5279c29..2c4ac49 100644
--- a/Source/Devices/Neuropixels_1.h
+++ b/Source/Devices/Neuropixels_1.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef NEUROPIXELS1_H_DEFINED
-#define NEUROPIXELS1_H_DEFINED
+#pragma once
 
 #include "../OnixDevice.h"
 #include "../NeuropixComponents.h"
@@ -299,5 +297,3 @@ class BackgroundUpdaterWithProgressWindow : public ThreadWithProgressWindow
 
 	JUCE_LEAK_DETECTOR(BackgroundUpdaterWithProgressWindow);
 };
-
-#endif
diff --git a/Source/Devices/OutputClock.cpp b/Source/Devices/OutputClock.cpp
index 5da4b1c..c3f1ca4 100644
--- a/Source/Devices/OutputClock.cpp
+++ b/Source/Devices/OutputClock.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/Devices/OutputClock.h b/Source/Devices/OutputClock.h
index 934b2c8..d93f859 100644
--- a/Source/Devices/OutputClock.h
+++ b/Source/Devices/OutputClock.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __OUTPUTCLOCK_H__
-#define __OUTPUTCLOCK_H__
+#pragma once
 
 #include "../OnixDevice.h"
 
@@ -98,5 +96,3 @@ class OutputClock : public OnixDevice
 
 	JUCE_LEAK_DETECTOR(OutputClock);
 };
-
-#endif // !__OUTPUTCLOCK_H__
diff --git a/Source/Devices/PortController.cpp b/Source/Devices/PortController.cpp
index b92352e..480a818 100644
--- a/Source/Devices/PortController.cpp
+++ b/Source/Devices/PortController.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2023 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/Devices/PortController.h b/Source/Devices/PortController.h
index 9de3c7a..19706f5 100644
--- a/Source/Devices/PortController.h
+++ b/Source/Devices/PortController.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2023 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __PORTCONTROLLER_H__
-#define __PORTCONTROLLER_H__
+#pragma once
 
 #include <thread>
 #include <chrono>
@@ -145,5 +143,3 @@ class PortController : public OnixDevice
 
 	JUCE_LEAK_DETECTOR(PortController);
 };
-
-#endif // !__PORTCONTROLLER_H__
diff --git a/Source/Formats/ProbeInterface.h b/Source/Formats/ProbeInterface.h
index 6865c16..eca22e1 100644
--- a/Source/Formats/ProbeInterface.h
+++ b/Source/Formats/ProbeInterface.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2024 Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __PROBEINTERFACE_H__
-#define __PROBEINTERFACE_H__
+#pragma once
 
 #include "../NeuropixComponents.h"
 
@@ -171,5 +169,3 @@ class ProbeInterfaceJson
 		return true;
 	}
 };
-
-#endif
\ No newline at end of file
diff --git a/Source/FrameReader.cpp b/Source/FrameReader.cpp
index 1f2ad09..ae15ed5 100644
--- a/Source/FrameReader.cpp
+++ b/Source/FrameReader.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2023 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/FrameReader.h b/Source/FrameReader.h
index 6ecf901..210786a 100644
--- a/Source/FrameReader.h
+++ b/Source/FrameReader.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2023 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __FRAMEREADER_H__
-#define __FRAMEREADER_H__
+#pragma once
 
 #include <DataThreadHeaders.h>
 
@@ -43,5 +41,3 @@ class FrameReader : public Thread
 
 	JUCE_LEAK_DETECTOR(FrameReader);
 };
-
-#endif // __FRAMEREADER_H__
diff --git a/Source/I2CRegisterContext.cpp b/Source/I2CRegisterContext.cpp
index 06acc1e..46405e6 100644
--- a/Source/I2CRegisterContext.cpp
+++ b/Source/I2CRegisterContext.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -22,7 +21,6 @@
 */
 
 #include "I2CRegisterContext.h"
-#include <iostream>
 
 I2CRegisterContext::I2CRegisterContext(uint32_t address_, const oni_dev_idx_t devIdx_, std::shared_ptr<Onix1> ctx_)
 	: deviceIndex(devIdx_), i2caddress(address_)
diff --git a/Source/I2CRegisterContext.h b/Source/I2CRegisterContext.h
index d08f793..1820d1b 100644
--- a/Source/I2CRegisterContext.h
+++ b/Source/I2CRegisterContext.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __I2CRegisterContext_H__
-#define __I2CRegisterContext_H__
+#pragma once
 
 #include "ProcessorHeaders.h"
 
@@ -53,5 +51,3 @@ class I2CRegisterContext
 
 	JUCE_LEAK_DETECTOR(I2CRegisterContext);
 };
-
-#endif // !__I2CRegisterContext_H__
diff --git a/Source/NeuropixComponents.h b/Source/NeuropixComponents.h
index fe4e5f3..e29363c 100644
--- a/Source/NeuropixComponents.h
+++ b/Source/NeuropixComponents.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __NEUROPIXELCOMPONENTS_H__
-#define __NEUROPIXELCOMPONENTS_H__
+#pragma once
 
 #include <DataThreadHeaders.h>
 #include <stdio.h>
@@ -162,5 +160,3 @@ struct ProbeSettings
 
 	ProbeMetadata probeMetadata;
 };
-
-#endif  // __NEUROPIXELCOMPONENTS_H__
diff --git a/Source/Onix1.cpp b/Source/Onix1.cpp
index cae2c61..7dfdcb0 100644
--- a/Source/Onix1.cpp
+++ b/Source/Onix1.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/Onix1.h b/Source/Onix1.h
index 2913f68..279a8be 100644
--- a/Source/Onix1.h
+++ b/Source/Onix1.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2023 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __ONIX1_H__
-#define __ONIX1_H__
+#pragma once
 
 #include <oni.h>
 #include <onix.h>
@@ -116,5 +114,3 @@ class Onix1
 
 	void get_opt_(int option, void* value, size_t* size);
 };
-
-#endif // !__ONIX1_H__
diff --git a/Source/OnixDevice.cpp b/Source/OnixDevice.cpp
index e49e940..1ae5b3b 100644
--- a/Source/OnixDevice.cpp
+++ b/Source/OnixDevice.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/OnixDevice.h b/Source/OnixDevice.h
index fb32c77..b3a7a6d 100644
--- a/Source/OnixDevice.h
+++ b/Source/OnixDevice.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __OnixDevice_H__
-#define __OnixDevice_H__
+#pragma once
 
 #include <DataThreadHeaders.h>
 
@@ -186,5 +184,3 @@ class OnixDevice
 };
 
 using OnixDeviceVector = std::vector<std::shared_ptr<OnixDevice>>;
-
-#endif
diff --git a/Source/OnixSource.cpp b/Source/OnixSource.cpp
index f5d5d3f..a1a864b 100644
--- a/Source/OnixSource.cpp
+++ b/Source/OnixSource.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2023 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/OnixSource.h b/Source/OnixSource.h
index 4c6bc3f..c5dccf3 100644
--- a/Source/OnixSource.h
+++ b/Source/OnixSource.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2023 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __OnixSource_H__
-#define __OnixSource_H__
+#pragma once
 
 #include <DataThreadHeaders.h>
 
@@ -147,5 +145,3 @@ class OnixSource : public DataThread
 
 	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OnixSource);
 };
-
-#endif  // __OnixSource_H__
diff --git a/Source/OnixSourceCanvas.cpp b/Source/OnixSourceCanvas.cpp
index ec6a15e..2db1685 100644
--- a/Source/OnixSourceCanvas.cpp
+++ b/Source/OnixSourceCanvas.cpp
@@ -1,23 +1,22 @@
 /*
-------------------------------------------------------------------
+	------------------------------------------------------------------
 
-This file is part of the Open Ephys GUI
-Copyright(C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright(C) Open Ephys
 
-------------------------------------------------------------------
+	------------------------------------------------------------------
 
-This program is free software : you can redistribute it and /or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+	This program is free software : you can redistribute it and /or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
-GNU General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+	GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program.If not, see < http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU General Public License
+	along with this program.If not, see < http://www.gnu.org/licenses/>.
 
 */
 
diff --git a/Source/OnixSourceCanvas.h b/Source/OnixSourceCanvas.h
index bb15e12..c7bbced 100644
--- a/Source/OnixSourceCanvas.h
+++ b/Source/OnixSourceCanvas.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-# ifndef __ONIXSOURCECANVAS_H__
-# define __ONIXSOURCECANVAS_H__
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 
@@ -180,5 +178,3 @@ class OnixSourceCanvas : public Visualizer
 
 	JUCE_LEAK_DETECTOR(OnixSourceCanvas);
 };
-
-# endif // __ONIXSOURCECANVAS_H__
diff --git a/Source/OnixSourceEditor.cpp b/Source/OnixSourceEditor.cpp
index 2ce82c6..171f1b8 100644
--- a/Source/OnixSourceEditor.cpp
+++ b/Source/OnixSourceEditor.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2023 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/OnixSourceEditor.h b/Source/OnixSourceEditor.h
index a8d97ab..a2b5d7a 100644
--- a/Source/OnixSourceEditor.h
+++ b/Source/OnixSourceEditor.h
@@ -1,8 +1,7 @@
 /*
     ------------------------------------------------------------------
 
-    This file is part of the Open Ephys GUI
-    Copyright (C) 2023 Allen Institute for Brain Science and Open Ephys
+    Copyright (C) Open Ephys
 
     ------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __OnixSourceEditor_H__
-#define __OnixSourceEditor_H__
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 
@@ -113,5 +111,3 @@ class OnixSourceEditor : public VisualizerEditor,
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(OnixSourceEditor);
 };
-
-#endif // __OnixSourceEditor_H__
diff --git a/Source/UI/ActivityView.h b/Source/UI/ActivityView.h
index f9f82f9..c59f805 100644
--- a/Source/UI/ActivityView.h
+++ b/Source/UI/ActivityView.h
@@ -1,28 +1,26 @@
 /*
-------------------------------------------------------------------
+    ------------------------------------------------------------------
 
-This file is part of the Open Ephys GUI
-Copyright (C) 2019 Allen Institute for Brain Science and Open Ephys
+    Copyright (C) Open Ephys
 
-------------------------------------------------------------------
+    ------------------------------------------------------------------
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#ifndef __ACTIVITYVIEW_H__
-#define __ACTIVITYVIEW_H__
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 #include <limits>
@@ -124,5 +122,3 @@ class ActivityView
     std::vector<int> counters;
     int updateInterval;
 };
-
-#endif  // __ACTIVITYVIEW_H__
diff --git a/Source/UI/AnalogIOInterface.cpp b/Source/UI/AnalogIOInterface.cpp
index baaa198..7d304c0 100644
--- a/Source/UI/AnalogIOInterface.cpp
+++ b/Source/UI/AnalogIOInterface.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/UI/AnalogIOInterface.h b/Source/UI/AnalogIOInterface.h
index 80fd308..b97529a 100644
--- a/Source/UI/AnalogIOInterface.h
+++ b/Source/UI/AnalogIOInterface.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __ANALOGIOINTERFACE_H__
-#define __ANALOGIOINTERFACE_H__
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 
@@ -73,5 +71,3 @@ class AnalogIOInterface : public SettingsInterface,
 
 	JUCE_LEAK_DETECTOR(AnalogIOInterface);
 };
-
-#endif // !__AnalogIOInterface_H__
diff --git a/Source/UI/Bno055Interface.cpp b/Source/UI/Bno055Interface.cpp
index ebbbc8f..de3af62 100644
--- a/Source/UI/Bno055Interface.cpp
+++ b/Source/UI/Bno055Interface.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright(C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright(C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/UI/Bno055Interface.h b/Source/UI/Bno055Interface.h
index a7478d5..5eeb121 100644
--- a/Source/UI/Bno055Interface.h
+++ b/Source/UI/Bno055Interface.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __BNO055INTERFACE_H__
-#define __BNO055INTERFACE_H__
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 
@@ -62,5 +60,3 @@ class Bno055Interface : public SettingsInterface,
 
 	JUCE_LEAK_DETECTOR(Bno055Interface);
 };
-
-#endif // !__BNO055INTERFACE_H__
diff --git a/Source/UI/CustomViewport.h b/Source/UI/CustomViewport.h
index 0e45e6c..c093b6f 100644
--- a/Source/UI/CustomViewport.h
+++ b/Source/UI/CustomViewport.h
@@ -1,8 +1,7 @@
 /*
     ------------------------------------------------------------------
 
-    This file is part of the Open Ephys GUI
-    Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+    Copyright (C) Open Ephys
 
     ------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __CUSTOMVIEWPORT_H__
-#define __CUSTOMVIEWPORT_H__
+#pragma once
 
 #include "SettingsInterface.h"
 
@@ -79,5 +77,3 @@ class CustomViewport : public Component
 
     JUCE_LEAK_DETECTOR(CustomViewport);
 };
-
-#endif // __CUSTOMVIEWPORT_H__
diff --git a/Source/UI/DigitalIOInterface.cpp b/Source/UI/DigitalIOInterface.cpp
index 09ff1c3..46ddded 100644
--- a/Source/UI/DigitalIOInterface.cpp
+++ b/Source/UI/DigitalIOInterface.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright(C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright(C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/UI/DigitalIOInterface.h b/Source/UI/DigitalIOInterface.h
index 3bb4d89..8b1773d 100644
--- a/Source/UI/DigitalIOInterface.h
+++ b/Source/UI/DigitalIOInterface.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __DIGITALIOINTERFACE_H__
-#define __DIGITALIOINTERFACE_H__
+#pragma
 
 #include <VisualizerEditorHeaders.h>
 
@@ -62,5 +60,3 @@ class DigitalIOInterface : public SettingsInterface,
 
 	JUCE_LEAK_DETECTOR(DigitalIOInterface);
 };
-
-#endif
diff --git a/Source/UI/HarpSyncInputInterface.cpp b/Source/UI/HarpSyncInputInterface.cpp
index 4ec467b..58ef688 100644
--- a/Source/UI/HarpSyncInputInterface.cpp
+++ b/Source/UI/HarpSyncInputInterface.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/UI/HarpSyncInputInterface.h b/Source/UI/HarpSyncInputInterface.h
index 1842b35..7b77512 100644
--- a/Source/UI/HarpSyncInputInterface.h
+++ b/Source/UI/HarpSyncInputInterface.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __HARPSYNCINPUTINTERFACE_H__
-#define __HARPSYNCINPUTINTERFACE_H__
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 
@@ -61,5 +59,3 @@ class HarpSyncInputInterface : public SettingsInterface,
 
 	JUCE_LEAK_DETECTOR(HarpSyncInputInterface);
 };
-
-#endif
diff --git a/Source/UI/InterfaceList.h b/Source/UI/InterfaceList.h
index 31f003a..1113145 100644
--- a/Source/UI/InterfaceList.h
+++ b/Source/UI/InterfaceList.h
@@ -1,3 +1,25 @@
+/*
+	------------------------------------------------------------------
+
+	Copyright (C) Open Ephys
+
+	------------------------------------------------------------------
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
 #include "CustomViewport.h"
 #include "NeuropixV1Interface.h"
 #include "Bno055Interface.h"
diff --git a/Source/UI/NeuropixV1Interface.cpp b/Source/UI/NeuropixV1Interface.cpp
index 599749a..6177db9 100644
--- a/Source/UI/NeuropixV1Interface.cpp
+++ b/Source/UI/NeuropixV1Interface.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright(C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright(C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/UI/NeuropixV1Interface.h b/Source/UI/NeuropixV1Interface.h
index 095a017..1318827 100644
--- a/Source/UI/NeuropixV1Interface.h
+++ b/Source/UI/NeuropixV1Interface.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __NEUROPIXINTERFACE_H__
-#define __NEUROPIXINTERFACE_H__
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 
@@ -172,5 +170,3 @@ class NeuropixV1Interface : public SettingsInterface,
 
 	JUCE_LEAK_DETECTOR(NeuropixV1Interface);
 };
-
-#endif //__NEUROPIXINTERFACE_H__
diff --git a/Source/UI/OutputClockInterface.cpp b/Source/UI/OutputClockInterface.cpp
index 79742f4..42f1a4c 100644
--- a/Source/UI/OutputClockInterface.cpp
+++ b/Source/UI/OutputClockInterface.cpp
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
diff --git a/Source/UI/OutputClockInterface.h b/Source/UI/OutputClockInterface.h
index 40531d5..80b1686 100644
--- a/Source/UI/OutputClockInterface.h
+++ b/Source/UI/OutputClockInterface.h
@@ -1,8 +1,7 @@
 /*
 	------------------------------------------------------------------
 
-	This file is part of the Open Ephys GUI
-	Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
 	------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __OUTPUTCLOCKINTERFACE_H__
-#define __OUTPUTCLOCKINTERFACE_H__
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 
@@ -73,5 +71,3 @@ class OutputClockInterface : public SettingsInterface,
 
 	JUCE_LEAK_DETECTOR(OutputClockInterface);
 };
-
-#endif // !__OUTPUTCLOCKINTERFACE_H__
diff --git a/Source/UI/ProbeBrowser.cpp b/Source/UI/ProbeBrowser.cpp
index ba64c93..059383b 100644
--- a/Source/UI/ProbeBrowser.cpp
+++ b/Source/UI/ProbeBrowser.cpp
@@ -1,23 +1,22 @@
 /*
-------------------------------------------------------------------
+	------------------------------------------------------------------
 
-This file is part of the Open Ephys GUI
-Copyright (C) 2021 Allen Institute for Brain Science and Open Ephys
+	Copyright (C) Open Ephys
 
-------------------------------------------------------------------
+	------------------------------------------------------------------
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
diff --git a/Source/UI/ProbeBrowser.h b/Source/UI/ProbeBrowser.h
index d289400..12feda8 100644
--- a/Source/UI/ProbeBrowser.h
+++ b/Source/UI/ProbeBrowser.h
@@ -1,28 +1,26 @@
 /*
-------------------------------------------------------------------
+    ------------------------------------------------------------------
 
-This file is part of the Open Ephys GUI
-Copyright (C) 2021 Allen Institute for Brain Science and Open Ephys
+    Copyright (C) Open Ephys
 
-------------------------------------------------------------------
+    ------------------------------------------------------------------
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
-#ifndef __PROBEBROWSER_H__
-#define __PROBEBROWSER_H__
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 
@@ -101,5 +99,3 @@ class ProbeBrowser : public Component,
 
     JUCE_LEAK_DETECTOR(ProbeBrowser);
 };
-
-#endif  // __PROBEBROWSER_H__
diff --git a/Source/UI/SettingsInterface.h b/Source/UI/SettingsInterface.h
index 47a525b..7222460 100644
--- a/Source/UI/SettingsInterface.h
+++ b/Source/UI/SettingsInterface.h
@@ -1,8 +1,7 @@
 /*
     ------------------------------------------------------------------
 
-    This file is part of the Open Ephys GUI
-    Copyright (C) 2020 Allen Institute for Brain Science and Open Ephys
+    Copyright (C) Open Ephys
 
     ------------------------------------------------------------------
 
@@ -21,8 +20,7 @@
 
 */
 
-#ifndef __SETTINGSINTERFACE_H__
-#define __SETTINGSINTERFACE_H__
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 
@@ -92,5 +90,3 @@ class SettingsInterface : public Component
     OnixSourceEditor* editor;
     OnixSourceCanvas* canvas;
 };
-
-#endif //__SETTINGSINTERFACE_H__

From 3b595c7f8eb43672e12358bf61e0ac252c0df8ea Mon Sep 17 00:00:00 2001
From: bparks13 <bap@open-ephys.org>
Date: Thu, 3 Apr 2025 12:57:07 -0400
Subject: [PATCH 25/25] Add const variables instead of hard-coded values

---
 Source/Devices/AnalogIO.cpp        | 2 +-
 Source/Devices/AnalogIO.h          | 2 ++
 Source/Devices/MemoryMonitor.cpp   | 2 +-
 Source/Devices/MemoryMonitor.h     | 2 ++
 Source/Devices/PortController.cpp  | 4 ++--
 Source/Devices/PortController.h    | 5 +++--
 Source/OnixSourceEditor.cpp        | 4 ++--
 Source/UI/DigitalIOInterface.h     | 2 +-
 Source/UI/OutputClockInterface.cpp | 6 +++---
 Source/UI/OutputClockInterface.h   | 9 +++++++++
 10 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/Source/Devices/AnalogIO.cpp b/Source/Devices/AnalogIO.cpp
index bc6eaaa..86c4bf6 100644
--- a/Source/Devices/AnalogIO.cpp
+++ b/Source/Devices/AnalogIO.cpp
@@ -30,7 +30,7 @@ AnalogIO::AnalogIO(String name, const oni_dev_idx_t deviceIdx_, std::shared_ptr<
 		"Analog Input data",
 		"onix-analogio.data.input",
 		12,
-		std::floor(100000 / framesToAverage),
+		std::floor(AnalogIOFrequencyHz / framesToAverage),
 		"AnalogInput",
 		ContinuousChannel::Type::ADC,
 		20.0f / numberOfDivisions, // NB: +/- 10 Volts
diff --git a/Source/Devices/AnalogIO.h b/Source/Devices/AnalogIO.h
index ef5772a..d74466a 100644
--- a/Source/Devices/AnalogIO.h
+++ b/Source/Devices/AnalogIO.h
@@ -142,6 +142,8 @@ class AnalogIO : public OnixDevice
 
 	DataBuffer* analogInputBuffer = nullptr;
 
+	static const int AnalogIOFrequencyHz = 100000;
+
 	static const int numFrames = 25;
 	static const int framesToAverage = 4; // NB: Downsampling from 100 kHz to 25 kHz
 	static const int numChannels = 12;
diff --git a/Source/Devices/MemoryMonitor.cpp b/Source/Devices/MemoryMonitor.cpp
index 3af439c..b631305 100644
--- a/Source/Devices/MemoryMonitor.cpp
+++ b/Source/Devices/MemoryMonitor.cpp
@@ -45,7 +45,7 @@ void MemoryMonitorUsage::setMemoryMonitor(std::shared_ptr<MemoryMonitor> memoryM
 
 void MemoryMonitorUsage::startAcquisition()
 {
-	startTimerHz(10);
+	startTimerHz(TimerFrequencyHz);
 }
 
 void MemoryMonitorUsage::stopAcquisition()
diff --git a/Source/Devices/MemoryMonitor.h b/Source/Devices/MemoryMonitor.h
index 678fc17..add5cab 100644
--- a/Source/Devices/MemoryMonitor.h
+++ b/Source/Devices/MemoryMonitor.h
@@ -124,5 +124,7 @@ class MemoryMonitorUsage : public LevelMonitor
 	//	   using the following equation: y = log_e(x + 1) / log_e(x_max + 1);
 	const float maxLogarithmicValue = std::log(101);
 
+	const int TimerFrequencyHz = 10;
+
 	JUCE_LEAK_DETECTOR(MemoryMonitorUsage);
 };
diff --git a/Source/Devices/PortController.cpp b/Source/Devices/PortController.cpp
index 480a818..c244773 100644
--- a/Source/Devices/PortController.cpp
+++ b/Source/Devices/PortController.cpp
@@ -100,9 +100,9 @@ String PortController::getPortName(int offset)
 	{
 	case 0:
 		return "";
-	case 256: // NB: Port A
+	case HubAddressPortA:
 		return "Port A";
-	case 512: // NB: Port B
+	case HubAddressPortB:
 		return "Port B";
 	default:
 		return "";
diff --git a/Source/Devices/PortController.h b/Source/Devices/PortController.h
index 19706f5..5e1a39a 100644
--- a/Source/Devices/PortController.h
+++ b/Source/Devices/PortController.h
@@ -69,8 +69,6 @@ class DiscoveryParameters
 		voltageIncrement = voltageIncrement_;
 	}
 
-	~DiscoveryParameters() {};
-
 	bool operator==(const DiscoveryParameters& rhs) const
 	{
 		return rhs.minVoltage == minVoltage && rhs.maxVoltage == maxVoltage && rhs.voltageOffset == voltageOffset && rhs.voltageIncrement == voltageIncrement;
@@ -127,6 +125,9 @@ class PortController : public OnixDevice
 	/** Check if the port status changed and there is an error reported */
 	bool getErrorFlag() { return errorFlag; }
 
+	static const int HubAddressPortA = 256;
+	static const int HubAddressPortB = 512;
+
 private:
 	Array<oni_frame_t*, CriticalSection, 10> frameArray;
 
diff --git a/Source/OnixSourceEditor.cpp b/Source/OnixSourceEditor.cpp
index 171f1b8..af9b6c2 100644
--- a/Source/OnixSourceEditor.cpp
+++ b/Source/OnixSourceEditor.cpp
@@ -380,9 +380,9 @@ String OnixSourceEditor::getHeadstageSelected(int offset)
 	{
 	case 0:
 		return "Breakout Board";
-	case 256: // NB: Port A
+	case PortController::HubAddressPortA:
 		return headstageComboBoxA->getText();
-	case 512: // NB: Port B
+	case PortController::HubAddressPortB:
 		return headstageComboBoxB->getText();
 	default:
 		return "";
diff --git a/Source/UI/DigitalIOInterface.h b/Source/UI/DigitalIOInterface.h
index 8b1773d..168078c 100644
--- a/Source/UI/DigitalIOInterface.h
+++ b/Source/UI/DigitalIOInterface.h
@@ -20,7 +20,7 @@
 
 */
 
-#pragma
+#pragma once
 
 #include <VisualizerEditorHeaders.h>
 
diff --git a/Source/UI/OutputClockInterface.cpp b/Source/UI/OutputClockInterface.cpp
index 42f1a4c..e30c8dc 100644
--- a/Source/UI/OutputClockInterface.cpp
+++ b/Source/UI/OutputClockInterface.cpp
@@ -97,7 +97,7 @@ void OutputClockInterface::labelTextChanged(Label* l)
 
 		auto rate = l->getText().getFloatValue();
 
-		if (rate < 0.1 || rate > 10e6)
+		if (rate < MinFrequencyHz || rate > MaxFrequencyHz)
 		{
 			l->setText(String(d->getFrequencyHz()), dontSendNotification);
 			return;
@@ -111,7 +111,7 @@ void OutputClockInterface::labelTextChanged(Label* l)
 
 		uint32_t rate = l->getText().getIntValue();
 
-		if (rate < 10 || rate > 90)
+		if (rate < MinDutyCyclePercent || rate > MaxDutyCyclePercent)
 		{
 			l->setText(String(d->getDutyCycle()), dontSendNotification);
 			return;
@@ -125,7 +125,7 @@ void OutputClockInterface::labelTextChanged(Label* l)
 
 		uint32_t rate = l->getText().getIntValue();
 
-		if (rate < 0 || rate > 3600)
+		if (rate < MinDelaySeconds || rate > MaxDelaySeconds)
 		{
 			l->setText(String(d->getDelay()), dontSendNotification);
 			return;
diff --git a/Source/UI/OutputClockInterface.h b/Source/UI/OutputClockInterface.h
index 80b1686..089f47e 100644
--- a/Source/UI/OutputClockInterface.h
+++ b/Source/UI/OutputClockInterface.h
@@ -69,5 +69,14 @@ class OutputClockInterface : public SettingsInterface,
 
 	std::unique_ptr<ToggleButton> gateRunButton;
 
+	const float MinFrequencyHz = 0.1f;
+	const float MaxFrequencyHz = 10e6;
+
+	const int MinDutyCyclePercent = 10;
+	const int MaxDutyCyclePercent = 90;
+
+	const int MinDelaySeconds = 0;
+	const int MaxDelaySeconds = 3600;
+
 	JUCE_LEAK_DETECTOR(OutputClockInterface);
 };