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
platform/posix/ftdi.cpp
+3 -2
View File
@@ -13,7 +13,7 @@ std::vector<std::tuple<int, std::string>> FTDI::handles;
std::vector<neodevice_t> FTDI::FindByProduct(int product) {
constexpr size_t deviceSerialBufferLength = sizeof(device.serial);
std::vector<neodevice_t> found;
FTDIContext context;
static FTDIContext context;
std::pair<int, std::vector<std::string>> result = context.findDevices(product);
if(result.first < 0)
@@ -39,7 +39,7 @@ std::vector<neodevice_t> FTDI::FindByProduct(int product) {
return found;
}
FTDI::FTDI(device_errorhandler_t err, neodevice_t& forDevice) : device(forDevice), err(err) {
FTDI::FTDI(const device_errorhandler_t& err, neodevice_t& forDevice) : ICommunication(err), device(forDevice) {
openable = strlen(forDevice.serial) > 0 && device.handle >= 0 && device.handle < (neodevice_handle_t)handles.size();
}
@@ -183,5 +183,6 @@ void FTDI::writeTask() {
continue;
ftdi.write(writeOp.bytes.data(), (int)writeOp.bytes.size());
onWrite();
}
}
platform/posix/stm32.cpp
+1
View File
@@ -285,5 +285,6 @@ void STM32::writeTask() {
ssize_t actualWritten = ::write(fd, writeOp.bytes.data(), writeSize);
if(actualWritten != writeSize)
err(APIError::FailedToWrite);
onWrite();
}
}