Fixed another small bug related to dac output

open-ephys · Apr 1, 2014 · cf80cbf · cf80cbf
1 parent 060a9a1
commit cf80cbf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Source/Processors/DataThreads/RHD2000Thread.cpp b/Source/Processors/DataThreads/RHD2000Thread.cpp
@@ -174,6 +174,7 @@ void RHD2000Thread::setDACchannel(int dacOutput, int channel)
 	dacChannels[dacOutput] = channel;
 	dacChannelsToUpdate[dacOutput] = true;
     dacOutputShouldChange = true;
+	evalBoard->updateDacAssignment(dacOutput, channel); // doesn't really change anything, but keep things in sync...
 }
 
 Array<int> RHD2000Thread::getDACchannels()

diff --git a/Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.cpp b/Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.cpp
@@ -1186,6 +1186,11 @@ int Rhd2000EvalBoard::gecDacDataChannel(int dacChannel)
 	return dacChannelAssignment[dacChannel];
 }
 
+void Rhd2000EvalBoard::updateDacAssignment(int dacChannel, int channel)
+{
+	dacChannelAssignment[dacChannel] = channel;
+}
+
 // Assign a particular amplifier channel (0-31) to a DAC channel (0-7).
 void Rhd2000EvalBoard::selectDacDataChannel(int dacChannel, int dataChannel)
 {

diff --git a/Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.h b/Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.h
@@ -159,7 +159,7 @@ class Rhd2000EvalBoard
     void selectDacDataChannel(int dacChannel, int dataChannel);
 
 	int gecDacDataChannel(int dacChannel);
-
+	void updateDacAssignment(int dacChannel, int channel);
 	void enableExternalFastSettle(bool enable);
 	void setExternalFastSettleChannel(int channel);