Add ADC range selector to Rhythm node

Author: aacuevas

Source/Plugins/RhythmNode/RHD2000Editor.cpp

@@ -349,40 +349,30 @@ type(type_), gains(gains_), channelList(cl), channel(ch), name(N), gainIndex(gai
     editName->setColour(Label::backgroundColourId,juce::Colours::lightgrey);
     editName->addListener(this);
     addAndMakeVisible(editName);
-/*    if (gainIndex > 0)
-    {
 
-        gainComboBox = new ComboBox("Gains");
-        for (int k=0; k<gains.size(); k++)
-        {
-            if (gains[k] < 1)
-            {
-                gainComboBox->addItem("x"+String(gains[k],2),k+1);
-            }
-            else
-            {
-                gainComboBox->addItem("x"+String((int)gains[k]),k+1);
-            }
-        }
-        gainComboBox->setSelectedId(gainIndex, sendNotificationSync);
-        gainComboBox->addListener(this);
-        addAndMakeVisible(gainComboBox);
-    }
-    else
-    {*/
-        gainComboBox = nullptr;
-    //}
-
-    if (type == DataChannel::HEADSTAGE_CHANNEL)
+	if (type == DataChannel::HEADSTAGE_CHANNEL)
     {
         impedance = new Label("Impedance","? Ohm");
         impedance->setFont(Font("Default", 13, Font::plain));
         impedance->setEditable(false);
         addAndMakeVisible(impedance);
     }
+	else if (type == DataChannel::ADC_CHANNEL)
+	{
+		impedance = nullptr;
+		rangeComboBox = new ComboBox("ADC Ranges");
+		rangeComboBox->addItem("-5V - +5V",1);
+		rangeComboBox->addItem("0V - +5V",2);
+		SourceNode* proc = channelList->proc;
+		RHD2000Thread* thread = static_cast<RHD2000Thread*>(proc->getThread());
+		rangeComboBox->setSelectedId(thread->getAdcRange(proc->getDataChannel(channel)->getSourceTypeIndex()) + 1, dontSendNotification);
+		rangeComboBox->addListener(this);
+		addAndMakeVisible(rangeComboBox);
+	}
     else
     {
         impedance = nullptr;
+		rangeComboBox = nullptr;
     }
 }
 FPGAchannelComponent::~FPGAchannelComponent()
@@ -409,12 +399,11 @@ void FPGAchannelComponent::setImpedanceValues(float mag, float phase)
 
 void FPGAchannelComponent::comboBoxChanged(ComboBox* comboBox)
 {
-    if (comboBox == gainComboBox)
+    if (comboBox == rangeComboBox)
     {
-        int newGainIndex = gainComboBox->getSelectedId();
-        float mult = gains[newGainIndex-1];
-        float bitvolts = channelList->proc->getBitVolts(channelList->proc->getDataChannel(channel));
-        channelList->setNewGain(channel, mult*bitvolts);
+		SourceNode* proc = channelList->proc;
+		RHD2000Thread* thread = static_cast<RHD2000Thread*>(proc->getThread());
+		thread->setAdcRange(proc->getDataChannel(channel)->getSourceTypeIndex(), comboBox->getSelectedId() - 1);
     }
 }
 void FPGAchannelComponent::labelTextChanged(Label* lbl)
@@ -450,9 +439,9 @@ int FPGAchannelComponent::getUserDefinedData()
 void FPGAchannelComponent::resized()
 {
     editName->setBounds(0,0,90,20);
-    if (gainComboBox != nullptr)
+    if (rangeComboBox != nullptr)
     {
-        gainComboBox->setBounds(100,0,70,20);
+        rangeComboBox->setBounds(100,0,80,20);
     }
     if (impedance != nullptr)
     {
@@ -934,6 +923,12 @@ void RHD2000Editor::saveCustomParameters(XmlElement* xml)
     xml->setAttribute("auto_measure_impedances",measureWhenRecording);
 	xml->setAttribute("LEDs", ledButton->getToggleState());
 	xml->setAttribute("ClockDivideRatio", clockInterface->getClockDivideRatio());
+	for (int i = 0; i < 8; i++)
+	{
+		XmlElement* adc = xml->createNewChildElement("ADCRANGE");
+		adc->setAttribute("Channel", i);
+		adc->setAttribute("Range", board->getAdcRange(i));
+	}
 }
 
 void RHD2000Editor::loadCustomParameters(XmlElement* xml)
@@ -957,6 +952,13 @@ void RHD2000Editor::loadCustomParameters(XmlElement* xml)
     measureWhenRecording = xml->getBoolAttribute("auto_measure_impedances");
 	ledButton->setToggleState(xml->getBoolAttribute("LEDs", true),sendNotification);
     clockInterface->setClockDivideRatio(xml->getIntAttribute("ClockDivideRatio")); 
+	forEachXmlChildElementWithTagName(*xml, adc, "ADCRANGE")
+	{
+		int channel = adc->getIntAttribute("Channel", -1);
+		int range = adc->getIntAttribute("Range", -1);
+		if (channel >= 0 && range >= 0)
+			board->setAdcRange(channel, range);
+	}
 }
 
 

Source/Plugins/RhythmNode/RHD2000Editor.h

@@ -118,7 +118,7 @@ class FPGAchannelComponent : public Component, Button::Listener, public ComboBox
     Array<float> gains;
     FPGAchannelList* channelList;
     ScopedPointer<Label> staticLabel, editName, impedance;
-    ScopedPointer<ComboBox> gainComboBox;
+    ScopedPointer<ComboBox> rangeComboBox;
     int channel;
     String name;
     int gainIndex;

Source/Plugins/RhythmNode/RHD2000Thread.cpp

@@ -97,6 +97,9 @@ RHD2000Thread::RHD2000Thread(SourceNode* sn) : DataThread(sn),
 	memset(auxBuffer, 0, sizeof(auxBuffer));
 	memset(auxSamples, 0, sizeof(auxSamples));
 
+	for (int i = 0; i < 8; i++)
+		adcRangeSettings[i] = 0;
+
     for (int i=0; i < MAX_NUM_HEADSTAGES; i++)
         headstagesArray.add(new RHDHeadstage(static_cast<Rhd2000EvalBoard::BoardDataSource>(i)));
 
@@ -1578,9 +1581,10 @@ bool RHD2000Thread::updateBuffer()
 
 					channel++;
 					// ADC waveform units = volts
-					thisSample[channel] =
+					thisSample[channel] = adcRangeSettings[adcChan] == 0 ?
 						//0.000050354 * float(dataBlock->boardAdcData[adcChan][samp]);
-						0.00015258789 * float(*(uint16*)(bufferPtr + index)) - 5 - 0.4096; // account for +/-5V input range and DC offset
+						0.00015258789 * float(*(uint16*)(bufferPtr + index)) - 5 - 0.4096 : // account for +/-5V input range and DC offset
+						0.00030517578 * float(*(uint16*)(bufferPtr + index));
 					index += 2;
 				}
 			}
@@ -1764,6 +1768,16 @@ int RHD2000Thread::setClockDivider(int divide_ratio)
     return divide_ratio;
 }
 
+void RHD2000Thread::setAdcRange(int channel, short range)
+{
+	adcRangeSettings[channel] = range;
+}
+
+short RHD2000Thread::getAdcRange(int channel) const
+{
+	return adcRangeSettings[channel];
+}
+
 void RHD2000Thread::runImpedanceTest(ImpedanceData* data)
 {
 	impedanceThread->stopThreadSafely();

Source/Plugins/RhythmNode/RHD2000Thread.h

@@ -28,6 +28,8 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <array>
+#include <atomic>
 
 #include "rhythm-api/rhd2000evalboard.h"
 #include "rhythm-api/rhd2000registers.h"
@@ -136,6 +138,10 @@ class RHD2000Thread : public DataThread
     void runImpedanceTest (ImpedanceData* data);
     void enableBoardLeds( bool enable);
     int setClockDivider (int divide_ratio);
+
+	void setAdcRange(int adcChannel, short rangeType);
+	short getAdcRange(int adcChannel) const;
+
     GenericEditor* createEditor (SourceNode* sn);
 
     static DataThread* createDataThread (SourceNode* sn);
@@ -221,6 +227,9 @@ class RHD2000Thread : public DataThread
     // Sync ouput divide factor
     uint16 clockDivideFactor;
 
+	//ADC ranges
+	std::array<atomic_short, 8> adcRangeSettings;
+
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(RHD2000Thread);
 };