Allow polling for messages from C

api/icsneoc/icsneoc.cpp

@@ -12,6 +12,7 @@
 #include <memory>
 #include <algorithm>
 #include <cstring>
+#include <map>
 
 using namespace icsneo;
 
@@ -21,6 +22,9 @@ static std::vector<std::shared_ptr<Device>> connectableFoundDevices, connectedDe
 // Any shared_ptrs we've let go should be placed here so they're not accessed
 static std::vector<Device*> freedDevices;
 
+// We store an array of shared_ptr messages per device (by serial), this means we own the memory of the data pointer
+static std::map<std::string, std::vector<std::shared_ptr<Message>>> polledMessageStorage;
+
 void icsneoFindAllDevices(neodevice_t* devices, size_t* count) {
 	icsneoFreeUnconnectedDevices(); // Mark previous results as freed so they can no longer be connected to
 	auto foundDevices = icsneo::FindAllDevices();
@@ -127,4 +131,64 @@ bool icsneoIsOnline(const neodevice_t* device) {
 		return false;
 
 	return device->device->isOnline();
+}
+
+bool icsneoEnableMessagePolling(const neodevice_t* device) {
+	if(!icsneoIsValidNeoDevice(device))
+		return false;
+
+	device->device->enableMessagePolling();
+	return true;
+}
+
+bool icsneoDisableMessagePolling(const neodevice_t* device) {
+	if(!icsneoIsValidNeoDevice(device))
+		return false;
+
+	return device->device->disableMessagePolling();
+}
+
+bool icsneoGetMessages(const neodevice_t* device, neomessage_t* messages, size_t* items) {
+	if(!icsneoIsValidNeoDevice(device))
+		return false;
+
+	if(items == nullptr)
+		return false;
+
+	if(messages == nullptr) {
+		// A NULL value for messages means the user wants the current size of the buffer into items
+		*items = device->device->getCurrentMessageCount();
+		return true;
+	}
+
+	std::vector<std::shared_ptr<Message>>& storage = polledMessageStorage[device->serial];
+
+	if(!device->device->getMessages(storage, *items))
+		return false;
+
+	*items = storage.size();
+
+	for(size_t i = 0; i < *items; i++) {
+		// For each message, copy into neomessage_t buffer given
+		messages[i] = CreateNeoMessage(*(storage[i]));
+	}
+
+	// The user now has until the next call of icsneoGetMessages (for this device) to use the data, after which point it's freed
+	// The user should copy the data out if they want it
+	return true;
+}
+
+size_t icsneoGetPollingMessageLimit(const neodevice_t* device) {
+	if(!icsneoIsValidNeoDevice(device))
+		return 0;
+
+	return device->device->getPollingMessageLimit();
+}
+
+bool icsneoSetPollingMessageLimit(const neodevice_t* device, size_t newLimit) {
+	if(!icsneoIsValidNeoDevice(device))
+		return false;
+
+	device->device->setPollingMessageLimit(newLimit);
+	return true;
 }

api/icsneoc/include/icsneoc.h

@@ -3,6 +3,7 @@
 
 #include <stddef.h>
 #include "device/include/neodevice.h" // For neodevice_t
+#include "communication/message/include/neomessage.h" // For neomessage_t and friends
 #include "platform/include/dynamiclib.h" // Dynamic library loading and exporting
 
 #ifndef ICSNEOC_DYNAMICLOAD
@@ -31,6 +32,16 @@ extern bool DLLExport icsneoGoOffline(const neodevice_t* device);
 
 extern bool DLLExport icsneoIsOnline(const neodevice_t* device);
 
+extern bool DLLExport icsneoEnableMessagePolling(const neodevice_t* device);
+
+extern bool DLLExport icsneoDisableMessagePolling(const neodevice_t* device);
+
+extern bool DLLExport icsneoGetMessages(const neodevice_t* device, neomessage_t* messages, size_t* items);
+
+extern size_t DLLExport icsneoGetPollingMessageLimit(const neodevice_t* device);
+
+extern bool DLLExport icsneoSetPollingMessageLimit(const neodevice_t* device, size_t newLimit);
+
 #ifdef __cplusplus
 }
 #endif
@@ -67,6 +78,21 @@ fn_icsneoGoOffline icsneoGoOffline;
 typedef bool(*fn_icsneoIsOnline)(const neodevice_t* device);
 fn_icsneoIsOnline icsneoIsOnline;
 
+typedef bool(*fn_icsneoEnableMessagePolling)(const neodevice_t* device);
+fn_icsneoEnableMessagePolling icsneoEnableMessagePolling;
+
+typedef bool(*fn_icsneoDisableMessagePolling)(const neodevice_t* device);
+fn_icsneoDisableMessagePolling icsneoDisableMessagePolling;
+
+typedef bool(*fn_icsneoGetMessages)(const neodevice_t* device, neomessage_t* messages, size_t* items);
+fn_icsneoGetMessages icsneoGetMessages;
+
+typedef size_t(*fn_icsneoGetPollingMessageLimit)(const neodevice_t* device);
+fn_icsneoGetPollingMessageLimit icsneoGetPollingMessageLimit;
+
+typedef bool(*fn_icsneoSetPollingMessageLimit)(const neodevice_t* device, size_t newLimit);
+fn_icsneoSetPollingMessageLimit icsneoSetPollingMessageLimit;
+
 #define ICSNEO_IMPORT(func) func = (fn_##func)icsneoDynamicLibraryGetFunction(icsneoLibraryHandle, #func)
 #define ICSNEO_IMPORTASSERT(func) if((ICSNEO_IMPORT(func)) == NULL) return 3
 void* icsneoLibraryHandle = NULL;
@@ -91,6 +117,11 @@ int icsneoInit() {
 	ICSNEO_IMPORTASSERT(icsneoGoOnline);
 	ICSNEO_IMPORTASSERT(icsneoGoOffline);
 	ICSNEO_IMPORTASSERT(icsneoIsOnline);
+	ICSNEO_IMPORTASSERT(icsneoEnableMessagePolling);
+	ICSNEO_IMPORTASSERT(icsneoDisableMessagePolling);
+	ICSNEO_IMPORTASSERT(icsneoGetMessages);
+	ICSNEO_IMPORTASSERT(icsneoGetPollingMessageLimit);
+	ICSNEO_IMPORTASSERT(icsneoSetPollingMessageLimit);
 
 	icsneoInitialized = true;
 	return 0;