From bcfae7d4e508975027ef0dbc6542d37cd93b9c20 Mon Sep 17 00:00:00 2001
From: Ake Hedman <akhe@grodansparadis.com>
Date: Wed, 13 Nov 2024 15:28:19 +0100
Subject: [PATCH] Normalized callback initializers

---
 database                                      | Bin 1507328 -> 1507328 bytes
 .../database/vscp-hashtypeevents.sqlite3      | Bin 1507328 -> 1507328 bytes
 src/vscp/common/vscp-client-canal.cpp         |   8 ++++----
 src/vscp/common/vscp-client-canal.h           |   4 ++--
 src/vscp/common/vscp-client-socketcan.cpp     |   8 ++++----
 src/vscp/common/vscp-client-socketcan.h       |  18 ++++++++++--------
 6 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/database b/database
index 87b0bc90b5414d2038c2d21e2a6b2a6e16663155..b1628d11ad25d780a0481d9c05f7faa779d8e0a1 100644
GIT binary patch
delta 105
zcmZo@h-m<#7RDB)7UmX~7S<NF7WNj77S0x~7VZ|F7Ty-V7XB82ErM(hIMy-nNN_*p
zUbk5=U;+2^^{)l9xl{VQ*%=s_;`{P-rZa94RB88kBM8JoKr9TzB0wy<-Q$he4q*T%
CRV2s&

delta 110
zcmZo@h-m<#7RDB)7UmX~7S<NF7WNj77S0x~7VZ|F7Ty-V7XB82ErM(h*w-`gNOC{p
zo-Fua-e!dW7VhcmUJGV(B=>o<GcYp6PFH**C^`NAM@HUuk2iuqECj^DKr8~pqT4;*
Ii0u#t0P&9}V*mgE

diff --git a/resources/database/vscp-hashtypeevents.sqlite3 b/resources/database/vscp-hashtypeevents.sqlite3
index 87b0bc90b5414d2038c2d21e2a6b2a6e16663155..b1628d11ad25d780a0481d9c05f7faa779d8e0a1 100644
GIT binary patch
delta 105
zcmZo@h-m<#7RDB)7UmX~7S<NF7WNj77S0x~7VZ|F7Ty-V7XB82ErM(hIMy-nNN_*p
zUbk5=U;+2^^{)l9xl{VQ*%=s_;`{P-rZa94RB88kBM8JoKr9TzB0wy<-Q$he4q*T%
CRV2s&

delta 110
zcmZo@h-m<#7RDB)7UmX~7S<NF7WNj77S0x~7VZ|F7Ty-V7XB82ErM(h*w-`gNOC{p
zo-Fua-e!dW7VhcmUJGV(B=>o<GcYp6PFH**C^`NAM@HUuk2iuqECj^DKr8~pqT4;*
Ii0u#t0P&9}V*mgE

diff --git a/src/vscp/common/vscp-client-canal.cpp b/src/vscp/common/vscp-client-canal.cpp
index a4a350126..38f145b6e 100644
--- a/src/vscp/common/vscp-client-canal.cpp
+++ b/src/vscp/common/vscp-client-canal.cpp
@@ -507,7 +507,7 @@ vscpClientCanal::getResponseTimeout(void)
 //
 
 int
-vscpClientCanal::setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)> callback)
+vscpClientCanal::setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)> callback, void *pData)
 {
   // Can not be called when connected
   if (m_bConnected) {
@@ -516,7 +516,7 @@ vscpClientCanal::setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)> ca
   }
 
   spdlog::debug("CANAL CLIENT: ev callback set.");
- CVscpClient::setCallbackEv(callback);
+ CVscpClient::setCallbackEv(callback, pData);
   return VSCP_ERROR_SUCCESS;
 }
 
@@ -525,7 +525,7 @@ vscpClientCanal::setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)> ca
 //
 
 int
-vscpClientCanal::setCallbackEx(std::function<void(vscpEventEx &ex, void *pobj)> callback)
+vscpClientCanal::setCallbackEx(std::function<void(vscpEventEx &ex, void *pobj)> callback, void *pData)
 {
   // Can not be called when connected
   if (m_bConnected) {
@@ -534,7 +534,7 @@ vscpClientCanal::setCallbackEx(std::function<void(vscpEventEx &ex, void *pobj)>
   }
 
   spdlog::debug("CANAL CLIENT: ex callback set.");
-  CVscpClient::setCallbackEx(callback);
+  CVscpClient::setCallbackEx(callback, pData);
   return VSCP_ERROR_SUCCESS;
 }
 
diff --git a/src/vscp/common/vscp-client-canal.h b/src/vscp/common/vscp-client-canal.h
index fef2c87a4..e89a08c50 100644
--- a/src/vscp/common/vscp-client-canal.h
+++ b/src/vscp/common/vscp-client-canal.h
@@ -161,13 +161,13 @@ class vscpClientCanal : public CVscpClient {
       Set (and enable) receive callback for events
       @return Return VSCP_ERROR_SUCCESS of OK and error code else.
   */
-  virtual int setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)> callback);
+  virtual int setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)> callback, void *pData = nullptr);
 
   /*!
       Set (and enable) receive callback ex events
       @return Return VSCP_ERROR_SUCCESS of OK and error code else.
   */
-  virtual int setCallbackEx(std::function<void(vscpEventEx &ex, void *pobj)> callback);
+  virtual int setCallbackEx(std::function<void(vscpEventEx &ex, void *pobj)> callback, void *pData = nullptr);
 
   /*!
       Return a JSON representation of connection
diff --git a/src/vscp/common/vscp-client-socketcan.cpp b/src/vscp/common/vscp-client-socketcan.cpp
index d379f4e66..49e452004 100644
--- a/src/vscp/common/vscp-client-socketcan.cpp
+++ b/src/vscp/common/vscp-client-socketcan.cpp
@@ -696,14 +696,14 @@ vscpClientSocketCan::sendToCallbacks(vscpEvent *pev)
 //
 
 int
-vscpClientSocketCan::setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)> callback)
+vscpClientSocketCan::setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)> callback, void *pData )
 {
   // Can not be called when connected
   if (m_bConnected) {
     return VSCP_ERROR_ERROR;
   }
 
-  CVscpClient::setCallbackEv(callback);
+  CVscpClient::setCallbackEv(callback, pData);
 
   return VSCP_ERROR_SUCCESS;
 }
@@ -713,14 +713,14 @@ vscpClientSocketCan::setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)
 //
 
 int
-vscpClientSocketCan::setCallbackEx(std::function<void(vscpEventEx &ex, void *pobj)> callback)
+vscpClientSocketCan::setCallbackEx(std::function<void(vscpEventEx &ex, void *pobj)> callback, void *pData )
 {
   // Can not be called when connected
   if (m_bConnected) {
     return VSCP_ERROR_ERROR;
   }
 
-  CVscpClient::setCallbackEx(callback);
+  CVscpClient::setCallbackEx(callback, pData);
   return VSCP_ERROR_SUCCESS;
 }
 
diff --git a/src/vscp/common/vscp-client-socketcan.h b/src/vscp/common/vscp-client-socketcan.h
index 8a3eef153..75e927551 100644
--- a/src/vscp/common/vscp-client-socketcan.h
+++ b/src/vscp/common/vscp-client-socketcan.h
@@ -43,19 +43,19 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <canal.h>
 #include <canal-macro.h>
+#include <canal.h>
 #include <guid.h>
 #include <hlo.h>
 #include <remotevariablecodes.h>
-#include <vscp.h>
 #include <vscp-class.h>
-#include <vscp-type.h>
 #include <vscp-client-base.h>
+#include <vscp-type.h>
+#include <vscp.h>
 #include <vscpdatetime.h>
 #include <vscphelper.h>
 
-#include <nlohmann/json.hpp> 
+#include <nlohmann/json.hpp>
 
 #include "spdlog/sinks/rotating_file_sink.h"
 #include "spdlog/spdlog.h"
@@ -123,7 +123,7 @@ class vscpClientSocketCan : public CVscpClient {
     Set state of connected flag
     @param b True for connected, false for not connected.
   */
-  void setConnected(bool b=true) {m_bConnected = b;};
+  void setConnected(bool b = true) { m_bConnected = b; };
 
   /*!
       Send VSCP event to remote host.
@@ -211,13 +211,15 @@ class vscpClientSocketCan : public CVscpClient {
       Set (and enable) receive callback for events
       @return Return VSCP_ERROR_SUCCESS of OK and error code else.
   */
-  virtual int setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)> callback);
+  //using CVscpClient::setCallbackEv;
+  virtual int setCallbackEv(std::function<void(vscpEvent &ev, void *pobj)> callback, void *pData = nullptr);
 
   /*!
       Set (and enable) receive callback ex events
       @return Return VSCP_ERROR_SUCCESS of OK and error code else.
   */
-  virtual int setCallbackEx(std::function<void(vscpEventEx &ex, void *pobj)> callback);
+  //using CVscpClient::setCallbackEx;
+  virtual int setCallbackEx(std::function<void(vscpEventEx &ex, void *pobj)> callback, void *pData = nullptr);
 
   /*!
       Return a JSON representation of connection
@@ -293,7 +295,7 @@ class vscpClientSocketCan : public CVscpClient {
   // ------------------------------------------------------------------------
 
   // Event lists
-  //std::list<vscpEvent *> m_sendList;
+  // std::list<vscpEvent *> m_sendList;
   std::list<vscpEvent *> m_receiveList;
 
   /*!