Skip to content

Commit 9e7cd24

Browse files
dirk-zimochanjohnson
dirk-zimoch
authored and
anjohnson
committed
fix DBE_PROPERTY events for mbbi/mbbo records
1 parent faac1df commit 9e7cd24

File tree

4 files changed

+38
-12
lines changed

4 files changed

+38
-12
lines changed

‎modules/database/src/std/rec/mbbiRecord.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,9 @@ static long special(DBADDR *paddr, int after)
220220
return 0;
221221
init_common(prec);
222222
/* Note: ZRVL..FFVL are also SPC_MOD */
223-
if (fieldIndex >= mbbiRecordZRST && fieldIndex <= mbbiRecordFFST) {
224-
int event = DBE_PROPERTY;
225-
226-
if (prec->val == fieldIndex - mbbiRecordZRST)
227-
event |= DBE_VALUE | DBE_LOG;
228-
db_post_events(prec, &prec->val, event);
223+
if (fieldIndex >= mbbiRecordZRST && fieldIndex <= mbbiRecordFFST
224+
&& prec->val == fieldIndex - mbbiRecordZRST) {
225+
db_post_events(prec, &prec->val, DBE_VALUE | DBE_LOG);
229226
}
230227
return 0;
231228

‎modules/database/src/std/rec/mbbiRecord.dbd.pod‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
276276
pp(TRUE)
277277
interest(1)
278278
size(26)
279+
prop(YES)
279280
}
280281
field(ONST,DBF_STRING) {
281282
prompt("One String")
@@ -284,6 +285,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
284285
pp(TRUE)
285286
interest(1)
286287
size(26)
288+
prop(YES)
287289
}
288290
field(TWST,DBF_STRING) {
289291
prompt("Two String")
@@ -292,6 +294,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
292294
pp(TRUE)
293295
interest(1)
294296
size(26)
297+
prop(YES)
295298
}
296299
field(THST,DBF_STRING) {
297300
prompt("Three String")
@@ -300,6 +303,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
300303
pp(TRUE)
301304
interest(1)
302305
size(26)
306+
prop(YES)
303307
}
304308
field(FRST,DBF_STRING) {
305309
prompt("Four String")
@@ -308,6 +312,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
308312
pp(TRUE)
309313
interest(1)
310314
size(26)
315+
prop(YES)
311316
}
312317
field(FVST,DBF_STRING) {
313318
prompt("Five String")
@@ -316,6 +321,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
316321
pp(TRUE)
317322
interest(1)
318323
size(26)
324+
prop(YES)
319325
}
320326
field(SXST,DBF_STRING) {
321327
prompt("Six String")
@@ -324,6 +330,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
324330
pp(TRUE)
325331
interest(1)
326332
size(26)
333+
prop(YES)
327334
}
328335
field(SVST,DBF_STRING) {
329336
prompt("Seven String")
@@ -332,6 +339,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
332339
pp(TRUE)
333340
interest(1)
334341
size(26)
342+
prop(YES)
335343
}
336344
field(EIST,DBF_STRING) {
337345
prompt("Eight String")
@@ -340,6 +348,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
340348
pp(TRUE)
341349
interest(1)
342350
size(26)
351+
prop(YES)
343352
}
344353
field(NIST,DBF_STRING) {
345354
prompt("Nine String")
@@ -348,6 +357,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
348357
pp(TRUE)
349358
interest(1)
350359
size(26)
360+
prop(YES)
351361
}
352362
field(TEST,DBF_STRING) {
353363
prompt("Ten String")
@@ -356,6 +366,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
356366
pp(TRUE)
357367
interest(1)
358368
size(26)
369+
prop(YES)
359370
}
360371
field(ELST,DBF_STRING) {
361372
prompt("Eleven String")
@@ -364,6 +375,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
364375
pp(TRUE)
365376
interest(1)
366377
size(26)
378+
prop(YES)
367379
}
368380
field(TVST,DBF_STRING) {
369381
prompt("Twelve String")
@@ -372,6 +384,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
372384
pp(TRUE)
373385
interest(1)
374386
size(26)
387+
prop(YES)
375388
}
376389
field(TTST,DBF_STRING) {
377390
prompt("Thirteen String")
@@ -380,6 +393,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
380393
pp(TRUE)
381394
interest(1)
382395
size(26)
396+
prop(YES)
383397
}
384398
field(FTST,DBF_STRING) {
385399
prompt("Fourteen String")
@@ -388,6 +402,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
388402
pp(TRUE)
389403
interest(1)
390404
size(26)
405+
prop(YES)
391406
}
392407
field(FFST,DBF_STRING) {
393408
prompt("Fifteen String")
@@ -396,6 +411,7 @@ Parameters> for more on the record name (NAME) and description (DESC) fields.
396411
pp(TRUE)
397412
interest(1)
398413
size(26)
414+
prop(YES)
399415
}
400416

401417
=head3 Alarm Parameters

‎modules/database/src/std/rec/mbboRecord.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,9 @@ static long special(DBADDR *paddr, int after)
285285
return 0;
286286
init_common(prec);
287287
/* Note: ZRVL..FFVL are also SPC_MOD */
288-
if (fieldIndex >= mbboRecordZRST && fieldIndex <= mbboRecordFFST) {
289-
int event = DBE_PROPERTY;
290-
291-
if (prec->val == fieldIndex - mbboRecordZRST)
292-
event |= DBE_VALUE | DBE_LOG;
293-
db_post_events(prec, &prec->val, event);
288+
if (fieldIndex >= mbboRecordZRST && fieldIndex <= mbboRecordFFST
289+
&& prec->val == fieldIndex - mbboRecordZRST) {
290+
db_post_events(prec, &prec->val, DBE_VALUE | DBE_LOG);
294291
}
295292
return 0;
296293

‎modules/database/src/std/rec/mbboRecord.dbd.pod‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ for more information on simulation mode and its fields.
354354
pp(TRUE)
355355
interest(1)
356356
size(26)
357+
prop(YES)
357358
}
358359
field(ONST,DBF_STRING) {
359360
prompt("One String")
@@ -362,6 +363,7 @@ for more information on simulation mode and its fields.
362363
pp(TRUE)
363364
interest(1)
364365
size(26)
366+
prop(YES)
365367
}
366368
field(TWST,DBF_STRING) {
367369
prompt("Two String")
@@ -370,6 +372,7 @@ for more information on simulation mode and its fields.
370372
pp(TRUE)
371373
interest(1)
372374
size(26)
375+
prop(YES)
373376
}
374377
field(THST,DBF_STRING) {
375378
prompt("Three String")
@@ -378,6 +381,7 @@ for more information on simulation mode and its fields.
378381
pp(TRUE)
379382
interest(1)
380383
size(26)
384+
prop(YES)
381385
}
382386
field(FRST,DBF_STRING) {
383387
prompt("Four String")
@@ -386,6 +390,7 @@ for more information on simulation mode and its fields.
386390
pp(TRUE)
387391
interest(1)
388392
size(26)
393+
prop(YES)
389394
}
390395
field(FVST,DBF_STRING) {
391396
prompt("Five String")
@@ -394,6 +399,7 @@ for more information on simulation mode and its fields.
394399
pp(TRUE)
395400
interest(1)
396401
size(26)
402+
prop(YES)
397403
}
398404
field(SXST,DBF_STRING) {
399405
prompt("Six String")
@@ -402,6 +408,7 @@ for more information on simulation mode and its fields.
402408
pp(TRUE)
403409
interest(1)
404410
size(26)
411+
prop(YES)
405412
}
406413
field(SVST,DBF_STRING) {
407414
prompt("Seven String")
@@ -410,6 +417,7 @@ for more information on simulation mode and its fields.
410417
pp(TRUE)
411418
interest(1)
412419
size(26)
420+
prop(YES)
413421
}
414422
field(EIST,DBF_STRING) {
415423
prompt("Eight String")
@@ -418,6 +426,7 @@ for more information on simulation mode and its fields.
418426
pp(TRUE)
419427
interest(1)
420428
size(26)
429+
prop(YES)
421430
}
422431
field(NIST,DBF_STRING) {
423432
prompt("Nine String")
@@ -426,6 +435,7 @@ for more information on simulation mode and its fields.
426435
pp(TRUE)
427436
interest(1)
428437
size(26)
438+
prop(YES)
429439
}
430440
field(TEST,DBF_STRING) {
431441
prompt("Ten String")
@@ -434,6 +444,7 @@ for more information on simulation mode and its fields.
434444
pp(TRUE)
435445
interest(1)
436446
size(26)
447+
prop(YES)
437448
}
438449
field(ELST,DBF_STRING) {
439450
prompt("Eleven String")
@@ -442,6 +453,7 @@ for more information on simulation mode and its fields.
442453
pp(TRUE)
443454
interest(1)
444455
size(26)
456+
prop(YES)
445457
}
446458
field(TVST,DBF_STRING) {
447459
prompt("Twelve String")
@@ -450,6 +462,7 @@ for more information on simulation mode and its fields.
450462
pp(TRUE)
451463
interest(1)
452464
size(26)
465+
prop(YES)
453466
}
454467
field(TTST,DBF_STRING) {
455468
prompt("Thirteen String")
@@ -458,6 +471,7 @@ for more information on simulation mode and its fields.
458471
pp(TRUE)
459472
interest(1)
460473
size(26)
474+
prop(YES)
461475
}
462476
field(FTST,DBF_STRING) {
463477
prompt("Fourteen String")
@@ -466,6 +480,7 @@ for more information on simulation mode and its fields.
466480
pp(TRUE)
467481
interest(1)
468482
size(26)
483+
prop(YES)
469484
}
470485
field(FFST,DBF_STRING) {
471486
prompt("Fifteen String")
@@ -474,6 +489,7 @@ for more information on simulation mode and its fields.
474489
pp(TRUE)
475490
interest(1)
476491
size(26)
492+
prop(YES)
477493
}
478494
field(ZRSV,DBF_MENU) {
479495
prompt("State Zero Severity")

0 commit comments

Comments
 (0)