Renamed client classes

grodansparadis · May 13, 2024 · c089318 · c089318
1 parent 6e5c5f2
commit c089318
Show file tree

Hide file tree

Showing 39 changed files with 4 additions and 4 deletions.
diff --git a/src/vscp/common/canal_macro.h → src/vscp/common/canal-macro.h b/src/vscp/common/canal_macro.h → src/vscp/common/canal-macro.h
diff --git a/src/vscp/common/canal_xmlconfig.cpp → src/vscp/common/canal-xmlconfig.cpp b/src/vscp/common/canal_xmlconfig.cpp → src/vscp/common/canal-xmlconfig.cpp
diff --git a/src/vscp/common/canal_xmlconfig.h → src/vscp/common/canal-xmlconfig.h b/src/vscp/common/canal_xmlconfig.h → src/vscp/common/canal-xmlconfig.h
diff --git a/src/vscp/common/vscp_bootdevice_pic1.cpp → src/vscp/common/vscp-bootdevice-pic1.cpp b/src/vscp/common/vscp_bootdevice_pic1.cpp → src/vscp/common/vscp-bootdevice-pic1.cpp
diff --git a/src/vscp/common/vscp_bootdevice_pic1.h → src/vscp/common/vscp-bootdevice-pic1.h b/src/vscp/common/vscp_bootdevice_pic1.h → src/vscp/common/vscp-bootdevice-pic1.h
diff --git a/src/vscp/common/vscp_bootdevice_vscp.cpp → src/vscp/common/vscp-bootdevice-vscp.cpp b/src/vscp/common/vscp_bootdevice_vscp.cpp → src/vscp/common/vscp-bootdevice-vscp.cpp
diff --git a/src/vscp/common/vscp_bootdevice_vscp.h → src/vscp/common/vscp-bootdevice-vscp.h b/src/vscp/common/vscp_bootdevice_vscp.h → src/vscp/common/vscp-bootdevice-vscp.h
diff --git a/src/vscp/common/vscp_bootdevice.cpp → src/vscp/common/vscp-bootdevice.cpp b/src/vscp/common/vscp_bootdevice.cpp → src/vscp/common/vscp-bootdevice.cpp
diff --git a/src/vscp/common/vscp_bootdevice.h → src/vscp/common/vscp-bootdevice.h b/src/vscp/common/vscp_bootdevice.h → src/vscp/common/vscp-bootdevice.h
diff --git a/src/vscp/common/vscp_client_base.cpp → src/vscp/common/vscp-client-base.cpp b/src/vscp/common/vscp_client_base.cpp → src/vscp/common/vscp-client-base.cpp
@@ -81,7 +81,7 @@ CVscpClient::setCallbackEx(std::function<void(vscpEventEx &ex, void *pobj)> call
 {
   m_callbackex     = callback;
   m_callbackObject = pData;
-  m_bActiveCallbackEv = true;
-
+  m_bActiveCallbackEx = true;
+  
   return VSCP_ERROR_SUCCESS;
 };
diff --git a/src/vscp/common/vscp_client_base.h → src/vscp/common/vscp-client-base.h b/src/vscp/common/vscp_client_base.h → src/vscp/common/vscp-client-base.h
diff --git a/src/vscp/common/vscp_client_canal.cpp → src/vscp/common/vscp-client-canal.cpp b/src/vscp/common/vscp_client_canal.cpp → src/vscp/common/vscp-client-canal.cpp
diff --git a/src/vscp/common/vscp_client_canal.h → src/vscp/common/vscp-client-canal.h b/src/vscp/common/vscp_client_canal.h → src/vscp/common/vscp-client-canal.h
diff --git a/src/vscp/common/vscp_client_canal.md → src/vscp/common/vscp-client-canal.md b/src/vscp/common/vscp_client_canal.md → src/vscp/common/vscp-client-canal.md
diff --git a/src/vscp/common/vscp_client_level2.cpp → src/vscp/common/vscp-client-level2.cpp b/src/vscp/common/vscp_client_level2.cpp → src/vscp/common/vscp-client-level2.cpp
diff --git a/src/vscp/common/vscp_client_level2.h → src/vscp/common/vscp-client-level2.h b/src/vscp/common/vscp_client_level2.h → src/vscp/common/vscp-client-level2.h
diff --git a/src/vscp/common/vscp_client_level2.md → src/vscp/common/vscp-client-level2.md b/src/vscp/common/vscp_client_level2.md → src/vscp/common/vscp-client-level2.md
diff --git a/src/vscp/common/vscp_client_mqtt.cpp → src/vscp/common/vscp-client-mqtt.cpp b/src/vscp/common/vscp_client_mqtt.cpp → src/vscp/common/vscp-client-mqtt.cpp
diff --git a/src/vscp/common/vscp_client_mqtt.h → src/vscp/common/vscp-client-mqtt.h b/src/vscp/common/vscp_client_mqtt.h → src/vscp/common/vscp-client-mqtt.h
diff --git a/src/vscp/common/vscp_client_mqtt.md → src/vscp/common/vscp-client-mqtt.md b/src/vscp/common/vscp_client_mqtt.md → src/vscp/common/vscp-client-mqtt.md
diff --git a/src/vscp/common/vscp_client_multicast.cpp → src/vscp/common/vscp-client-multicast.cpp b/src/vscp/common/vscp_client_multicast.cpp → src/vscp/common/vscp-client-multicast.cpp
diff --git a/src/vscp/common/vscp_client_multicast.h → src/vscp/common/vscp-client-multicast.h b/src/vscp/common/vscp_client_multicast.h → src/vscp/common/vscp-client-multicast.h
diff --git a/src/vscp/common/vscp_client_rawcan.cpp → src/vscp/common/vscp-client-rawcan.cpp b/src/vscp/common/vscp_client_rawcan.cpp → src/vscp/common/vscp-client-rawcan.cpp
diff --git a/src/vscp/common/vscp_client_rawcan.h → src/vscp/common/vscp-client-rawcan.h b/src/vscp/common/vscp_client_rawcan.h → src/vscp/common/vscp-client-rawcan.h
diff --git a/src/vscp/common/vscp_client_rawmqtt.cpp → src/vscp/common/vscp-client-rawmqtt.cpp b/src/vscp/common/vscp_client_rawmqtt.cpp → src/vscp/common/vscp-client-rawmqtt.cpp
diff --git a/src/vscp/common/vscp_client_rawmqtt.h → src/vscp/common/vscp-client-rawmqtt.h b/src/vscp/common/vscp_client_rawmqtt.h → src/vscp/common/vscp-client-rawmqtt.h
diff --git a/src/vscp/common/vscp_client_socketcan.cpp → src/vscp/common/vscp-client-socketcan.cpp b/src/vscp/common/vscp_client_socketcan.cpp → src/vscp/common/vscp-client-socketcan.cpp
@@ -129,7 +129,7 @@ vscpClientSocketCan::vscpClientSocketCan()
   m_interface  = "vcan0";
   m_guid.getFromString("00:00:00:00:00:00:00:00:00:00:00:00:00:00:00:00");
   m_flags  = 0;
-  m_socket = -1;
+  m_socket = 0;
   m_mode   = CAN_MTU;
 
   setResponseTimeout(3); // Response timeout 3 ms
@@ -993,7 +993,7 @@ workerThread(void *pData)
             // printf("Socketcan event: %X:%X\n", pEvent->vscp_class, pEvent->vscp_type);
 
             // Add to input queue only if no callback set
-            if (pObj->isCallbackEvActive() && pObj->isCallbackExActive()) {
+            if (!pObj->isCallbackEvActive() || !pObj->isCallbackExActive()) {
               // std::cout << "add to receive queue" << std::endl;
               pthread_mutex_lock(&pObj->m_mutexReceiveQueue);
               pObj->m_receiveList.push_back(pEvent);

diff --git a/src/vscp/common/vscp_client_socketcan.h → src/vscp/common/vscp-client-socketcan.h b/src/vscp/common/vscp_client_socketcan.h → src/vscp/common/vscp-client-socketcan.h
diff --git a/src/vscp/common/vscp_client_tcp.cpp → src/vscp/common/vscp-client-tcp.cpp b/src/vscp/common/vscp_client_tcp.cpp → src/vscp/common/vscp-client-tcp.cpp
diff --git a/src/vscp/common/vscp_client_tcp.h → src/vscp/common/vscp-client-tcp.h b/src/vscp/common/vscp_client_tcp.h → src/vscp/common/vscp-client-tcp.h
diff --git a/src/vscp/common/vscp_client_udp.cpp → src/vscp/common/vscp-client-udp.cpp b/src/vscp/common/vscp_client_udp.cpp → src/vscp/common/vscp-client-udp.cpp
diff --git a/src/vscp/common/vscp_client_udp.h → src/vscp/common/vscp-client-udp.h b/src/vscp/common/vscp_client_udp.h → src/vscp/common/vscp-client-udp.h
diff --git a/src/vscp/common/vscp_client_ws1.cpp → src/vscp/common/vscp-client-ws1.cpp b/src/vscp/common/vscp_client_ws1.cpp → src/vscp/common/vscp-client-ws1.cpp
diff --git a/src/vscp/common/vscp_client_ws1.h → src/vscp/common/vscp-client-ws1.h b/src/vscp/common/vscp_client_ws1.h → src/vscp/common/vscp-client-ws1.h
diff --git a/src/vscp/common/vscp_client_ws2.cpp → src/vscp/common/vscp-client-ws2.cpp b/src/vscp/common/vscp_client_ws2.cpp → src/vscp/common/vscp-client-ws2.cpp
diff --git a/src/vscp/common/vscp_client_ws2.h → src/vscp/common/vscp-client-ws2.h b/src/vscp/common/vscp_client_ws2.h → src/vscp/common/vscp-client-ws2.h
diff --git a/src/vscp/common/vscp_serial.h → src/vscp/common/vscp-serial.h b/src/vscp/common/vscp_serial.h → src/vscp/common/vscp-serial.h
diff --git a/src/vscp/common/vscp_type.h → src/vscp/common/vscp-type.h b/src/vscp/common/vscp_type.h → src/vscp/common/vscp-type.h
diff --git a/src/vscp/common/vscpd_caps.h → src/vscp/common/vscpd-caps.h b/src/vscp/common/vscpd_caps.h → src/vscp/common/vscpd-caps.h