Update sources for new library

Author: aacuevas

Builds/VisualStudio2013/Plugins/RhythmNode/RhythmNode.vcxproj

@@ -74,20 +74,24 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
+      <SDLCheck>false</SDLCheck>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>okFrontPanel.lib;open-ephys.lib;setupapi.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(GUIDir);$(OutDir);../../../../Resources/DLLs/VS2013</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
+      <SDLCheck>false</SDLCheck>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>okFrontPanel.lib;open-ephys.lib;setupapi.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(GUIDir);$(OutDir);../../../../Resources/DLLs/VS2013-x64</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -96,12 +100,14 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
+      <SDLCheck>false</SDLCheck>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>okFrontPanel.lib;open-ephys.lib;setupapi.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(GUIDir);$(OutDir);../../../../Resources/DLLs/VS2013</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -110,12 +116,14 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
+      <SDLCheck>false</SDLCheck>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>okFrontPanel.lib;open-ephys.lib;setupapi.lib;opengl32.lib;glu32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(GUIDir);$(OutDir);../../../../Resources/DLLs/VS2013-x64</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

Source/Plugins/RhythmNode/OpenEphysLib.cpp

@@ -48,7 +48,7 @@ extern "C" EXPORT int getPluginInfo(int index, Plugin::PluginInfo* info)
 	{
 	case 0:
 		info->type = Plugin::PLUGIN_TYPE_DATA_THREAD;
-		info->dataThread.name = "rhythm";
+		info->dataThread.name = "Rhythm FPGA";
 		info->dataThread.creator = &createDataThread<RHD2000Thread>;
 		break;
 	default:

Source/Plugins/RhythmNode/rhythm-api/rhd2000evalboard.cpp

@@ -31,6 +31,7 @@
 #include "okFrontPanelDLL.h"
 
 using namespace std;
+using namespace OpalKellyLegacy;
 
 // This class provides access to and control of the Opal Kelly XEM6010 USB/FPGA
 // interface board running the Rhythm interface Verilog code.
@@ -66,11 +67,11 @@ int Rhd2000EvalBoard::open(const char* libname)
     int i, nDevices;
 
     cout << "---- Intan Technologies ---- Rhythm RHD2000 Controller v1.41 ----" << endl << endl;
-    if (okFrontPanelDLL_LoadLib(libname) == false) {
-        cerr << "FrontPanel DLL could not be loaded.  " <<
-                "Make sure this DLL is in the application start directory." << endl;
-        return -1;
-    }
+//    if (okFrontPanelDLL_LoadLib(libname) == false) {
+//        cerr << "FrontPanel DLL could not be loaded.  " <<
+//                "Make sure this DLL is in the application start directory." << endl;
+//        return -1;
+//    }
     okFrontPanelDLL_GetVersion(dll_date, dll_time);
     cout << endl << "FrontPanel DLL loaded.  Built: " << dll_date << "  " << dll_time << endl;
 
@@ -1595,8 +1596,6 @@ string Rhd2000EvalBoard::opalKellyModelName(int model) const
         return("XEM6110V2LX150");
     case OK_PRODUCT_XEM6002LX9:
         return("XEM6002LX9");
-    case OK_PRODUCT_XEM6310MTLX45:
-        return("XEM6310MTLX45");
     case OK_PRODUCT_XEM6320LX130T:
         return("XEM6320LX130T");
     default:

Source/Plugins/RhythmNode/rhythm-api/rhd2000evalboard.h

@@ -37,7 +37,10 @@
 
 using namespace std;
 
-class okCFrontPanel;
+namespace OpalKellyLegacy
+{
+	class okCFrontPanel;
+}
 class Rhd2000DataBlock;
 
 class Rhd2000EvalBoard
@@ -172,7 +175,7 @@ class Rhd2000EvalBoard
 	bool readRawDataBlock(unsigned char** bufferPtr, int nSamples = -1);
 
 private:
-    okCFrontPanel *dev;
+	OpalKellyLegacy::okCFrontPanel *dev;
     AmplifierSampleRate sampleRate;
     int numDataStreams; // total number of data streams currently enabled
     int dataStreamEnabled[MAX_NUM_DATA_STREAMS_USB3]; // 0 (disabled) or 1 (enabled), set for maximum stream number