Browse files

GUI can now communicate with RHD2000 eval board (but no data transfer…

… yet)
  • Loading branch information...
1 parent 94fb069 commit 5df54d19766cb0c92c303fcc62c47ba6a9633439 jsiegle committed Mar 12, 2013
View
0 Builds/Linux/build/libokFrontPanel64.so → Builds/Linux/build/libokFrontPanel.so
File renamed without changes.
View
2 Source/Processors/DataThreads/FPGAThread.cpp
@@ -36,7 +36,7 @@ FPGAThread::FPGAThread(SourceNode* sn)
//const char* bitfilename = "./pipetest.bit";
#if JUCE_LINUX
const char* bitfilename = "./pipetest.bit";
- const char* libname = "./libokFrontPanel64.so";
+ const char* libname = "./libokFrontPanel.so";
#endif
#if JUCE_WIN32
const char* bitfilename = "pipetest.bit";
View
5 Source/Processors/DataThreads/RHD2000Thread.cpp
@@ -59,6 +59,9 @@ RHD2000Thread::~RHD2000Thread() {
std::cout << "RHD2000 interface destroyed." << std::endl;
+ int ledArray[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+ evalBoard->setLedDisplay(ledArray);
+
deleteAndZero(evalBoard);
}
@@ -120,5 +123,5 @@ bool RHD2000Thread::updateBuffer()
{
// data transfer and sorting code goes here
-
+
}
View
5 Source/Processors/ProcessorGraph.cpp
@@ -383,15 +383,16 @@ GenericProcessor* ProcessorGraph::createProcessorFromDescription(String& descrip
if (subProcessorType.equalsIgnoreCase("Intan Demo Board") ||
subProcessorType.equalsIgnoreCase("File Reader") ||
subProcessorType.equalsIgnoreCase("Custom FPGA") ||
- subProcessorType.equalsIgnoreCase("RHD2000 Eval Board")) {
+ subProcessorType.equalsIgnoreCase("RHD2000 USB Board")) {
if (subProcessorType.equalsIgnoreCase("Intan Demo Board") &&
!processorWithSameNameExists(subProcessorType)) {
std::cout << "Only one Intan Demo Board is allowed at a time."
<< std::endl;
} else {
- processor = new SourceNode(subProcessorType);
std::cout << "Creating a new data source." << std::endl;
+ processor = new SourceNode(subProcessorType);
+
}
} else if (subProcessorType.equalsIgnoreCase("Signal Generator"))

0 comments on commit 5df54d1

Please sign in to comment.