diff --git a/usbcontroller.h b/usbcontroller.h
index 61d5f1f..7cea81c 100644
--- a/usbcontroller.h
+++ b/usbcontroller.h
@@ -149,11 +149,11 @@ private:
usbDeviceType usbDevice = usbNone;
unsigned short knownUsbDevices[4][3] = {
- //{shuttleXpress,0x0b33,0x0020},
+ {shuttleXpress,0x0b33,0x0020},
{shuttlePro2,0x0b33,0x0030},
- //{eCoderPlus,0x1fc9,0x0003},
- {eCoderPlus,0x0b33,0x0020},
- {RC28,0x0c26,0x001e} };
+ {RC28,0x0c26,0x001e},
+ {eCoderPlus, 0x1fc9, 0x0003}
+ };
protected:
};
diff --git a/wfserver.vcxproj b/wfserver.vcxproj
index 60b5d5f..74ae446 100644
--- a/wfserver.vcxproj
+++ b/wfserver.vcxproj
@@ -112,7 +112,7 @@
core;network;gui;multimedia;widgets;serialport;printsupport
- msvc2019_64_v62
+ msvc2016_64_v640
core;network;gui;multimedia;widgets;serialport;printsupport
@@ -120,7 +120,7 @@
core;network;gui;multimedia;widgets;serialport;printsupport
- msvc2019_64_v62
+ msvc2016_64_v640
core;network;gui;multimedia;widgets;serialport;printsupport
diff --git a/wfserver.vcxproj.user b/wfserver.vcxproj.user
index 6491d95..5c869b5 100644
--- a/wfserver.vcxproj.user
+++ b/wfserver.vcxproj.user
@@ -2,15 +2,15 @@
- 2022-08-21T18:45:22.2052009Z
+ 2023-02-06T15:26:00.1276665Z
- 2022-08-21T18:45:22.2052009Z
+ 2023-02-06T15:25:59.8598138Z
- 2023-01-02T19:56:38.8798452Z
+ 2023-02-06T15:26:00.7293349Z
- 2022-04-13T11:33:53.0745117Z
+ 2023-02-06T15:26:00.3825270Z
\ No newline at end of file
diff --git a/wfview.vcxproj b/wfview.vcxproj
index 658b730..94c453f 100644
--- a/wfview.vcxproj
+++ b/wfview.vcxproj
@@ -111,19 +111,19 @@
$(SolutionDir)wfview-release\
- msvc2019_64_v62
+ msvc2016_64_v632
core;gui;network;widgets;multimedia;printsupport;serialport;xml
- msvc2019_64_v62
+ msvc2019
core;gui;network;widgets;multimedia;printsupport;serialport;xml
- msvc2019_64_v62
+ msvc2016_64_v632
core;gui;network;widgets;multimedia;printsupport;serialport;xml
- msvc2019_64_v62
+ msvc2019
core;gui;network;widgets;multimedia;printsupport;serialport;xml
@@ -131,7 +131,7 @@
- .;..\rtaudio;..\portaudio\include;..\qcustomplot;..\opus\include;..\eigen;..\r8brain-free-src;resampler;release;/include;%(AdditionalIncludeDirectories)
+ .;..\hidapi\hidapi;..\rtaudio;..\portaudio\include;..\qcustomplot;..\opus\include;..\eigen;..\r8brain-free-src;resampler;release;/include;%(AdditionalIncludeDirectories)
-Zc:rvalueCast -Zc:inline -Zc:strictStrings -Zc:throwingNew -permissive- -Zc:__cplusplus -Zc:externConstexpr -utf-8 -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)
release\
false
@@ -141,7 +141,7 @@
stdcpp17
release\
MaxSpeed
- _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION="1.55";BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="4574e2b";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions)
+ _WINDOWS;UNICODE;_UNICODE;WIN32;_ENABLE_EXTENDED_ALIGNED_STORAGE;WIN64;WFVIEW_VERSION="1.58";USB_CONTROLLER;BUILD_WFVIEW;__WINDOWS_WASAPI__;QT_DEPRECATED_WARNINGS;QCUSTOMPLOT_USE_LIBRARY;USE_SSE;USE_SSE2;OUTSIDE_SPEEX;RANDOM_PREFIX=wf;EIGEN_MPL2_ONLY;EIGEN_DONT_VECTORIZE;EIGEN_VECTORIZE_SSE3;PREFIX="/usr/local";GITSHORT="4574e2b";HOST="wfview.org";UNAME="build";NDEBUG;QT_NO_DEBUG;%(PreprocessorDefinitions)
false
@@ -152,8 +152,8 @@
true
- ..\portaudio\msvc\X64\Release\portaudio_x64.lib;..\qcustomplot\x64\qcustomplot2.lib;..\opus\win32\VS2015\x64\Release\opus.lib;$(QTDIR)\lib\Qt6Multimedia.lib;$(QTDIR)\lib\Qt6PrintSupport.lib;$(QTDIR)\lib\Qt6Widgets.lib;$(QTDIR)\lib\Qt6Gui.lib;$(QTDIR)\lib\Qt6SerialPort.lib;$(QTDIR)\lib\Qt6Network.lib;$(QTDIR)\lib\Qt6Core.lib;$(QTDIR)\lib\Qt6EntryPoint.lib;shell32.lib;%(AdditionalDependencies)
- ..\opus\win32\VS2015\x64\Release;..\qcustomplot\x64;..\portaudio\msvc\X64\Release;%(AdditionalLibraryDirectories)
+ ..\hidapi\windows\x64\Release\hidapi.lib;..\portaudio\msvc\X64\Release\portaudio_x64.lib;..\qcustomplot\x64\qcustomplot2.lib;..\opus\win32\VS2015\x64\Release\opus.lib;$(QTDIR)\lib\Qt6Multimedia.lib;$(QTDIR)\lib\Qt6PrintSupport.lib;$(QTDIR)\lib\Qt6Widgets.lib;$(QTDIR)\lib\Qt6Gui.lib;$(QTDIR)\lib\Qt6SerialPort.lib;$(QTDIR)\lib\Qt6Network.lib;$(QTDIR)\lib\Qt6Core.lib;$(QTDIR)\lib\Qt6EntryPoint.lib;shell32.lib;%(AdditionalDependencies)
+ ..\hidapi\windows\x64\Release;..\opus\win32\VS2015\x64\ReleaseDLL;..\qcustomplot\x64;..\portaudio\msvc\X64\Release;%(AdditionalLibraryDirectories)
"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)
true
true
@@ -194,8 +194,10 @@
ui_%(Filename).h
- cmd /c copy /y ..\qcustomplot\x64\qcustomplot2.dll wfview-release\
-cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll wfview-release\
+ cmd /c copy /y ..\hidapi\windows\x64\Debug\hidapi.dll wfview-debug
+cmd /c copy /y ..\qcustomplot\x64\qcustomplotd2.dll wfview-debug
+cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll wfview-debug
+cmd /c copy /y ..\opus\win32\VS2015\x64\DebugDLL\opus.dll wfview-debug
Copy DLL Files
@@ -225,7 +227,7 @@ cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll wfview-release\
..\portaudio\msvc\Win32\Release\portaudio_x86.lib;..\qcustomplot\Win32\qcustomplot2.lib;..\opus\win32\VS2015\Win32\Release\opus.lib;shell32.lib;%(AdditionalDependencies)
- ..\opus\win32\VS2015\Win32\Release;..\qcustomplot\Win32;..\portaudio\msvc\Win32\Release;%(AdditionalLibraryDirectories)
+ ..\hidapi\windows\Win32\Release;..\opus\win32\VS2015\Win32\ReleaseDLL;..\qcustomplot\Win32;..\portaudio\msvc\Win32\Release;%(AdditionalLibraryDirectories)
"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)
true
true
@@ -266,8 +268,11 @@ cmd /c copy /y ..\portaudio\msvc\x64\Release\portaudio_x64.dll wfview-release\
ui_%(Filename).h
- cmd /c copy /y ..\qcustomplot\Win32\qcustomplot2.dll wfview-release\
-cmd /c copy /y ..\portaudio\msvc\Win32\Release\portaudio_x86.dll wfview-release\
+ cmd /c copy /y ..\qcustomplot\Win32\qcustomplot2.dll wfview-release
+cmd /c copy /y ..\portaudio\msvc\Win32\Release\portaudio_x86.dll wfview-release
+cmd /c copy /y ..\hidapi\windows\Release\hidapi.dll wfview-release
+cmd /c copy /y ..\opus\win32\VS2015\win32\ReleaseDLL\opus.dll wfview-release
+
Copy DLL Files
@@ -296,7 +301,7 @@ cmd /c copy /y ..\portaudio\msvc\Win32\Release\portaudio_x86.dll wfview-release\
..\portaudio\msvc\X64\Debug\portaudio_x64.lib;..\qcustomplot\x64\qcustomplotd2.lib;..\opus\win32\VS2015\x64\Debug\opus.lib;$(QTDIR)\lib\Qt6Multimediad.lib;$(QTDIR)\lib\Qt6PrintSupportd.lib;$(QTDIR)\lib\Qt6Widgetsd.lib;$(QTDIR)\lib\Qt6Guid.lib;$(QTDIR)\lib\Qt6SerialPortd.lib;$(QTDIR)\lib\Qt6Networkd.lib;$(QTDIR)\lib\Qt6Cored.lib;$(QTDIR)\lib\Qt6EntryPointd.lib;shell32.lib;%(AdditionalDependencies)
- ..\opus\win32\VS2015\x64\Debug;..\qcustomplot\x64;..\portaudio\msvc\X64\Debug;%(AdditionalLibraryDirectories)
+ ..\hidapi\windows\x64\Debug;..\opus\win32\VS2015\x64\DebugDLL;..\qcustomplot\x64;..\portaudio\msvc\X64\Debug;%(AdditionalLibraryDirectories)
"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)
true
true
@@ -362,7 +367,7 @@ cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll wfview-debug
..\portaudio\msvc\Win32\Debug\portaudio_x86.lib;..\qcustomplot\Win32\qcustomplotd2.lib;..\opus\win32\VS2015\Win32\Debug\opus.lib;shell32.lib;%(AdditionalDependencies)
- ..\opus\win32\VS2015\Win32\Debug;..\qcustomplot\Win32;..\portaudio\msvc\Win32\Debug;%(AdditionalLibraryDirectories)
+ ..\hidapi\windows\Win32\Debug;..\opus\win32\VS2015\Win32\DebugDLL;..\qcustomplot\Win32;..\portaudio\msvc\Win32\Debug;%(AdditionalLibraryDirectories)
"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)
true
true
@@ -382,7 +387,9 @@ cmd /c copy /y ..\portaudio\msvc\x64\Debug\portaudio_x64.dll wfview-debug
cmd /c copy /y ..\qcustomplot\Win32\qcustomplotd2.dll wfview-debug
-cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug
+cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug
+cmd /c copy /y ..\hidapi\windows\Debug\hidapi.dll wfview-debug
+cmd /c copy /y ..\opus\win32\VS2015\win32\DebugDLL\opus.dll wfview-debug
Copy DLL files
@@ -415,6 +422,7 @@ cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug
+
@@ -443,6 +451,9 @@ cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug
+
+
+
@@ -450,6 +461,7 @@ cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug
+
@@ -538,6 +550,7 @@ cmd /c copy /y ..\portaudio\msvc\Win32\Debug\portaudio_x86.dll wfview-debug
+
diff --git a/wfview.vcxproj.filters b/wfview.vcxproj.filters
index 04a65b6..bbd08d9 100644
--- a/wfview.vcxproj.filters
+++ b/wfview.vcxproj.filters
@@ -149,6 +149,9 @@
Source Files
+
+ Source Files
+
@@ -262,6 +265,15 @@
Header Files
+
+ Header Files
+
+
+ Header Files
+
+
+ Header Files
+
@@ -299,6 +311,9 @@
Form Files
+
+ Form Files
+
@@ -441,5 +456,8 @@
Header Files
+
+ Header Files
+
\ No newline at end of file
diff --git a/wfview.vcxproj.user b/wfview.vcxproj.user
index 55b6057..9e29378 100644
--- a/wfview.vcxproj.user
+++ b/wfview.vcxproj.user
@@ -45,10 +45,10 @@
2022-08-21T18:58:23.4329764Z
- 2023-01-29T11:49:00.1257696Z
+ 2023-02-07T17:43:48.5836323Z
- 2023-01-29T11:48:59.4191765Z
+ 2023-02-07T17:43:48.3511159Z
2022-08-22T10:47:49.1255783Z
@@ -60,9 +60,9 @@
2022-08-20T19:06:43.4553894Z
- 2023-01-29T11:49:01.5629425Z
+ 2023-02-07T17:43:50.6894101Z
- 2023-01-29T11:49:00.7644018Z
+ 2023-02-07T17:43:50.1277203Z
\ No newline at end of file