cafe/cpp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

statusCodes.h modfied

Browse Source
This commit is contained in:
chrin
2017-09-19 11:52:56 +02:00
parent 3b2e49f7b7
commit 19ee4fc493
7 changed files with 181 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
autogen_cafe3z_release.sh
View File

@@ -1,49 +0,0 @@
#source usePy3
aclocal --force -I m4
libtoolize --force --copy
autoconf --force
autoheader --force
automake --force --add-missing --copy
autoreconf
#Check what the EPICS RELEASE IS from ${EPICS}/base
#Used by ./configure
#Assumes format ${EPICS}/base-3.14.12
EB=$(readlink ${EPICS}/base)
echo 'EPICS BASE IS=' $EB
EB1=$(echo $EB | sed -e "s/[a-zA-Z]*-//g")
EBMAJ=$(echo $EB1 | sed -e "s/[[:punct:]].*//g")
EBMIN1=$(echo $EB1 | sed -e "s/^[[:digit:]]*[[:punct:]]//g")
EBMIN=$(echo $EBMIN1 | sed -e "s/[[:punct:]][[:digit:]]*//g")
EBPAT=$(echo $EB1 | sed -e "s/[[:digit:]]*[[:punct:]]//g")
echo EPICS_MAJOR=$EBMAJ
echo EPICS_MINOR=$EBMIN
echo EPICS_PATCH=$EBPAT
export CAFE_EPICS_V_MAJOR=$EBMAJ
export CAFE_EPICS_V_MINOR=$EBMIN
export CAFE_EPICS_V_PATCH=$EBPAT
#--enable-boost --with-boost=/afs/psi.ch/intranet/Controls/BD/deps/boost_1_57_0 \
CYCAFE_VERSION=cafez-1.3.0-alpha-1
./configure \
--prefix=/opt/gfa/cafe/cpp/${CYCAFE_VERSION}/ \
--libdir=/opt/gfa/cafe/cpp/${CYCAFE_VERSION}/lib \
--enable-boost-inc --with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include \
--enable-epics --with-epics=${EPICS}/base \
--enable-qt4-lib --with-qt4-lib=/usr/lib64 \
--enable-qt4-inc --with-qt4-inc=/usr/include \
--enable-zeromq-inc --with-zeromq-inc=/opt/gfa/zmq/zeromq-4.1.5/include \
--enable-zeromq-lib --with-zeromq-lib=/opt/gfa/zmq/zeromq-4.1.5/lib \
--enable-json-inc --with-json-inc=/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/include \
--enable-json-lib --with-json-lib=/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/libs/linux-gcc-4.4.7
unset CAFE_EPICS_V_MAJOR
unset CAFE_EPICS_V_MINOR
unset CAFE_EPICS_V_PATCH
cp include/config.h include/os/Linux/cafe/config.h

53
autogen_cafepy3z_release.sh
View File

@@ -1,53 +0,0 @@
source usePy3
aclocal --force -I m4
libtoolize --force --copy
autoconf --force
autoheader --force
automake --force --add-missing --copy
autoreconf
#Check what the EPICS RELEASE IS from ${EPICS}/base
#Used by ./configure
#Assumes format ${EPICS}/base-3.14.12
EB=$(readlink ${EPICS}/base)
echo 'EPICS BASE IS=' $EB
EB1=$(echo $EB | sed -e "s/[a-zA-Z]*-//g")
EBMAJ=$(echo $EB1 | sed -e "s/[[:punct:]].*//g")
EBMIN1=$(echo $EB1 | sed -e "s/^[[:digit:]]*[[:punct:]]//g")
EBMIN=$(echo $EBMIN1 | sed -e "s/[[:punct:]][[:digit:]]*//g")
EBPAT=$(echo $EB1 | sed -e "s/[[:digit:]]*[[:punct:]]//g")
echo EPICS_MAJOR=$EBMAJ
echo EPICS_MINOR=$EBMIN
echo EPICS_PATCH=$EBPAT
export CAFE_EPICS_V_MAJOR=$EBMAJ
export CAFE_EPICS_V_MINOR=$EBMIN
export CAFE_EPICS_V_PATCH=$EBPAT
#--enable-boost --with-boost=/afs/psi.ch/intranet/Controls/BD/deps/boost_1_57_0 \
CYCAFE_VERSION=pyzcafe-1.3.0-alpha-1
./configure \
--prefix=/opt/gfa/cafe/python/python-3.5/${CYCAFE_VERSION}/ \
--libdir=/opt/gfa/cafe/python/python-3.5/${CYCAFE_VERSION}/lib \
--enable-boost-inc --with-boost-inc=/opt/gfa/cafe/boost/boost_1_61_0/include \
--enable-epics --with-epics=${EPICS}/base \
--enable-qt4-lib --with-qt4-lib=/usr/lib64 \
--enable-qt4-inc --with-qt4-inc=/usr/include \
--enable-python-inc --with-python-inc=/opt/gfa/python-3.5/latest/include/python3.5m \
--enable-python-lib --with-python-lib=/opt/gfa/python-3.5/latest/lib \
--enable-zeromq-inc --with-zeromq-inc=/opt/gfa/zmq/zeromq-4.1.5/include \
--enable-zeromq-lib --with-zeromq-lib=/opt/gfa/zmq/zeromq-4.1.5/lib \
--enable-json-inc --with-json-inc=/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/include \
--enable-json-lib --with-json-lib=/opt/gfa/zmsglog/json/jsoncpp-src-0.6.0-rc2/libs/linux-gcc-4.4.7 \
--enable-curl-inc --with-curl-inc=/opt/gfa/python-3.5/2.4.1/include \
--enable-curl-lib --with-curl-lib=/opt/gfa/python-3.5/2.4.1/lib
unset CAFE_EPICS_V_MAJOR
unset CAFE_EPICS_V_MINOR
unset CAFE_EPICS_V_PATCH
cp include/config.h include/os/Linux/pycafe35/config.h

BIN
examples/cafeTest/cafeTest
View File

Binary file not shown.

1009
examples/cafeTest/cafeTest.cc
View File

File diff suppressed because it is too large Load Diff

2
examples/cafeTest/makefile
View File

@@ -7,7 +7,7 @@
#CAFE version to link to
CAFE_VERSION=cafe-1.2.0-final-1
CAFE_VERSION=cafe-1.3.0-final-1
#PYTHON_INCLUDE=/opt/gfa/python-3.5/latest/include/python3.5m
#PYTHON_LIB=/opt/gfa/python-3.5/latest/lib

7
include/cafe.h
View File

@@ -182,17 +182,18 @@ public:
return ss.str();
}
#if HAVE_ZEROMQ
//cafeService.h
#if HAVE_ZEROMQ
int calcDBPMStatus(int, int, string);
int getDBPM(DBPMHolder &dbpm);
int getDBPM(DBPMKeeper &dbpm);
int readDBPMOffsets(DBPMKeeper &dbpm);
int prepareDBPM(vector<string> &_glist, vector<unsigned int> &_hV, std::vector<std::string> &dev, std::vector<float> &pos) ;
int prepareDBPM(vector<string> &_glist, vector<unsigned int> &_hV, std::map<float, std::string> &posDev) ;
#endif
#endif

11
include/statusCodes.h
View File

@@ -668,10 +668,10 @@ public:
mapStatusCode.insert(std::make_pair((int) ECAFE_LOAD_COLLECTION, "CAFE ERROR: ECAFE_LOAD_COLLECTION"));
mapStatusCode.insert(std::make_pair((int) ECAFE_LOAD_GROUP, "CAFE ERROR: ECAFE_LOAD_GROUP"));
mapStatusCode.insert(std::make_pair((int) ECAFE_BPM_DATA_IS_INVALID, "CAFE_ERROR: ECAFE_BPM_DATA_IS_INVALID" ));
mapStatusCode.insert(std::make_pair((int) ECAFE_BPM_DATA_IS_INVALID, "CAFE_ERROR: ECAFE_BPM_DATA_IS_INVALID" ));
mapStatusCode.insert(std::make_pair((int) LINUX_EINTR, "CAFE_ERROR: LINUX_EINTR" ));
mapStatusCode.insert(std::make_pair((int) LINUX_EAGAIN, "CAFE_ERROR: LINUX_EAGAIN " ));
mapStatusCode.insert(std::make_pair((int) LINUX_EAGAIN, "CAFE_WARN: LINUX_EAGAIN " ));
mapStatusCode.insert(std::make_pair((int) LINUX_EFAULT, "CAFE_ERROR: LINUX_EFAULT" ));
mapStatusCode.insert(std::make_pair((int) LINUX_ENOTSOCK, "CAFE_ERROR: LINUX_ENOTSOCK" ));
mapStatusCode.insert(std::make_pair((int) LINUX_EPROTONOSUPPORT, "CAFE_ERROR: LINUX_EPROTONOSUPPORT" ));
@@ -876,6 +876,13 @@ public:
mapStatusSeverity.insert(std::make_pair((int) ECAFE_BPM_DATA_IS_INVALID, "WARN" ));
mapStatusSeverity.insert(std::make_pair((int) LINUX_EINTR, "ERROR" ));
mapStatusSeverity.insert(std::make_pair((int) LINUX_EAGAIN, "WARN" ));
mapStatusSeverity.insert(std::make_pair((int) LINUX_EFAULT, "ERROR"));
mapStatusSeverity.insert(std::make_pair((int) LINUX_ENOTSOCK, "ERROR"));
mapStatusSeverity.insert(std::make_pair((int) LINUX_EPROTONOSUPPORT, "ERROR" ));
};