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

Remove all debugging printouts to stdout

Browse Source
This commit is contained in:
Paul Hollinsky
2018-10-30 15:02:01 -04:00
parent ccd26a3637
commit 92d98f8bd5
16 changed files with 79 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/icsneo/platform/posix/ftdi.h
+3 -1
View File
@@ -9,6 +9,7 @@
#include "icsneo/device/neodevice.h"
#include "icsneo/communication/icommunication.h"
#include "icsneo/third-party/concurrentqueue/blockingconcurrentqueue.h"
#include "icsneo/api/errormanager.h"
namespace icsneo {
@@ -18,7 +19,7 @@ public:
static std::vector<neodevice_t> FindByProduct(int product);
static bool IsHandleValid(neodevice_handle_t handle);
FTDI(neodevice_t& forDevice);
FTDI(device_errorhandler_t err, neodevice_t& forDevice);
~FTDI() { close(); }
bool open();
bool close();
@@ -43,6 +44,7 @@ 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;
FTDIDevice ftdiDevice;
};
include/icsneo/platform/posix/stm32.h
+3 -1
View File
@@ -3,6 +3,7 @@
#include "icsneo/communication/icommunication.h"
#include "icsneo/device/neodevice.h"
#include "icsneo/api/errormanager.h"
#include <chrono>
#include <stdint.h>
@@ -10,7 +11,7 @@ namespace icsneo {
class STM32 : public ICommunication {
public:
STM32(neodevice_t& forDevice) : device(forDevice) {}
STM32(device_errorhandler_t err, neodevice_t& forDevice) : device(forDevice), err(err) {}
static std::vector<neodevice_t> FindByProduct(int product);
bool open();
@@ -19,6 +20,7 @@ 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(neodevice_t& forDevice) : VCP(forDevice) {}
FTDI(device_errorhandler_t err, neodevice_t& forDevice) : VCP(err, forDevice) {}
static std::vector<neodevice_t> FindByProduct(int product) { return VCP::FindByProduct(product, L"serenum"); }
};
include/icsneo/platform/windows/pcap.h
+2 -1
View File
@@ -4,6 +4,7 @@
#include "icsneo/platform/windows/internal/pcapdll.h"
#include "icsneo/device/neodevice.h"
#include "icsneo/communication/icommunication.h"
#include "icsneo/api/errormanager.h"
#include <string>
namespace icsneo {
@@ -20,7 +21,7 @@ public:
static std::string GetEthDevSerialFromMacAddress(uint8_t product, uint16_t macSerial);
static bool IsHandleValid(neodevice_handle_t handle);
PCAP(neodevice_t& forDevice);
PCAP(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(neodevice_t& forDevice) : VCP(forDevice) {}
STM32(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
+3 -1
View File
@@ -9,6 +9,7 @@
#include <Windows.h>
#include "icsneo/device/neodevice.h"
#include "icsneo/communication/icommunication.h"
#include "icsneo/api/errormanager.h"
namespace icsneo {
@@ -19,7 +20,7 @@ public:
static bool IsHandleValid(neodevice_handle_t handle);
typedef void(*fn_boolCallback)(bool success);
VCP(neodevice_t& forDevice) : device(forDevice) {
VCP(device_errorhandler_t err, neodevice_t& forDevice) : device(forDevice), err(err) {
overlappedRead.hEvent = INVALID_HANDLE_VALUE;
overlappedWrite.hEvent = INVALID_HANDLE_VALUE;
overlappedWait.hEvent = INVALID_HANDLE_VALUE;
@@ -34,6 +35,7 @@ private:
bool open(bool fromAsync);
bool opening = false;
neodevice_t& device;
device_errorhandler_t err;
HANDLE handle = INVALID_HANDLE_VALUE;
OVERLAPPED overlappedRead = {};
OVERLAPPED overlappedWrite = {};