epics/pvDatabase
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

fix bug in deadband plugin; attempt to make support build on win32

Browse Source
This commit is contained in:
mrkraimer
2019-06-21 15:53:31 -04:00
parent bd37756ba3
commit 0437602236
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Makefile
View File

@ -27,4 +27,7 @@ include $(PVDATABASE_SRC)/support/Makefile
pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS) pvDatabase_LIBS += $(EPICS_BASE_PVA_CORE_LIBS)
pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS) pvDatabase_LIBS += $(EPICS_BASE_IOC_LIBS)
# needed for Windows
LIB_SYS_LIBS_WIN32 += netapi32 ws2_32
include $(TOP)/configure/RULES include $(TOP)/configure/RULES

4
src/copy/pvDeadbandPlugin.cpp
View File

@ -64,9 +64,9 @@ PVDeadbandFilterPtr PVDeadbandFilter::create(
ScalarConstPtr scalar = static_pointer_cast<const Scalar>(field); ScalarConstPtr scalar = static_pointer_cast<const Scalar>(field);
if(!ScalarTypeFunc::isNumeric(scalar->getScalarType())) return PVDeadbandFilterPtr(); if(!ScalarTypeFunc::isNumeric(scalar->getScalarType())) return PVDeadbandFilterPtr();
bool absolute = false; bool absolute = false;
if(requestValue.find("abs")>=0) { if(requestValue.find("abs")==0) {
absolute = true; absolute = true;
} else if(requestValue.find("rel")>=0) { } else if(requestValue.find("rel")==0) {
absolute = false; absolute = false;
} else { } else {
return PVDeadbandFilterPtr(); return PVDeadbandFilterPtr();