epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge changes from 3.16 branch into 7.0

Browse Source
This commit is contained in:
Andrew Johnson
2018-06-20 21:42:43 -05:00
parent 0248570123 7d28ae3732
commit 7e598c60cc
39 changed files with 1207 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/database/src/template/top/exampleApp/src/xxxRecord.c
+2 -2
View File
@@ -198,8 +198,8 @@ static long get_alarm_double(DBADDR *paddr,struct dbr_alDouble *pad)
static void checkAlarms(xxxRecord *prec)
{
double val;
float hyst, lalm, hihi, high, low, lolo;
double val, hyst, lalm;
float hihi, high, low, lolo;
unsigned short hhsv, llsv, hsv, lsv;
if(prec->udf == TRUE ){
modules/database/src/template/top/exampleBoot/ioc/Makefile@Common
+1
View File
@@ -1,4 +1,5 @@
TOP = ../..
include $(TOP)/configure/CONFIG
ARCH = $(EPICS_HOST_ARCH)
TARGETS = envPaths
include $(TOP)/configure/RULES.ioc
modules/database/src/template/top/iocBoot/ioc/Makefile@Common
+1
View File
@@ -1,4 +1,5 @@
TOP = ../..
include $(TOP)/configure/CONFIG
ARCH = $(EPICS_HOST_ARCH)
TARGETS = envPaths
include $(TOP)/configure/RULES.ioc