sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 09:28:40 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into pcap

Browse Source
This commit is contained in:
Paul Hollinsky
2019-05-06 13:16:29 -04:00
parent 424d3d98a3 0b4ffdbaad
commit 3aaccaad74
25 changed files with 2453 additions and 989 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/platform/posix/ftdi.h
+1 -2
View File
@@ -16,7 +16,7 @@ class FTDI : public ICommunication {
public:
static std::vector<neodevice_t> FindByProduct(int product);
FTDI(device_errorhandler_t err, neodevice_t& forDevice);
FTDI(const device_errorhandler_t& err, neodevice_t& forDevice);
~FTDI() { close(); }
bool open();
bool close();
@@ -56,7 +56,6 @@ private:
bool openable; // Set to false in the constructor if the object has not been found in searchResultDevices
neodevice_t& device;
device_errorhandler_t err;
};
}
include/icsneo/platform/posix/stm32.h
+1 -2
View File
@@ -11,7 +11,7 @@ namespace icsneo {
class STM32 : public ICommunication {
public:
STM32(device_errorhandler_t err, neodevice_t& forDevice) : device(forDevice), err(err) {}
STM32(const device_errorhandler_t& err, neodevice_t& forDevice) : ICommunication(err), device(forDevice) {}
static std::vector<neodevice_t> FindByProduct(int product);
bool open();
@@ -20,7 +20,6 @@ public:
private:
neodevice_t& device;
device_errorhandler_t err;
int fd = -1;
static constexpr neodevice_handle_t HANDLE_OFFSET = 10;
include/icsneo/platform/windows/ftdi.h
+1 -1
View File
@@ -7,7 +7,7 @@ namespace icsneo {
class FTDI : public VCP {
public:
FTDI(device_errorhandler_t err, neodevice_t& forDevice) : VCP(err, forDevice) {}
FTDI(const device_errorhandler_t& err, neodevice_t& forDevice) : VCP(err, forDevice) {}
static std::vector<neodevice_t> FindByProduct(int product) { return VCP::FindByProduct(product, { L"serenum" /*, L"ftdibus" */ }); }
};
include/icsneo/platform/windows/pcap.h
+1 -1
View File
@@ -21,7 +21,7 @@ public:
static std::string GetEthDevSerialFromMacAddress(uint8_t product, uint16_t macSerial);
static bool IsHandleValid(neodevice_handle_t handle);
PCAP(device_errorhandler_t err, neodevice_t& forDevice);
PCAP(const device_errorhandler_t& err, neodevice_t& forDevice);
bool open();
bool isOpen();
bool close();
include/icsneo/platform/windows/stm32.h
+1 -1
View File
@@ -7,7 +7,7 @@ namespace icsneo {
class STM32 : public VCP {
public:
STM32(device_errorhandler_t err, neodevice_t& forDevice) : VCP(err, forDevice) {}
STM32(const device_errorhandler_t& err, neodevice_t& forDevice) : VCP(err, forDevice) {}
static std::vector<neodevice_t> FindByProduct(int product) { return VCP::FindByProduct(product, { L"usbser" }); }
};
include/icsneo/platform/windows/vcp.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
static bool IsHandleValid(neodevice_handle_t handle);
typedef void(*fn_boolCallback)(bool success);
VCP(device_errorhandler_t err, neodevice_t& forDevice) : device(forDevice), err(err) {
VCP(const device_errorhandler_t& err, neodevice_t& forDevice) : ICommunication(err), device(forDevice) {
overlappedRead.hEvent = INVALID_HANDLE_VALUE;
overlappedWrite.hEvent = INVALID_HANDLE_VALUE;
overlappedWait.hEvent = INVALID_HANDLE_VALUE;