Merge branch 'main' into issue-42

Author: bparks13

Source/Devices/Bno055.cpp

@@ -29,7 +29,7 @@ Bno055::Bno055(std::string name, std::string hubName, const oni_dev_idx_t device
 {
 	auto streamIdentifier = getStreamIdentifier();
 
-	std::string port = getPortNameFromIndex(deviceIdx);
+	std::string port = getPortName(deviceIdx);
 	StreamInfo eulerAngleStream = StreamInfo(
 		OnixDevice::createStreamName({ port, getHubName(), getName(), "Euler" }),
 		"Bosch Bno055 9-axis inertial measurement unit (IMU) Euler angle",

Source/Devices/MemoryMonitor.cpp

@@ -29,17 +29,33 @@ MemoryMonitorUsage::MemoryMonitorUsage(GenericProcessor* p)
 	: LevelMonitor(p)
 {
 	device = nullptr;
+	setPassiveTooltip();
 }
 
 void MemoryMonitorUsage::timerCallback()
 {
 	if (device != nullptr)
 	{
-		setFillPercentage(std::log(device->getLastPercentUsedValue() + 1) / maxLogarithmicValue);
+		auto memoryUsedPercent = device->getLastPercentUsedValue();
+		auto logMemoryUsed = std::log(memoryUsedPercent + 1) / maxLogarithmicValue;
+		setFillPercentage(logMemoryUsed);
+		setTooltip(getNewTooltip(memoryUsedPercent));
 		repaint();
 	}
 }
 
+std::string MemoryMonitorUsage::getNewTooltip(float memoryUsage)
+{
+	std::stringstream ss;
+	ss << "Memory Used: " << std::setprecision(3) << memoryUsage << "%";
+	return ss.str();
+}
+
+void MemoryMonitorUsage::setPassiveTooltip()
+{
+	setTooltip("Monitors the percent of the hardware memory buffer used.");
+}
+
 void MemoryMonitorUsage::setMemoryMonitor(std::shared_ptr<MemoryMonitor> memoryMonitor)
 {
 	device = memoryMonitor;
@@ -54,6 +70,7 @@ void MemoryMonitorUsage::stopAcquisition()
 {
 	stopTimer();
 	setFillPercentage(0.0f);
+	setPassiveTooltip();
 	repaint();
 }
 

Source/Devices/MemoryMonitor.h

@@ -108,10 +108,10 @@ namespace OnixSourcePlugin
 		void timerCallback() override;
 
 		void setMemoryMonitor(std::shared_ptr<MemoryMonitor> memoryMonitor);
-
 		void startAcquisition();
-
 		void stopAcquisition();
+		void setPassiveTooltip();
+		static std::string getNewTooltip(float memoryUsage);
 
 	private:
 

Source/Devices/Neuropixels1e.cpp

@@ -79,7 +79,7 @@ void NeuropixelsV1eBackgroundUpdater::run()
 Neuropixels1e::Neuropixels1e(std::string name, std::string hubName, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> ctx_) :
 	Neuropixels1(name, hubName, OnixDeviceType::NEUROPIXELSV1E, deviceIdx_, ctx_)
 {
-	std::string port = getPortNameFromIndex(getDeviceIdx());
+	std::string port = getPortName(getDeviceIdx());
 	StreamInfo apStream = StreamInfo(
 		OnixDevice::createStreamName({ port, getHubName(), getName(), STREAM_NAME_AP }),
 		"Neuropixels 1.0 AP band data stream",

Source/Devices/Neuropixels1f.cpp

@@ -66,7 +66,7 @@ void NeuropixelsV1fBackgroundUpdater::run()
 Neuropixels1f::Neuropixels1f(std::string name, std::string hubName, const oni_dev_idx_t deviceIdx_, std::shared_ptr<Onix1> ctx_) :
 	Neuropixels1(name, hubName, OnixDeviceType::NEUROPIXELSV1F, deviceIdx_, ctx_)
 {
-	std::string port = getPortNameFromIndex(deviceIdx);
+	std::string port = getPortName(deviceIdx);
 	StreamInfo apStream = StreamInfo(
 		OnixDevice::createStreamName({ port, getHubName(), getName(), STREAM_NAME_AP }),
 		"Neuropixels 1.0 AP band data stream",

Source/Devices/Neuropixels2e.cpp

@@ -43,7 +43,7 @@ Neuropixels2e::Neuropixels2e(std::string name, std::string hubName, const oni_de
 void Neuropixels2e::createDataStream(int n)
 {
 	StreamInfo apStream = StreamInfo(
-		OnixDevice::createStreamName({ getPortNameFromIndex(getDeviceIdx()), getHubName(), "Probe" + std::to_string(n) }),
+		OnixDevice::createStreamName({ getPortName(getDeviceIdx()), getHubName(), "Probe" + std::to_string(n) }),
 		"Neuropixels 2.0 data stream",
 		getStreamIdentifier(),
 		numberOfChannels,

Source/Devices/PolledBno055.cpp

@@ -31,7 +31,7 @@ PolledBno055::PolledBno055(std::string name, std::string hubName, const oni_dev_
 {
 	auto streamIdentifier = getStreamIdentifier();
 
-	std::string port = getPortNameFromIndex(deviceIdx);
+	std::string port = getPortName(deviceIdx);
 	StreamInfo eulerAngleStream = StreamInfo(
 		OnixDevice::createStreamName({ port, getHubName(), getName(), "Euler" }),
 		"Bosch Bno055 9-axis inertial measurement unit (IMU) Euler angle",

Source/NeuropixelsComponents.h

@@ -56,6 +56,23 @@ namespace OnixSourcePlugin
 		K = 10,
 		L = 11,
 		M = 12,
+		A1 = 13, // used for quad base
+		A2 = 14,
+		A3 = 15,
+		A4 = 16,
+		B1 = 17,
+		B2 = 18,
+		B3 = 19,
+		B4 = 20,
+		C1 = 21,
+		C2 = 22,
+		C3 = 23,
+		C4 = 24,
+		D1 = 25,
+		D2 = 26,
+		D3 = 27,
+		D4 = 28,
+		OFF = 255 //used in v1 API
 	};
 
 	enum class ElectrodeStatus

Source/Onix1.cpp

@@ -87,7 +87,7 @@ std::map<int, int> Onix1::getHubIds(device_map_t deviceTable) const
 
 	auto deviceIndices = getDeviceIndices(deviceTable);
 
-	auto offsets = OnixDevice::getUniqueOffsetsFromIndices(deviceIndices, false);
+	auto offsets = OnixDevice::getUniqueOffsets(deviceIndices, false);
 
 	for (int i = 0; i < offsets.size(); i++)
 	{
@@ -111,7 +111,7 @@ std::vector<int> Onix1::getDeviceIndices(device_map_t deviceMap, int hubIndex)
 
 	for (const auto& [idx, dev] : deviceMap)
 	{
-		if (dev.id != ONIX_NULL && (hubIndex == -1 || OnixDevice::getOffsetFromIndex(dev.idx) == hubIndex))
+		if (dev.id != ONIX_NULL && (hubIndex == -1 || OnixDevice::getOffset(dev.idx) == hubIndex))
 			deviceIndices.emplace_back(idx);
 	}
 

Source/OnixDevice.cpp

@@ -173,28 +173,28 @@ std::string OnixDevice::getPortName(PortName port)
 	return getPortName(getPortOffset(port));
 }
 
-std::string OnixDevice::getPortNameFromIndex(oni_dev_idx_t index)
+std::string OnixDevice::getPortName(oni_dev_idx_t index)
 {
-	return getPortName(getOffsetFromIndex(index));
+	return getPortName(getOffset(index));
 }
 
 PortName OnixDevice::getPortFromIndex(oni_dev_idx_t index)
 {
 	return index & (1 << 8) ? PortName::PortA : PortName::PortB;
 }
 
-int OnixDevice::getOffsetFromIndex(oni_dev_idx_t index)
+int OnixDevice::getOffset(oni_dev_idx_t index)
 {
 	return index & 0x0000FF00;
 }
 
-std::vector<int> OnixDevice::getUniqueOffsetsFromIndices(std::vector<int> indices, bool ignoreBreakoutBoard)
+std::vector<int> OnixDevice::getUniqueOffsets(std::vector<int> indices, bool ignoreBreakoutBoard)
 {
 	std::set<int> offsets;
 
 	for (auto index : indices)
 	{
-		auto offset = getOffsetFromIndex(index);
+		auto offset = getOffset(index);
 
 		if (offset == HubAddressBreakoutBoard && ignoreBreakoutBoard) continue;
 
@@ -204,7 +204,19 @@ std::vector<int> OnixDevice::getUniqueOffsetsFromIndices(std::vector<int> indice
 	return std::vector<int>(offsets.begin(), offsets.end());
 }
 
-Array<PortName> OnixDevice::getUniquePortsFromIndices(std::vector<int> indices)
+std::vector<int> OnixDevice::getUniqueOffsets(OnixDeviceMap devices, bool ignoreBreakoutBoard)
+{
+	std::vector<int> indices;
+
+	for (const auto& [key, _] : devices) 
+	{ 
+		indices.emplace_back(key);
+	}
+
+	return getUniqueOffsets(indices, ignoreBreakoutBoard);
+}
+
+Array<PortName> OnixDevice::getUniquePorts(std::vector<int> indices)
 {
 	Array<PortName> ports;