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

make complile at PSI

Browse Source
This commit is contained in:
sandst_a
2023-08-14 15:09:09 +02:00
parent e683e6fad6
commit 3e02a6fa18
3 changed files with 6 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tempGNUmakefile → GNUmakefile
View File

@@ -5,7 +5,8 @@ MODULE = ecmc_plugin_motion
BUILDCLASSES = Linux
ARCH_FILTER = deb10%
EXCLUDE_VERSIONS+=3 7.0.5
# Run 7.0.6 for now
EXCLUDE_VERSIONS+=3 7.0.5 7.0.7
IGNORE_MODULES += asynMotor
IGNORE_MODULES += motorBase

28
Makefile
View File

@@ -1,28 +0,0 @@
#
# Copyright (c) 2018 - 2019 European Spallation Source ERIC
#
# The program is free software: you can redistribute
# it and/or modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation, either version 2 of the
# License, or any newer version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
# more details.
#
# You should have received a copy of the GNU General Public License along with
# this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt
#
#
# Author : Jeong Han Lee
# email : han.lee@esss.se
# Date : 2020Mar22-1607-33CET
# version : 1.0.0
TOP:=$(CURDIR)
include $(TOP)/configure/CONFIG
include $(TOP)/configure/RULES

7
ecmc_plugin_motion/src/ecmcDataBuffer.h
View File

@@ -28,7 +28,7 @@
template <typename T>
struct dataBuffer {
T *data;
T *data;
int dataCounter;
int id;
};
@@ -86,6 +86,7 @@ class ecmcDataBuffer {
initAsyn();
}
~ecmcDataBuffer() {
delete[] buffer1_.data;
delete[] buffer2_.data;
@@ -183,7 +184,7 @@ template<> inline void ecmcDataBuffer<epicsInt16>::writeBuffer() {
}
// specialized for epicsInt32
template<> inline void ecmcDataBuffer<int32_t>::writeBuffer() {
template<> inline void ecmcDataBuffer<epicsInt32>::writeBuffer() {
epicsMutexLock(bufferSwitchMutex_);
// Write asyn
asynPort_->lock();
@@ -195,7 +196,7 @@ template<> inline void ecmcDataBuffer<int32_t>::writeBuffer() {
}
// specialized for epicsInt64
template<> inline void ecmcDataBuffer<int64_t>::writeBuffer() {
template<> inline void ecmcDataBuffer<epicsInt64>::writeBuffer() {
epicsMutexLock(bufferSwitchMutex_);
// Write asyn
asynPort_->lock();