diff --git a/pdbApp/pvif.cpp b/pdbApp/pvif.cpp index 753adfe..b4e6c15 100644 --- a/pdbApp/pvif.cpp +++ b/pdbApp/pvif.cpp @@ -156,7 +156,7 @@ void attachMeta(pvCommon& pvm, const pvd::PVStructurePtr& pv) FMAP(controlHigh, PVDouble, "control.limitHigh", PROPERTY); FMAP(controlLow, PVDouble, "control.limitLow", PROPERTY); FMAP(egu, PVString, "display.units", PROPERTY); - FMAP(prec, PVScalar, "display.format", PROPERTY); + //FMAP(prec, PVScalar, "display.format", PROPERTY); FMAP(warnHigh, PVScalar, "alarm.highWarningLimit", PROPERTY); FMAP(warnLow, PVScalar, "alarm.lowWarningLimit", PROPERTY); FMAP(alarmHigh, PVScalar, "alarm.highAlarmLimit", PROPERTY); @@ -336,7 +336,8 @@ void putMeta(const pvCommon& pv, unsigned dbe, db_field_log *pfl) FMAP(DBR_GR_DOUBLE|DBR_GR_LONG, egu, units); #undef FMAP #define FMAP(MASK, MNAME, FNAME) if(META::mask&(MASK) && pv.MNAME) pv.MNAME->putFrom(meta.FNAME) - FMAP(DBR_GR_DOUBLE, prec, precision.dp); + // not handling precision until I get a better idea of what 'format' is supposed to be... + //FMAP(prec, PVScalar, "display.format", PROPERTY); FMAP(DBR_AL_DOUBLE|DBR_AL_DOUBLE, warnHigh, upper_warning_limit); FMAP(DBR_AL_DOUBLE|DBR_AL_DOUBLE, warnLow, lower_warning_limit); FMAP(DBR_AL_DOUBLE|DBR_AL_DOUBLE, alarmHigh, upper_alarm_limit); diff --git a/testApp/testpdb.cpp b/testApp/testpdb.cpp index 7e61bd7..7e8c3d0 100644 --- a/testApp/testpdb.cpp +++ b/testApp/testpdb.cpp @@ -312,7 +312,7 @@ void testSingleMonitor(const PDBProvider::shared_pointer& prov) e = mon.poll(); testOk1(!!e); - if(!!e) testEqual(toString(*e.elem->changedBitSet), "{7, 8, 11, 12, 14, 15, 17, 18}"); + if(!!e) testEqual(toString(*e.elem->changedBitSet), "{7, 8, 11, 12, 15, 17, 18}"); else testFail("oops"); testFieldEqual(e, "display.limitHigh", 50.0); diff --git a/testApp/testpvif.cpp b/testApp/testpvif.cpp index b2f4c92..57ffcb2 100644 --- a/testApp/testpvif.cpp +++ b/testApp/testpvif.cpp @@ -75,7 +75,7 @@ void testScalar() pvif_li->put(mask, DBE_VALUE|DBE_ALARM|DBE_PROPERTY, NULL); dbScanUnlock((dbCommon*)prec_li); - testEqual(toString(mask), "{2, 4, 5, 8, 9, 12, 13, 15, 16, 18, 19}"); + testEqual(toString(mask), "{2, 4, 5, 8, 9, 12, 13, 16, 18, 19}"); mask.clear(); dbScanLock((dbCommon*)prec_ai); @@ -85,7 +85,7 @@ void testScalar() pvif_ai_rval->put(mask, DBE_VALUE|DBE_ALARM|DBE_PROPERTY, NULL); dbScanUnlock((dbCommon*)prec_ai); - testEqual(toString(mask), "{22, 24, 25, 28, 29, 32, 33, 35, 36, 38, 39, 42, 44, 45, 48, 49, 52, 53, 55, 56, 58, 59}"); + testEqual(toString(mask), "{22, 24, 25, 28, 29, 32, 33, 36, 38, 39, 42, 44, 45, 48, 49, 52, 53, 56, 58, 59}"); mask.clear(); dbScanLock((dbCommon*)prec_mbbi); @@ -111,7 +111,7 @@ void testScalar() testFieldEqual(root, "ai.timeStamp.nanoseconds", 12345678); testFieldEqual(root, "ai.display.limitHigh", 200.0); testFieldEqual(root, "ai.display.limitLow", 20.0); - testFieldEqual(root, "ai.display.format", "2"); + testFieldEqual(root, "ai.display.format", ""); testFieldEqual(root, "ai.display.units", "foo"); testFieldEqual(root, "ai_rval.value", 1234);