motion/ecmc_plugin_socketcan
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Anders Sandstrom
2021-03-02 12:59:39 +01:00
parent de9e23dd85
commit 18153ee694
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCAN.cpp
View File

@@ -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.");
}
}

3
ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCAN.h
View File

@@ -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_;

2
ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcSocketCANWrap.cpp
View File

@@ -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