From 18153ee694f7d4d35447ce55d36b4b647b288284 Mon Sep 17 00:00:00 2001
From: Anders Sandstrom <anders.sandstrom@esss.se>
Date: Tue, 2 Mar 2021 12:59:39 +0100
Subject: [PATCH] WIP

---
 .../ecmc_plugin_socketcanApp/src/ecmcSocketCAN.cpp         | 7 ++++---
 .../ecmc_plugin_socketcanApp/src/ecmcSocketCAN.h           | 3 +--
 .../ecmc_plugin_socketcanApp/src/ecmcSocketCANWrap.cpp     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCAN.cpp b/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCAN.cpp
index d84acb8..c6613e8 100644
--- a/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCAN.cpp
+++ b/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCAN.cpp
@@ -63,6 +63,7 @@ ecmcSocketCAN::ecmcSocketCAN(char* configStr,
                    {
   // Init
   cfgCanIFStr_ = NULL;
+  cfgDbgMode_  = 0;
   destructs_   = 0;
   socketId_    = -1;
   memset(&ifr_,0,sizeof(struct ifreq));
@@ -108,10 +109,10 @@ void ecmcSocketCAN::parseConfigStr(char *configStr) {
       }
       
       // ECMC_PLUGIN_DBG_PRINT_OPTION_CMD (1/0)
-      /*if (!strncmp(pThisOption, ECMC_PLUGIN_DBG_PRINT_OPTION_CMD, strlen(ECMC_PLUGIN_DBG_PRINT_OPTION_CMD))) {
+      if (!strncmp(pThisOption, ECMC_PLUGIN_DBG_PRINT_OPTION_CMD, strlen(ECMC_PLUGIN_DBG_PRINT_OPTION_CMD))) {
         pThisOption += strlen(ECMC_PLUGIN_DBG_PRINT_OPTION_CMD);
         cfgDbgMode_ = atoi(pThisOption);
-      } */
+      }
       
       // ECMC_PLUGIN_IF_OPTION_CMD (Source string)
       else if (!strncmp(pThisOption, ECMC_PLUGIN_IF_OPTION_CMD, strlen(ECMC_PLUGIN_IF_OPTION_CMD))) {
@@ -124,7 +125,7 @@ void ecmcSocketCAN::parseConfigStr(char *configStr) {
     free(pOptions);
   }
   if(!cfgCanIFStr_) { 
-    throw std::invalid_argument( "Data source not defined.");
+    throw std::invalid_argument( "CAN interface not defined.");
   }
 }
 
diff --git a/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCAN.h b/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCAN.h
index 38a481b..b42be31 100644
--- a/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCAN.h
+++ b/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCAN.h
@@ -49,8 +49,6 @@ class ecmcSocketCAN : public asynPortDriver {
 
   virtual asynStatus    writeInt32(asynUser *pasynUser, epicsInt32 value);
   virtual asynStatus    readInt32(asynUser *pasynUser, epicsInt32 *value);
-  virtual asynStatus    readFloat64Array(asynUser *pasynUser, epicsFloat64 *value,
-                                         size_t nElements, size_t *nIn);
   virtual asynStatus    readInt8Array(asynUser *pasynUser, epicsInt8 *value, 
                                       size_t nElements, size_t *nIn);
   virtual asynStatus    readFloat64(asynUser *pasynUser, epicsFloat64 *value);
@@ -62,6 +60,7 @@ class ecmcSocketCAN : public asynPortDriver {
   void                  initCAN();
   static std::string    to_string(int value);
   char*                 cfgCanIFStr_;   // Config: can interface can0, vcan0..
+  int                   cfgDbgMode_;
   int                   destructs_;
   struct can_frame      rxmsg_;
   struct can_frame      txmsg_;
diff --git a/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCANWrap.cpp b/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCANWrap.cpp
index 79c9cf3..ee6894a 100644
--- a/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCANWrap.cpp
+++ b/ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCANWrap.cpp
@@ -27,7 +27,7 @@
 static ecmcSocketCAN*  can = NULL;
 static char            portNameBuffer[ECMC_PLUGIN_MAX_PORTNAME_CHARS];
 
-int createFFT(char* configStr) {
+int createSocketCAN(char* configStr) {
 
   // create new ecmcFFT object