diff --git a/Builds/Linux/build/libokFrontPanel64.so b/Builds/Linux/build/libokFrontPanel.so similarity index 100% rename from Builds/Linux/build/libokFrontPanel64.so rename to Builds/Linux/build/libokFrontPanel.so diff --git a/Source/Processors/DataThreads/FPGAThread.cpp b/Source/Processors/DataThreads/FPGAThread.cpp index b7498b6c31a53dffead5a2b4516c07f1ac2c9fd4..f37ac132c07745dab38245b6f407af6afbd9b5c6 100644 --- a/Source/Processors/DataThreads/FPGAThread.cpp +++ b/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"; diff --git a/Source/Processors/DataThreads/RHD2000Thread.cpp b/Source/Processors/DataThreads/RHD2000Thread.cpp index e2ef6d2cb288dacf1647ecc7a9b84d7176a5bd85..a6ea3ce8c2e0584c9581c438e3cae0a1ad341ae9 100644 --- a/Source/Processors/DataThreads/RHD2000Thread.cpp +++ b/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 - + } \ No newline at end of file diff --git a/Source/Processors/ProcessorGraph.cpp b/Source/Processors/ProcessorGraph.cpp index 0d29567a7104ec90026f1c3c96ee5b88409cb0a2..0781aa27d2724b9e4768caf4a49eab72b73e5be7 100644 --- a/Source/Processors/ProcessorGraph.cpp +++ b/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"))