sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added message callback functionality in c and canceled error downgrading on user callbacks in communication as well

checksum-failure-logging
EricLiu2000 2019-07-30 10:22:27 -04:00
parent 5a98bac8a6
commit c10224002a
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/icsneoc/icsneoc.cpp
View File

@ -10,6 +10,7 @@
#include "icsneo/api/eventmanager.h" #include "icsneo/api/eventmanager.h"
#include "icsneo/device/devicefinder.h" #include "icsneo/device/devicefinder.h"
#include <string> #include <string>
#include <functional>
#include <vector> #include <vector>
#include <memory> #include <memory>
#include <algorithm> #include <algorithm>
@ -242,14 +243,23 @@ bool icsneo_setPollingMessageLimit(const neodevice_t* device, size_t newLimit) {
return true; return true;
} }
int icsneo_addMessageCallback(const neodevice_t* device, void (*callback) (neomessage_t*)) { int icsneo_addMessageCallback(const neodevice_t* device, void (*callback)(neomessage_t)) {
if(!icsneo_isValidNeoDevice(device)) if(!icsneo_isValidNeoDevice(device))
return -1; return -1;
return device->device->addMessageCallback(
MessageCallback(
[=](std::shared_ptr<icsneo::Message> msg) {
return callback(CreateNeoMessage(msg));
}
)
);
} }
bool icsneo_removeMessageCallback(const neodevice_t* device, int id) { bool icsneo_removeMessageCallback(const neodevice_t* device, int id) {
if(!icsneo_isValidNeoDevice(device)) if(!icsneo_isValidNeoDevice(device))
return false; return false;
return device->device->removeMessageCallback(id);
} }
bool icsneo_getProductName(const neodevice_t* device, char* str, size_t* maxLength) { bool icsneo_getProductName(const neodevice_t* device, char* str, size_t* maxLength) {
@ -451,7 +461,7 @@ void icsneo_setWriteBlocks(const neodevice_t* device, bool blocks) {
if(!icsneo_isValidNeoDevice(device)) if(!icsneo_isValidNeoDevice(device))
return; return;
device->device->com->setWriteBlocks(blocks); device->device->setWriteBlocks(blocks);
} }
bool icsneo_describeDevice(const neodevice_t* device, char* str, size_t* maxLength) { bool icsneo_describeDevice(const neodevice_t* device, char* str, size_t* maxLength) {

3
communication/communication.cpp
View File

@ -156,11 +156,14 @@ void Communication::readTask() {
std::lock_guard<std::mutex> lk(messageCallbacksLock); std::lock_guard<std::mutex> lk(messageCallbacksLock);
// We want callbacks to be able to access errors
EventManager::GetInstance().cancelErrorDowngradingOnCurrentThread();
for(auto& cb : messageCallbacks) { for(auto& cb : messageCallbacks) {
if(!closing) { // We might have closed while reading or processing if(!closing) { // We might have closed while reading or processing
cb.second.callIfMatch(msg); cb.second.callIfMatch(msg);
} }
} }
EventManager::GetInstance().downgradeErrorsOnCurrentThread();
} }
} }
} }

4
include/icsneo/icsneoc.h
View File

@ -284,7 +284,7 @@ extern size_t DLLExport icsneo_getPollingMessageLimit(const neodevice_t* device)
*/ */
extern bool DLLExport icsneo_setPollingMessageLimit(const neodevice_t* device, size_t newLimit); extern bool DLLExport icsneo_setPollingMessageLimit(const neodevice_t* device, size_t newLimit);
extern int DLLExport icsneo_addMessageCallback(const neodevice_t* device, void (*callback) (neomessage_t*)); extern int DLLExport icsneo_addMessageCallback(const neodevice_t* device, void (*callback)(neomessage_t));
extern bool DLLExport icsneo_removeMessageCallback(const neodevice_t* device, int id); extern bool DLLExport icsneo_removeMessageCallback(const neodevice_t* device, int id);
@ -743,7 +743,7 @@ fn_icsneo_getPollingMessageLimit icsneo_getPollingMessageLimit;
typedef bool(*fn_icsneo_setPollingMessageLimit)(const neodevice_t* device, size_t newLimit); typedef bool(*fn_icsneo_setPollingMessageLimit)(const neodevice_t* device, size_t newLimit);
fn_icsneo_setPollingMessageLimit icsneo_setPollingMessageLimit; fn_icsneo_setPollingMessageLimit icsneo_setPollingMessageLimit;
typedef int(*fn_icsneo_addMessageCallback)(const neodevice_t* device, void (*callback) (neomessage_t*); typedef int(*fn_icsneo_addMessageCallback)(const neodevice_t* device, void (*callback)(neomessage_t));
fn_icsneo_addMessageCallback icsneo_addMessageCallback; fn_icsneo_addMessageCallback icsneo_addMessageCallback;
typedef bool(*fn_icsneo_removeMessageCallback)(const neodevice_t* device, int id); typedef bool(*fn_icsneo_removeMessageCallback)(const neodevice_t* device, int id);