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

Rename some funcs..

Browse Source
This commit is contained in:
Anders Sandstrom
2021-03-10 11:04:04 +01:00
parent 020d7932af
commit 4361b083c5
3 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcCANOpenSDO.cpp
View File

@@ -199,7 +199,7 @@ void ecmcCANOpenSDO::execute() {
exeCounter_ = 0;
busyCounter_ = 0;
errorCode_ = ECMC_CAN_ERROR_SDO_TIMEOUT;
tryUnlock();
unlockSdo1();
}
if(exeCounter_* exeSampleTimeMs_ < readSampleTimeMs_ && rw_ == DIR_READ) { // do not risk overflow
@@ -207,7 +207,7 @@ void ecmcCANOpenSDO::execute() {
} else { // Counter is higher, try to write
if(rw_ == DIR_READ) {
if(!tryLock()) {
if(!tryLockSdo1()) {
// wait for busy to go down
return;
}
@@ -305,7 +305,7 @@ int ecmcCANOpenSDO::readDataStateMachine(can_frame *frame) {
//copy complete data to dataBuffer_
printBuffer();
}
tryUnlock();
unlockSdo1();
return 0;
}
break;
@@ -353,7 +353,7 @@ int ecmcCANOpenSDO::writeDataStateMachine(can_frame *frame) {
printf("All data written to slave SDO.\n");
printBuffer();
}
tryUnlock();
unlockSdo1();
return 0;
}
@@ -463,7 +463,7 @@ int ecmcCANOpenSDO::writeValue() {
return ECMC_CAN_ERROR_SDO_WRITE_BUSY;
}
if(!tryLock()) {
if(!tryLockSdo1()) {
// wait for busy to go down
return ECMC_CAN_ERROR_SDO_WRITE_BUSY;
}
@@ -487,7 +487,7 @@ int ecmcCANOpenSDO::writeValue() {
// State machine is now in rx frame()
}
int ecmcCANOpenSDO::tryLock() {
int ecmcCANOpenSDO::tryLockSdo1() {
epicsMutexLock(getLockMutex_);
if(busy_) {
return 0;
@@ -504,7 +504,7 @@ int ecmcCANOpenSDO::tryLock() {
return 1;
}
int ecmcCANOpenSDO::tryUnlock() {
int ecmcCANOpenSDO::unlockSdo1() {
epicsMutexLock(getLockMutex_);
if(busy_) {
ptrSdo1Lock_->clear();

4
ecmc_plugin_socketcan/ecmc_plugin_socketcanApp/src/ecmcCANOpenSDO.h
View File

@@ -55,8 +55,8 @@ class ecmcCANOpenSDO {
int writeDataStateMachine(can_frame *frame);
int writeNextDataToSlave(int useToggle);
int writeWaitForDataConfFrame(int useToggle, can_frame *frame);
int tryLock();
int tryUnlock();
int tryLockSdo1();
int unlockSdo1();
ecmcSocketCANWriteBuffer *writeBuffer_;
uint32_t cobIdRx_; // with cobid
uint32_t cobIdTx_; // with cobid

24
iocsh/pvs.log
View File

@@ -1,12 +1,12 @@
REQMOD:mcag-trgt-muts--18678:MODULES
REQMOD:mcag-trgt-muts--18678:VERSIONS
REQMOD:mcag-trgt-muts--18678:MOD_VER
REQMOD:mcag-trgt-muts--18678:exit
REQMOD:mcag-trgt-muts--18678:BaseVersion
REQMOD:mcag-trgt-muts--18678:require_VER
REQMOD:mcag-trgt-muts--18678:ecmccfg_VER
REQMOD:mcag-trgt-muts--18678:asyn_VER
REQMOD:mcag-trgt-muts--18678:exprtk_VER
REQMOD:mcag-trgt-muts--18678:motor_VER
REQMOD:mcag-trgt-muts--18678:ecmc_VER
REQMOD:mcag-trgt-muts--18678:ecmc_plugin_socketcan_VER
REQMOD:mcag-trgt-muts--19852:MODULES
REQMOD:mcag-trgt-muts--19852:VERSIONS
REQMOD:mcag-trgt-muts--19852:MOD_VER
REQMOD:mcag-trgt-muts--19852:exit
REQMOD:mcag-trgt-muts--19852:BaseVersion
REQMOD:mcag-trgt-muts--19852:require_VER
REQMOD:mcag-trgt-muts--19852:ecmccfg_VER
REQMOD:mcag-trgt-muts--19852:asyn_VER
REQMOD:mcag-trgt-muts--19852:exprtk_VER
REQMOD:mcag-trgt-muts--19852:motor_VER
REQMOD:mcag-trgt-muts--19852:ecmc_VER
REQMOD:mcag-trgt-muts--19852:ecmc_plugin_socketcan_VER