From 18c67764ae7cc9827095eb4e70d75aa52ac8b392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20H=C3=B6glinger-Stelzer?= Date: Mon, 24 Aug 2020 11:29:02 +0200 Subject: [PATCH] Removed tester console app --- ViGEmClient.sln | 31 ------ app/Tester/Tester.cpp | 93 ---------------- app/Tester/Tester.vcxproj | 176 ------------------------------ app/Tester/Tester.vcxproj.filters | 22 ---- 4 files changed, 322 deletions(-) delete mode 100644 app/Tester/Tester.cpp delete mode 100644 app/Tester/Tester.vcxproj delete mode 100644 app/Tester/Tester.vcxproj.filters diff --git a/ViGEmClient.sln b/ViGEmClient.sln index 4c2877b..9ff0015 100644 --- a/ViGEmClient.sln +++ b/ViGEmClient.sln @@ -5,10 +5,6 @@ VisualStudioVersion = 16.0.29709.97 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ViGEmClient", "src\ViGEmClient.vcxproj", "{7DB06674-1F4F-464B-8E1C-172E9587F9DC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "App", "App", "{8169FFB3-60F9-4A0C-B172-8E26B982B45F}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tester", "app\Tester\Tester.vcxproj", "{2F4ED0AB-0B51-4506-91AA-1984C5D44B85}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug_DLL|x64 = Debug_DLL|x64 @@ -49,37 +45,10 @@ Global {7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x64.Build.0 = Release_LIB|x64 {7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x86.ActiveCfg = Release_LIB|Win32 {7DB06674-1F4F-464B-8E1C-172E9587F9DC}.Release|x86.Build.0 = Release_LIB|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug_DLL|x64.ActiveCfg = Debug|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug_DLL|x64.Build.0 = Debug|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug_DLL|x86.ActiveCfg = Debug|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug_DLL|x86.Build.0 = Debug|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug_LIB|x64.ActiveCfg = Debug|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug_LIB|x64.Build.0 = Debug|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug_LIB|x86.ActiveCfg = Debug|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug_LIB|x86.Build.0 = Debug|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug|x64.ActiveCfg = Debug|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug|x64.Build.0 = Debug|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug|x86.ActiveCfg = Debug|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Debug|x86.Build.0 = Debug|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release_DLL|x64.ActiveCfg = Release|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release_DLL|x64.Build.0 = Release|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release_DLL|x86.ActiveCfg = Release|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release_DLL|x86.Build.0 = Release|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release_LIB|x64.ActiveCfg = Release|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release_LIB|x64.Build.0 = Release|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release_LIB|x86.ActiveCfg = Release|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release_LIB|x86.Build.0 = Release|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release|x64.ActiveCfg = Release|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release|x64.Build.0 = Release|x64 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release|x86.ActiveCfg = Release|Win32 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85} = {8169FFB3-60F9-4A0C-B172-8E26B982B45F} - EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D5CD61FD-80BB-4E0E-840C-BAF66ABB1CF0} EndGlobalSection diff --git a/app/Tester/Tester.cpp b/app/Tester/Tester.cpp deleted file mode 100644 index 5dcf350..0000000 --- a/app/Tester/Tester.cpp +++ /dev/null @@ -1,93 +0,0 @@ -// Tester.cpp : This file contains the 'main' function. Program execution begins and ends there. -// - -#define WIN32_LEAN_AND_MEAN -#include -#include - -#include -#include - -// Comment out for DS4 sample -#define X360 - -static std::mutex m; - -VOID CALLBACK notification( - PVIGEM_CLIENT Client, - PVIGEM_TARGET Target, - UCHAR LargeMotor, - UCHAR SmallMotor, - UCHAR LedNumber, - LPVOID UserData -) -{ - m.lock(); - - static int count = 1; - - std::cout.width(3); - std::cout << count++ << " "; - std::cout.width(3); - std::cout << (int)LargeMotor << " "; - std::cout.width(3); - std::cout << (int)SmallMotor << std::endl; - - m.unlock(); -} - -int main() -{ - const auto client = vigem_alloc(); - - auto ret = vigem_connect(client); - -#ifdef X360 - const auto x360 = vigem_target_x360_alloc(); - - ret = vigem_target_add(client, x360); - - ret = vigem_target_x360_register_notification(client, x360, ¬ification, nullptr); -#endif - - const auto ds4 = vigem_target_ds4_alloc(); - - ret = vigem_target_add(client, ds4); - -#ifdef X360 - XUSB_REPORT report; - XUSB_REPORT_INIT(&report); - - while(!(GetAsyncKeyState(VK_ESCAPE) & 0x8000)) - { - ret = vigem_target_x360_update(client, x360, report); - report.bLeftTrigger++; - Sleep(10); - } - -#else - - DS4_REPORT report; - DS4_REPORT_INIT(&report); - - while (!(GetAsyncKeyState(VK_ESCAPE) & 0x8000)) - { - ret = vigem_target_ds4_update(client, ds4, report); - report.bThumbLX++; - report.wButtons |= DS4_BUTTON_CIRCLE; - Sleep(10); - } - - #endif - -#ifdef X360 - vigem_target_x360_unregister_notification(x360); - vigem_target_remove(client, x360); - vigem_target_free(x360); -#endif - - vigem_target_remove(client, ds4); - vigem_target_free(ds4); - - vigem_free(client); -} diff --git a/app/Tester/Tester.vcxproj b/app/Tester/Tester.vcxproj deleted file mode 100644 index 2dcc7f4..0000000 --- a/app/Tester/Tester.vcxproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 15.0 - {2F4ED0AB-0B51-4506-91AA-1984C5D44B85} - Win32Proj - Tester - 10.0 - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - false - $(SolutionDir)include;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - true - $(SolutionDir)include;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - true - $(SolutionDir)include;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - false - $(SolutionDir)include;$(VC_IncludePath);$(WindowsSDK_IncludePath); - - - - - - Level3 - MaxSpeed - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - Level3 - Disabled - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreadedDebug - - - Console - true - setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - Level3 - MaxSpeed - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - MultiThreaded - - - Console - true - true - true - setupapi.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - - - - - - {7db06674-1f4f-464b-8e1c-172e9587f9dc} - - - - - - \ No newline at end of file diff --git a/app/Tester/Tester.vcxproj.filters b/app/Tester/Tester.vcxproj.filters deleted file mode 100644 index 87da40a..0000000 --- a/app/Tester/Tester.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file