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

Add SIMM=RAW to bo record

Browse Source
This commit is contained in:
Ralph Lange
2022-05-10 14:26:31 -07:00
parent 371cdde6df
commit 4e9bb9fe50
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/database/src/std/rec/boRecord.c
View File

@@ -34,7 +34,7 @@
#include "special.h"
#include "menuIvoa.h"
#include "menuOmsl.h"
#include "menuYesNo.h"
#include "menuSimm.h"
#define GEN_SIZE_OFFSET
#include "boRecord.h"
@@ -427,14 +427,18 @@ static long writeValue(boRecord *prec)
}
switch (prec->simm) {
case menuYesNoNO:
case menuSimmNO:
status = pdset->write_bo(prec);
break;
case menuYesNoYES: {
case menuSimmYES:
case menuSimmRAW:
recGblSetSevr(prec, SIMM_ALARM, prec->sims);
if (prec->pact || (prec->sdly < 0.)) {
status = dbPutLink(&prec->siol, DBR_USHORT, &prec->val, 1);
if (prec->simm == menuSimmYES)
status = dbPutLink(&prec->siol, DBR_USHORT, &prec->val, 1);
else /* prec->simm == menuSimmRAW */
status = dbPutLink(&prec->siol, DBR_ULONG, &prec->rval, 1);
prec->pact = FALSE;
} else { /* !prec->pact && delay >= 0. */
epicsCallback *pvt = prec->simpvt;
@@ -446,7 +450,6 @@ static long writeValue(boRecord *prec)
prec->pact = TRUE;
}
break;
}
default:
recGblSetSevr(prec, SOFT_ALARM, INVALID_ALARM);

7
modules/database/src/std/rec/boRecord.dbd.pod
View File

@@ -206,8 +206,9 @@ The WPDT field is a private field for honoring seconds to hold HIGH.
The following fields are used to operate the record in simulation mode.
If SIMM (fetched through SIML) is YES, the record is put in SIMS
severity and the value is written through SIOL.
If SIMM (fetched through SIML, if populated) is YES, the record is put
in SIMS severity and the unconverted value is written through SIOL.
If SIMM is RAW, the value is converted and RVAL is written.
SSCN sets a different SCAN mechanism to use in simulation mode.
SDLY sets a delay (in sec) that is used for asynchronous simulation
processing.
@@ -352,7 +353,7 @@ for more information on simulation mode and its fields.
prompt("Simulation Mode")
special(SPC_MOD)
interest(1)
menu(menuYesNo)
menu(menuSimm)
}
field(SIMS,DBF_MENU) {
prompt("Simulation Mode Severity")

24
modules/database/test/std/rec/simmTest.c
View File

@@ -65,7 +65,8 @@ static char *rawSupp[] = {
"bi",
"mbbi",
"mbbiDirect",
"ao"
"ao",
"bo"
};
static
@@ -403,15 +404,24 @@ void testSiolWrite(const char *name,
testdbPutFieldOk(nameVAL, DBR_LONG, 1);
testdbGetFieldEqual(nameSimval, DBR_USHORT, 1);
if(hasRawSimmSupport(name)){
if (hasRawSimmSupport(name)) {
testDiag("in simmRAW, RVAL should be written to SIOL");
testDiag("SIML overrides SIMM, disable it here");
testdbPutFieldOk(nameSIML, DBR_STRING, "");
testdbPutFieldOk(nameSIMM, DBR_STRING, "RAW");
testdbPutFieldOk(nameROFF, DBR_ULONG, 2);
testdbPutFieldOk(nameVAL, DBR_DOUBLE, 5.);
testdbGetFieldEqual(nameRVAL, DBR_LONG, 3);
testdbGetFieldEqual(nameSimval, DBR_DOUBLE, 3.);
if (strcmp(name, "ao") == 0) {
testdbPutFieldOk(nameROFF, DBR_ULONG, 2);
testdbPutFieldOk(nameVAL, DBR_DOUBLE, 5.);
testdbGetFieldEqual(nameRVAL, DBR_LONG, 3);
testdbGetFieldEqual(nameSimval, DBR_DOUBLE, 3.);
} else if (strcmp(name, "bo") == 0) {
boRecord *prec;
prec = (boRecord *) testdbRecordPtr("bo");
prec->mask = 0x55;
testdbPutFieldOk(nameVAL, DBR_USHORT, 1);
testdbGetFieldEqual(nameRVAL, DBR_ULONG, 0x55);
testdbGetFieldEqual(nameSimval, DBR_ULONG, 0x55);
}
testdbPutFieldOk(nameSIML, DBR_STRING, nameSimmode);
}
@@ -532,7 +542,7 @@ void testAllRecTypes(void)
MAIN(simmTest)
{
testPlan(1199);
testPlan(1221);
startSimmTestIoc("simmTest.db");
testSimmSetup();