From 82adbcaba66f356262d072207734197aa222e5ae Mon Sep 17 00:00:00 2001 From: Paul Hollinsky Date: Fri, 16 Nov 2018 18:48:07 -0500 Subject: [PATCH] Windows VCP detection is now more reliable --- include/icsneo/platform/windows/ftdi.h | 2 +- include/icsneo/platform/windows/stm32.h | 2 +- include/icsneo/platform/windows/vcp.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/icsneo/platform/windows/ftdi.h b/include/icsneo/platform/windows/ftdi.h index 860a845..d693248 100644 --- a/include/icsneo/platform/windows/ftdi.h +++ b/include/icsneo/platform/windows/ftdi.h @@ -8,7 +8,7 @@ namespace icsneo { class FTDI : public VCP { public: FTDI(device_errorhandler_t err, neodevice_t& forDevice) : VCP(err, forDevice) {} - static std::vector FindByProduct(int product) { return VCP::FindByProduct(product, L"serenum"); } + static std::vector FindByProduct(int product) { return VCP::FindByProduct(product, { L"serenum", L"ftdibus" }); } }; } diff --git a/include/icsneo/platform/windows/stm32.h b/include/icsneo/platform/windows/stm32.h index 0b0dc18..6b7acba 100644 --- a/include/icsneo/platform/windows/stm32.h +++ b/include/icsneo/platform/windows/stm32.h @@ -8,7 +8,7 @@ namespace icsneo { class STM32 : public VCP { public: STM32(device_errorhandler_t err, neodevice_t& forDevice) : VCP(err, forDevice) {} - static std::vector FindByProduct(int product) { return VCP::FindByProduct(product, L"usbser"); } + static std::vector FindByProduct(int product) { return VCP::FindByProduct(product, { L"usbser" }); } }; } diff --git a/include/icsneo/platform/windows/vcp.h b/include/icsneo/platform/windows/vcp.h index dd8baa8..25a3b2b 100644 --- a/include/icsneo/platform/windows/vcp.h +++ b/include/icsneo/platform/windows/vcp.h @@ -16,7 +16,7 @@ namespace icsneo { // Virtual COM Port Communication class VCP : public ICommunication { public: - static std::vector FindByProduct(int product, wchar_t* driverName); + static std::vector FindByProduct(int product, std::vector driverName); static bool IsHandleValid(neodevice_handle_t handle); typedef void(*fn_boolCallback)(bool success);