Merge pull request #74 from open-ephys-plugins/issue-55

Add Neuropixels 1.0e Headstage

Author: bparks13

Source/Devices/AnalogIO.cpp

@@ -60,9 +60,9 @@ OnixDeviceType AnalogIO::getDeviceType()
 
 int AnalogIO::configureDevice()
 {
-	if (deviceContext == nullptr || !deviceContext->isInitialized()) 
+	if (deviceContext == nullptr || !deviceContext->isInitialized())
 		throw error_str("Device context is not initialized properly for	" + getName());
-	
+
 	return deviceContext->writeRegister(deviceIdx, (uint32_t)AnalogIORegisters::ENABLE, (oni_reg_val_t)(isEnabled() ? 1 : 0));
 }
 
@@ -135,13 +135,8 @@ void AnalogIO::addFrame(oni_frame_t* frame)
 
 void AnalogIO::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
-	for (StreamInfo streamInfo : streamInfos)
-	{
-		sourceBuffers.add(new DataBuffer(streamInfo.getNumChannels(), (int)streamInfo.getSampleRate() * bufferSizeInSeconds));
-
-		if (streamInfo.getChannelPrefix().equalsIgnoreCase("AnalogInput"))
-			analogInputBuffer = sourceBuffers.getLast();
-	}
+	sourceBuffers.add(new DataBuffer(streamInfos.getFirst().getNumChannels(), (int)streamInfos.getFirst().getSampleRate() * bufferSizeInSeconds));
+	analogInputBuffer = sourceBuffers.getLast();
 }
 
 void AnalogIO::processFrames()
@@ -155,7 +150,7 @@ void AnalogIO::processFrames()
 
 		int dataOffset = 4;
 
-		for (int i = 0; i < numChannels; i++)
+		for (size_t i = 0; i < numChannels; i++)
 		{
 			if (dataType == AnalogIODataType::S16)
 				analogInputSamples[currentFrame + i * numFrames] += *(dataPtr + dataOffset + i);
@@ -167,7 +162,7 @@ void AnalogIO::processFrames()
 
 		if (currentAverageFrame >= framesToAverage)
 		{
-			for (int i = 0; i < numChannels; i++)
+			for (size_t i = 0; i < numChannels; i++)
 			{
 				analogInputSamples[currentFrame + i * numFrames] /= framesToAverage;
 			}

Source/Devices/AnalogIO.h

@@ -94,14 +94,14 @@ namespace OnixSourcePlugin
 		{
 			if (channelNumber > numChannels || channelNumber < 0)
 			{
-				LOGE("Channel number must be between 0 and " + String(channelNumber));
+				LOGE("Channel number must be between 0 and " + std::to_string(channelNumber));
 				return AnalogIODirection::Input;
 			}
 
 			return channelDirection[channelNumber];
 		}
 
-		static String getChannelDirection(AnalogIODirection direction)
+		static std::string getChannelDirection(AnalogIODirection direction)
 		{
 			switch (direction)
 			{
@@ -118,7 +118,7 @@ namespace OnixSourcePlugin
 		{
 			if (channelNumber > numChannels || channelNumber < 0)
 			{
-				LOGE("Channel number must be between 0 and " + String(channelNumber));
+				LOGE("Channel number must be between 0 and " + std::to_string(channelNumber));
 				return;
 			}
 
@@ -129,7 +129,7 @@ namespace OnixSourcePlugin
 		{
 			if (channelNumber > numChannels || channelNumber < 0)
 			{
-				LOGE("Channel number must be between 0 and " + String(channelNumber));
+				LOGE("Channel number must be between 0 and " + std::to_string(channelNumber));
 				return AnalogIOVoltageRange::FiveVolts;
 			}
 
@@ -140,7 +140,7 @@ namespace OnixSourcePlugin
 		{
 			if (channelNumber > numChannels || channelNumber < 0)
 			{
-				LOGE("Channel number must be between 0 and " + String(channelNumber));
+				LOGE("Channel number must be between 0 and " + std::to_string(channelNumber));
 				return;
 			}
 

Source/Devices/Bno055.cpp

@@ -174,7 +174,6 @@ void Bno055::addFrame(oni_frame_t* frame)
 void Bno055::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
 	sourceBuffers.add(new DataBuffer(numberOfChannels, (int)sampleRate * bufferSizeInSeconds));
-
 	bnoBuffer = sourceBuffers.getLast();
 }
 

Source/Devices/DS90UB9x.h

@@ -121,6 +121,22 @@ namespace OnixSourcePlugin
 			SCLLOW = 0x0B
 		};
 
+		enum class DS90UB933SerializerI2CRegister : uint32_t
+		{
+			Gpio10 = 0x0D,
+			Gpio32 = 0x0E,
+			SclHigh = 0x11,
+			SclLow = 0x12
+		};
+
+		enum class DS90UB953SerializerI2CRegister : uint32_t
+		{
+			GpioData = 0x0D,
+			GpioIOControl = 0x0E,
+			SclHigh = 0x0B,
+			SclLow = 0x0C
+		};
+
 		enum class DS90UB9xMode : uint32_t
 		{
 			Raw12BitLowFrequency = 1,

Source/Devices/HarpSyncInput.cpp

@@ -89,13 +89,8 @@ void HarpSyncInput::addFrame(oni_frame_t* frame)
 
 void HarpSyncInput::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
-	for (StreamInfo streamInfo : streamInfos)
-	{
-		sourceBuffers.add(new DataBuffer(streamInfo.getNumChannels(), (int)streamInfo.getSampleRate() * bufferSizeInSeconds));
-
-		if (streamInfo.getChannelPrefix().equalsIgnoreCase("HarpTime"))
-			harpTimeBuffer = sourceBuffers.getLast();
-	}
+	sourceBuffers.add(new DataBuffer(streamInfos.getFirst().getNumChannels(), (int)streamInfos.getFirst().getSampleRate() * bufferSizeInSeconds));
+	harpTimeBuffer = sourceBuffers.getLast();
 }
 
 void HarpSyncInput::processFrames()

Source/Devices/MemoryMonitor.cpp

@@ -92,7 +92,7 @@ int MemoryMonitor::configureDevice()
 	setEnabled(true);
 
 	int rc = deviceContext->writeRegister(deviceIdx, (uint32_t)MemoryMonitorRegisters::ENABLE, 1);
-	if (rc != ONI_ESUCCESS) 
+	if (rc != ONI_ESUCCESS)
 		throw error_str("Unable to enable " + getName());
 
 	rc = deviceContext->readRegister(deviceIdx, (oni_reg_addr_t)MemoryMonitorRegisters::TOTAL_MEM, &totalMemory);
@@ -139,13 +139,8 @@ void MemoryMonitor::addFrame(oni_frame_t* frame)
 
 void MemoryMonitor::addSourceBuffers(OwnedArray<DataBuffer>& sourceBuffers)
 {
-	for (StreamInfo streamInfo : streamInfos)
-	{
-		sourceBuffers.add(new DataBuffer(streamInfo.getNumChannels(), (int)streamInfo.getSampleRate() * bufferSizeInSeconds));
-
-		if (streamInfo.getChannelPrefix().equalsIgnoreCase("Percent"))
-			percentUsedBuffer = sourceBuffers.getLast();
-	}
+	sourceBuffers.add(new DataBuffer(streamInfos.getFirst().getNumChannels(), (int)streamInfos.getFirst().getSampleRate() * bufferSizeInSeconds));
+	percentUsedBuffer = sourceBuffers.getLast();
 }
 
 float MemoryMonitor::getLastPercentUsedValue()