Merge lp:~epics-core/epics-base/postdbrprop into lp:~epics-core/epics-base/3.15
- postdbrprop
- Merge into 3.15
Status: | Merged |
---|---|
Approved by: | Andrew Johnson |
Approved revision: | 12457 |
Merged at revision: | 12457 |
Proposed branch: | lp:~epics-core/epics-base/postdbrprop |
Merge into: | lp:~epics-core/epics-base/3.15 |
Diff against target: |
1295 lines (+237/-82) 24 files modified
documentation/RELEASE_NOTES.html (+7/-0) src/ioc/db/dbAccess.c (+7/-1) src/ioc/dbStatic/dbBase.h (+20/-19) src/ioc/dbStatic/dbLexRoutines.c (+68/-61) src/ioc/dbStatic/dbStaticLib.c (+2/-0) src/std/rec/aSubRecord.dbd (+1/-0) src/std/rec/aaiRecord.dbd (+4/-0) src/std/rec/aaoRecord.dbd (+4/-0) src/std/rec/aiRecord.dbd (+12/-0) src/std/rec/aoRecord.dbd (+14/-0) src/std/rec/biRecord.dbd (+2/-0) src/std/rec/boRecord.dbd (+2/-0) src/std/rec/calcRecord.dbd (+12/-0) src/std/rec/calcoutRecord.dbd (+12/-0) src/std/rec/compressRecord.dbd (+4/-0) src/std/rec/dfanoutRecord.dbd (+12/-0) src/std/rec/histogramRecord.dbd (+5/-0) src/std/rec/longinRecord.dbd (+7/-0) src/std/rec/longoutRecord.dbd (+9/-0) src/std/rec/selRecord.dbd (+11/-0) src/std/rec/subArrayRecord.dbd (+4/-0) src/std/rec/subRecord.dbd (+12/-0) src/std/rec/waveformRecord.dbd (+4/-0) src/tools/DBD/Recfield.pm (+2/-1) |
To merge this branch: | bzr merge lp:~epics-core/epics-base/postdbrprop |
Related bugs: | |
Related blueprints: |
Generate DBE_PROPERTY events automatically
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrew Johnson | Approve | ||
Review via email: mp+197290@code.launchpad.net |
Commit message
Description of the change
(This branch should have been named "postdbeprop", but I mis-typed and don't want the trouble of correcting this now)
The branch adds posting of DBE_PROPERTY events when CA metadata/property fields are written with dbPut(). These fields are marked in the recordtype's .dbd file with "prop(YES)".
Changes are made to recognise the prop() field attribute and store it. The attribute is added to all Base recordtypes except mbbi and mbbo where it is not added for the *ST fields as this is already handled by the recordtype's support code.
Also, dbPut() is modified to post a monitor whenever a "prop(YES)" field is written. No attempt to detect field value changes is made. The event is posted for all monitors on the record with DBE_PROPERTY, not just the VAL field. This is done to support recordtypes with more than one VAL type field.
Associated documentation in lp:~mdavidsaver/epics-appdev/postdbeprop
Preview Diff
1 | === modified file 'documentation/RELEASE_NOTES.html' | |||
2 | --- documentation/RELEASE_NOTES.html 2013-06-28 17:35:43 +0000 | |||
3 | +++ documentation/RELEASE_NOTES.html 2013-11-30 20:14:29 +0000 | |||
4 | @@ -15,6 +15,13 @@ | |||
5 | 15 | <h2 align="center">Changes between 3.15.0.1 and 3.15.0.2</h2> | 15 | <h2 align="center">Changes between 3.15.0.1 and 3.15.0.2</h2> |
6 | 16 | <!-- Insert new items immediately below here ... --> | 16 | <!-- Insert new items immediately below here ... --> |
7 | 17 | 17 | ||
8 | 18 | <h3>Post DBE_PROPERTY events automatically</h3> | ||
9 | 19 | |||
10 | 20 | <p>A new record field attribute "prop(YES)" is added to identify fields | ||
11 | 21 | holding CA meta-data. Changes to fields so marked will cause a event | ||
12 | 22 | to be sent to all subscriptions to that record for DBE_PROPERTY. | ||
13 | 23 | Meta-data fields are marked for all Base recordtypes.</p> | ||
14 | 24 | |||
15 | 18 | <h3>errlogRemoveListener() routine changed</h3> | 25 | <h3>errlogRemoveListener() routine changed</h3> |
16 | 19 | 26 | ||
17 | 20 | <p>Code that calls <tt>errlogRemoveListener(myfunc)</tt> must be modified to use | 27 | <p>Code that calls <tt>errlogRemoveListener(myfunc)</tt> must be modified to use |
18 | 21 | 28 | ||
19 | === modified file 'src/ioc/db/dbAccess.c' | |||
20 | --- src/ioc/db/dbAccess.c 2013-10-03 21:04:03 +0000 | |||
21 | +++ src/ioc/db/dbAccess.c 2013-11-30 20:14:29 +0000 | |||
22 | @@ -1208,13 +1208,19 @@ | |||
23 | 1208 | } | 1208 | } |
24 | 1209 | 1209 | ||
25 | 1210 | /* Propagate monitor events for this field, */ | 1210 | /* Propagate monitor events for this field, */ |
27 | 1211 | /* unless the field field is VAL and PP is true. */ | 1211 | /* unless the field is VAL and PP is true. */ |
28 | 1212 | pfldDes = paddr->pfldDes; | 1212 | pfldDes = paddr->pfldDes; |
29 | 1213 | isValueField = dbIsValueField(pfldDes); | 1213 | isValueField = dbIsValueField(pfldDes); |
30 | 1214 | if (isValueField) precord->udf = FALSE; | 1214 | if (isValueField) precord->udf = FALSE; |
31 | 1215 | if (precord->mlis.count && | 1215 | if (precord->mlis.count && |
32 | 1216 | !(isValueField && pfldDes->process_passive)) | 1216 | !(isValueField && pfldDes->process_passive)) |
33 | 1217 | db_post_events(precord, paddr->pfield, DBE_VALUE | DBE_LOG); | 1217 | db_post_events(precord, paddr->pfield, DBE_VALUE | DBE_LOG); |
34 | 1218 | /* If this field is a property (metadata) field, | ||
35 | 1219 | * then post a property change event (even if the field | ||
36 | 1220 | * didn't change). | ||
37 | 1221 | */ | ||
38 | 1222 | if (precord->mlis.count && pfldDes->prop) | ||
39 | 1223 | db_post_events(precord, NULL, DBE_PROPERTY); | ||
40 | 1218 | 1224 | ||
41 | 1219 | return status; | 1225 | return status; |
42 | 1220 | } | 1226 | } |
43 | 1221 | 1227 | ||
44 | === modified file 'src/ioc/dbStatic/dbBase.h' | |||
45 | --- src/ioc/dbStatic/dbBase.h 2012-04-27 17:21:39 +0000 | |||
46 | +++ src/ioc/dbStatic/dbBase.h 2013-11-30 20:14:29 +0000 | |||
47 | @@ -69,25 +69,26 @@ | |||
48 | 69 | }brkTable; | 69 | }brkTable; |
49 | 70 | 70 | ||
50 | 71 | typedef struct dbFldDes{ /* field description */ | 71 | typedef struct dbFldDes{ /* field description */ |
70 | 72 | char *prompt; /*Prompt string for DCT*/ | 72 | char *prompt; /*Prompt string for DCT*/ |
71 | 73 | char *name; /*Field name*/ | 73 | char *name; /*Field name*/ |
72 | 74 | char *extra; /*C def for DBF_NOACCESS*/ | 74 | char *extra; /*C def for DBF_NOACCESS*/ |
73 | 75 | struct dbRecordType *pdbRecordType; | 75 | struct dbRecordType *pdbRecordType; |
74 | 76 | short indRecordType; /*within dbRecordType.papFldDes */ | 76 | short indRecordType; /*within dbRecordType.papFldDes */ |
75 | 77 | short special; /*Special processing requirements */ | 77 | short special; /*Special processing requirements */ |
76 | 78 | dbfType field_type; /*Field type as defined in dbFldTypes.h */ | 78 | dbfType field_type; /*Field type as defined in dbFldTypes.h */ |
77 | 79 | short process_passive;/*should dbPutField process passive */ | 79 | unsigned int process_passive:1;/*should dbPutField process passive */ |
78 | 80 | ctType base; /*base for integer to string conversions*/ | 80 | unsigned int prop:1;/*field is a metadata, post DBE_PROPERTY on change*/ |
79 | 81 | short promptgroup; /*prompt, i.e. gui group */ | 81 | ctType base; /*base for integer to string conversions*/ |
80 | 82 | short interest; /*interest level */ | 82 | short promptgroup; /*prompt, i.e. gui group */ |
81 | 83 | asLevel as_level; /*access security level */ | 83 | short interest; /*interest level */ |
82 | 84 | char *initial; /*initial value */ | 84 | asLevel as_level; /*access security level */ |
83 | 85 | /*If (DBF_MENU,DBF_DEVICE) ftPvt is (pdbMenu,pdbDeviceMenu) */ | 85 | char *initial; /*initial value */ |
84 | 86 | void *ftPvt; | 86 | /*If (DBF_MENU,DBF_DEVICE) ftPvt is (pdbMenu,pdbDeviceMenu) */ |
85 | 87 | /*On no runtime following only set for STRING */ | 87 | void *ftPvt; |
86 | 88 | short size; /*length in bytes of a field element */ | 88 | /*On no runtime following only set for STRING */ |
87 | 89 | /*The following are only available on run time system*/ | 89 | short size; /*length in bytes of a field element */ |
88 | 90 | short offset; /*Offset in bytes from beginning of record*/ | 90 | /*The following are only available on run time system*/ |
89 | 91 | short offset; /*Offset in bytes from beginning of record*/ | ||
90 | 91 | }dbFldDes; | 92 | }dbFldDes; |
91 | 92 | 93 | ||
92 | 93 | typedef struct dbInfoNode { /*non-field per-record information*/ | 94 | typedef struct dbInfoNode { /*non-field per-record information*/ |
93 | 94 | 95 | ||
94 | === modified file 'src/ioc/dbStatic/dbLexRoutines.c' | |||
95 | --- src/ioc/dbStatic/dbLexRoutines.c 2012-07-31 19:04:38 +0000 | |||
96 | +++ src/ioc/dbStatic/dbLexRoutines.c 2013-11-30 20:14:29 +0000 | |||
97 | @@ -498,87 +498,94 @@ | |||
98 | 498 | if(duplicate) return; | 498 | if(duplicate) return; |
99 | 499 | pdbFldDes = (dbFldDes *)getLastTemp(); | 499 | pdbFldDes = (dbFldDes *)getLastTemp(); |
100 | 500 | if(strcmp(name,"asl")==0) { | 500 | if(strcmp(name,"asl")==0) { |
109 | 501 | if(strcmp(value,"ASL0")==0) { | 501 | if(strcmp(value,"ASL0")==0) { |
110 | 502 | pdbFldDes->as_level = ASL0; | 502 | pdbFldDes->as_level = ASL0; |
111 | 503 | } else if(strcmp(value,"ASL1")==0) { | 503 | } else if(strcmp(value,"ASL1")==0) { |
112 | 504 | pdbFldDes->as_level = ASL1; | 504 | pdbFldDes->as_level = ASL1; |
113 | 505 | } else { | 505 | } else { |
114 | 506 | yyerror("Illegal Access Security value: Must be ASL0 or ASL1"); | 506 | yyerror("Illegal Access Security value: Must be ASL0 or ASL1"); |
115 | 507 | } | 507 | } |
116 | 508 | return; | 508 | return; |
117 | 509 | } | 509 | } |
118 | 510 | if(strcmp(name,"initial")==0) { | 510 | if(strcmp(name,"initial")==0) { |
121 | 511 | pdbFldDes->initial = epicsStrDup(value); | 511 | pdbFldDes->initial = epicsStrDup(value); |
122 | 512 | return; | 512 | return; |
123 | 513 | } | 513 | } |
124 | 514 | if(strcmp(name,"promptgroup")==0) { | 514 | if(strcmp(name,"promptgroup")==0) { |
134 | 515 | int i; | 515 | int i; |
135 | 516 | for(i=0; i<GUI_NTYPES; i++) { | 516 | for(i=0; i<GUI_NTYPES; i++) { |
136 | 517 | if(strcmp(value,pamapguiGroup[i].strvalue)==0) { | 517 | if(strcmp(value,pamapguiGroup[i].strvalue)==0) { |
137 | 518 | pdbFldDes->promptgroup = pamapguiGroup[i].value; | 518 | pdbFldDes->promptgroup = pamapguiGroup[i].value; |
138 | 519 | return; | 519 | return; |
139 | 520 | } | 520 | } |
140 | 521 | } | 521 | } |
141 | 522 | yyerror("Illegal promptgroup. See guigroup.h for legal values"); | 522 | yyerror("Illegal promptgroup. See guigroup.h for legal values"); |
142 | 523 | return; | 523 | return; |
143 | 524 | } | 524 | } |
144 | 525 | if(strcmp(name,"prompt")==0) { | 525 | if(strcmp(name,"prompt")==0) { |
147 | 526 | pdbFldDes->prompt = epicsStrDup(value); | 526 | pdbFldDes->prompt = epicsStrDup(value); |
148 | 527 | return; | 527 | return; |
149 | 528 | } | 528 | } |
150 | 529 | if(strcmp(name,"special")==0) { | 529 | if(strcmp(name,"special")==0) { |
163 | 530 | int i; | 530 | int i; |
164 | 531 | for(i=0; i<SPC_NTYPES; i++) { | 531 | for(i=0; i<SPC_NTYPES; i++) { |
165 | 532 | if(strcmp(value,pamapspcType[i].strvalue)==0) { | 532 | if(strcmp(value,pamapspcType[i].strvalue)==0) { |
166 | 533 | pdbFldDes->special = pamapspcType[i].value; | 533 | pdbFldDes->special = pamapspcType[i].value; |
167 | 534 | return; | 534 | return; |
168 | 535 | } | 535 | } |
169 | 536 | } | 536 | } |
170 | 537 | if(sscanf(value,"%hd",&pdbFldDes->special)==1) { | 537 | if(sscanf(value,"%hd",&pdbFldDes->special)==1) { |
171 | 538 | return; | 538 | return; |
172 | 539 | } | 539 | } |
173 | 540 | yyerror("Illegal special value."); | 540 | yyerror("Illegal special value."); |
174 | 541 | return; | 541 | return; |
175 | 542 | } | 542 | } |
176 | 543 | if(strcmp(name,"pp")==0) { | 543 | if(strcmp(name,"pp")==0) { |
185 | 544 | if((strcmp(value,"YES")==0) || (strcmp(value,"TRUE")==0)) { | 544 | if((strcmp(value,"YES")==0) || (strcmp(value,"TRUE")==0)) { |
186 | 545 | pdbFldDes->process_passive = TRUE; | 545 | pdbFldDes->process_passive = TRUE; |
187 | 546 | } else if((strcmp(value,"NO")==0) || (strcmp(value,"FALSE")==0)) { | 546 | } else if((strcmp(value,"NO")==0) || (strcmp(value,"FALSE")==0)) { |
188 | 547 | pdbFldDes->process_passive = FALSE; | 547 | pdbFldDes->process_passive = FALSE; |
189 | 548 | } else { | 548 | } else { |
190 | 549 | yyerror("Illegal value. Must be NO or YES"); | 549 | yyerror("Illegal value. Must be NO or YES"); |
191 | 550 | } | 550 | } |
192 | 551 | return; | 551 | return; |
193 | 552 | } | 552 | } |
194 | 553 | if(strcmp(name,"interest")==0) { | 553 | if(strcmp(name,"interest")==0) { |
198 | 554 | if(sscanf(value,"%hd",&pdbFldDes->interest)!=1) | 554 | if(sscanf(value,"%hd",&pdbFldDes->interest)!=1) |
199 | 555 | yyerror("Illegal value. Must be integer"); | 555 | yyerror("Illegal value. Must be integer"); |
200 | 556 | return; | 556 | return; |
201 | 557 | } | 557 | } |
202 | 558 | if(strcmp(name,"base")==0) { | 558 | if(strcmp(name,"base")==0) { |
211 | 559 | if(strcmp(value,"DECIMAL")==0) { | 559 | if(strcmp(value,"DECIMAL")==0) { |
212 | 560 | pdbFldDes->base = CT_DECIMAL; | 560 | pdbFldDes->base = CT_DECIMAL; |
213 | 561 | } else if(strcmp(value,"HEX")==0) { | 561 | } else if(strcmp(value,"HEX")==0) { |
214 | 562 | pdbFldDes->base = CT_HEX; | 562 | pdbFldDes->base = CT_HEX; |
215 | 563 | } else { | 563 | } else { |
216 | 564 | yyerror("Illegal value. Must be CT_DECIMAL or CT_HEX"); | 564 | yyerror("Illegal value. Must be CT_DECIMAL or CT_HEX"); |
217 | 565 | } | 565 | } |
218 | 566 | return; | 566 | return; |
219 | 567 | } | 567 | } |
220 | 568 | if(strcmp(name,"size")==0) { | 568 | if(strcmp(name,"size")==0) { |
224 | 569 | if(sscanf(value,"%hd",&pdbFldDes->size)!=1) | 569 | if(sscanf(value,"%hd",&pdbFldDes->size)!=1) |
225 | 570 | yyerror("Illegal value. Must be integer"); | 570 | yyerror("Illegal value. Must be integer"); |
226 | 571 | return; | 571 | return; |
227 | 572 | } | 572 | } |
228 | 573 | if(strcmp(name,"extra")==0) { | 573 | if(strcmp(name,"extra")==0) { |
231 | 574 | pdbFldDes->extra = epicsStrDup(value); | 574 | pdbFldDes->extra = epicsStrDup(value); |
232 | 575 | return; | 575 | return; |
233 | 576 | } | 576 | } |
234 | 577 | if(strcmp(name,"menu")==0) { | 577 | if(strcmp(name,"menu")==0) { |
239 | 578 | pdbFldDes->ftPvt = (dbMenu *)dbFindMenu(pdbbase,value); | 578 | pdbFldDes->ftPvt = (dbMenu *)dbFindMenu(pdbbase,value); |
240 | 579 | if(!pdbbase->ignoreMissingMenus && !pdbFldDes->ftPvt) | 579 | if(!pdbbase->ignoreMissingMenus && !pdbFldDes->ftPvt) |
241 | 580 | yyerrorAbort("menu not found"); | 580 | yyerrorAbort("menu not found"); |
242 | 581 | return; | 581 | return; |
243 | 582 | } | ||
244 | 583 | if(strcmp(name,"prop")==0) { | ||
245 | 584 | if(strcmp(value, "YES")==0) | ||
246 | 585 | pdbFldDes->prop = 1; | ||
247 | 586 | else | ||
248 | 587 | pdbFldDes->prop = 0; | ||
249 | 588 | return; | ||
250 | 582 | } | 589 | } |
251 | 583 | } | 590 | } |
252 | 584 | 591 | ||
253 | 585 | 592 | ||
254 | 586 | 593 | ||
255 | === modified file 'src/ioc/dbStatic/dbStaticLib.c' | |||
256 | --- src/ioc/dbStatic/dbStaticLib.c 2013-06-14 18:55:22 +0000 | |||
257 | +++ src/ioc/dbStatic/dbStaticLib.c 2013-11-30 20:14:29 +0000 | |||
258 | @@ -971,6 +971,7 @@ | |||
259 | 971 | pdbFldDes->size); | 971 | pdbFldDes->size); |
260 | 972 | } | 972 | } |
261 | 973 | if(pdbFldDes->process_passive) fprintf(fp,"\t\tpp(TRUE)\n"); | 973 | if(pdbFldDes->process_passive) fprintf(fp,"\t\tpp(TRUE)\n"); |
262 | 974 | if(pdbFldDes->prop) fprintf(fp,"\t\tprop(YES)\n"); | ||
263 | 974 | if(pdbFldDes->base) fprintf(fp,"\t\tbase(HEX)\n"); | 975 | if(pdbFldDes->base) fprintf(fp,"\t\tbase(HEX)\n"); |
264 | 975 | if(pdbFldDes->interest) | 976 | if(pdbFldDes->interest) |
265 | 976 | fprintf(fp,"\t\tinterest(%d)\n",pdbFldDes->interest); | 977 | fprintf(fp,"\t\tinterest(%d)\n",pdbFldDes->interest); |
266 | @@ -3140,6 +3141,7 @@ | |||
267 | 3140 | else | 3141 | else |
268 | 3141 | printf("\t field_type: %s\n", pamapdbfType[j].strvalue); | 3142 | printf("\t field_type: %s\n", pamapdbfType[j].strvalue); |
269 | 3142 | printf("\tprocess_passive: %hd\n",pdbFldDes->process_passive); | 3143 | printf("\tprocess_passive: %hd\n",pdbFldDes->process_passive); |
270 | 3144 | printf("\t property: %hd\n",pdbFldDes->prop); | ||
271 | 3143 | printf("\t base: %d\n",pdbFldDes->base); | 3145 | printf("\t base: %d\n",pdbFldDes->base); |
272 | 3144 | if(!pdbFldDes->promptgroup) { | 3146 | if(!pdbFldDes->promptgroup) { |
273 | 3145 | printf("\t promptgroup: %d\n",pdbFldDes->promptgroup); | 3147 | printf("\t promptgroup: %d\n",pdbFldDes->promptgroup); |
274 | 3146 | 3148 | ||
275 | === modified file 'src/std/rec/aSubRecord.dbd' | |||
276 | --- src/std/rec/aSubRecord.dbd 2012-10-18 05:10:12 +0000 | |||
277 | +++ src/std/rec/aSubRecord.dbd 2013-11-30 20:14:29 +0000 | |||
278 | @@ -77,6 +77,7 @@ | |||
279 | 77 | prompt("Display Precision") | 77 | prompt("Display Precision") |
280 | 78 | promptgroup(GUI_DISPLAY) | 78 | promptgroup(GUI_DISPLAY) |
281 | 79 | interest(1) | 79 | interest(1) |
282 | 80 | prop(YES) | ||
283 | 80 | } | 81 | } |
284 | 81 | field(EFLG,DBF_MENU) { | 82 | field(EFLG,DBF_MENU) { |
285 | 82 | prompt("Output Event Flag") | 83 | prompt("Output Event Flag") |
286 | 83 | 84 | ||
287 | === modified file 'src/std/rec/aaiRecord.dbd' | |||
288 | --- src/std/rec/aaiRecord.dbd 2010-05-27 14:45:21 +0000 | |||
289 | +++ src/std/rec/aaiRecord.dbd 2013-11-30 20:14:29 +0000 | |||
290 | @@ -24,6 +24,7 @@ | |||
291 | 24 | prompt("Display Precision") | 24 | prompt("Display Precision") |
292 | 25 | promptgroup(GUI_ALARMS) | 25 | promptgroup(GUI_ALARMS) |
293 | 26 | interest(1) | 26 | interest(1) |
294 | 27 | prop(YES) | ||
295 | 27 | } | 28 | } |
296 | 28 | field(INP,DBF_INLINK) { | 29 | field(INP,DBF_INLINK) { |
297 | 29 | prompt("Input Specification") | 30 | prompt("Input Specification") |
298 | @@ -35,16 +36,19 @@ | |||
299 | 35 | promptgroup(GUI_BITS2) | 36 | promptgroup(GUI_BITS2) |
300 | 36 | interest(1) | 37 | interest(1) |
301 | 37 | size(16) | 38 | size(16) |
302 | 39 | prop(YES) | ||
303 | 38 | } | 40 | } |
304 | 39 | field(HOPR,DBF_DOUBLE) { | 41 | field(HOPR,DBF_DOUBLE) { |
305 | 40 | prompt("High Operating Range") | 42 | prompt("High Operating Range") |
306 | 41 | promptgroup(GUI_CALC) | 43 | promptgroup(GUI_CALC) |
307 | 42 | interest(1) | 44 | interest(1) |
308 | 45 | prop(YES) | ||
309 | 43 | } | 46 | } |
310 | 44 | field(LOPR,DBF_DOUBLE) { | 47 | field(LOPR,DBF_DOUBLE) { |
311 | 45 | prompt("Low Operating Range") | 48 | prompt("Low Operating Range") |
312 | 46 | promptgroup(GUI_CLOCK) | 49 | promptgroup(GUI_CLOCK) |
313 | 47 | interest(1) | 50 | interest(1) |
314 | 51 | prop(YES) | ||
315 | 48 | } | 52 | } |
316 | 49 | field(NELM,DBF_ULONG) { | 53 | field(NELM,DBF_ULONG) { |
317 | 50 | prompt("Number of Elements") | 54 | prompt("Number of Elements") |
318 | 51 | 55 | ||
319 | === modified file 'src/std/rec/aaoRecord.dbd' | |||
320 | --- src/std/rec/aaoRecord.dbd 2010-05-27 14:45:21 +0000 | |||
321 | +++ src/std/rec/aaoRecord.dbd 2013-11-30 20:14:29 +0000 | |||
322 | @@ -24,6 +24,7 @@ | |||
323 | 24 | prompt("Display Precision") | 24 | prompt("Display Precision") |
324 | 25 | promptgroup(GUI_ALARMS) | 25 | promptgroup(GUI_ALARMS) |
325 | 26 | interest(1) | 26 | interest(1) |
326 | 27 | prop(YES) | ||
327 | 27 | } | 28 | } |
328 | 28 | field(OUT,DBF_OUTLINK) { | 29 | field(OUT,DBF_OUTLINK) { |
329 | 29 | prompt("Output Specification") | 30 | prompt("Output Specification") |
330 | @@ -35,16 +36,19 @@ | |||
331 | 35 | promptgroup(GUI_BITS2) | 36 | promptgroup(GUI_BITS2) |
332 | 36 | interest(1) | 37 | interest(1) |
333 | 37 | size(16) | 38 | size(16) |
334 | 39 | prop(YES) | ||
335 | 38 | } | 40 | } |
336 | 39 | field(HOPR,DBF_DOUBLE) { | 41 | field(HOPR,DBF_DOUBLE) { |
337 | 40 | prompt("High Operating Range") | 42 | prompt("High Operating Range") |
338 | 41 | promptgroup(GUI_CALC) | 43 | promptgroup(GUI_CALC) |
339 | 42 | interest(1) | 44 | interest(1) |
340 | 45 | prop(YES) | ||
341 | 43 | } | 46 | } |
342 | 44 | field(LOPR,DBF_DOUBLE) { | 47 | field(LOPR,DBF_DOUBLE) { |
343 | 45 | prompt("Low Operating Range") | 48 | prompt("Low Operating Range") |
344 | 46 | promptgroup(GUI_CLOCK) | 49 | promptgroup(GUI_CLOCK) |
345 | 47 | interest(1) | 50 | interest(1) |
346 | 51 | prop(YES) | ||
347 | 48 | } | 52 | } |
348 | 49 | field(NELM,DBF_ULONG) { | 53 | field(NELM,DBF_ULONG) { |
349 | 50 | prompt("Number of Elements") | 54 | prompt("Number of Elements") |
350 | 51 | 55 | ||
351 | === modified file 'src/std/rec/aiRecord.dbd' | |||
352 | --- src/std/rec/aiRecord.dbd 2010-01-06 22:05:49 +0000 | |||
353 | +++ src/std/rec/aiRecord.dbd 2013-11-30 20:14:29 +0000 | |||
354 | @@ -24,6 +24,7 @@ | |||
355 | 24 | prompt("Display Precision") | 24 | prompt("Display Precision") |
356 | 25 | promptgroup(GUI_DISPLAY) | 25 | promptgroup(GUI_DISPLAY) |
357 | 26 | interest(1) | 26 | interest(1) |
358 | 27 | prop(YES) | ||
359 | 27 | } | 28 | } |
360 | 28 | field(LINR,DBF_MENU) { | 29 | field(LINR,DBF_MENU) { |
361 | 29 | prompt("Linearization") | 30 | prompt("Linearization") |
362 | @@ -52,16 +53,19 @@ | |||
363 | 52 | promptgroup(GUI_DISPLAY) | 53 | promptgroup(GUI_DISPLAY) |
364 | 53 | interest(1) | 54 | interest(1) |
365 | 54 | size(16) | 55 | size(16) |
366 | 56 | prop(YES) | ||
367 | 55 | } | 57 | } |
368 | 56 | field(HOPR,DBF_DOUBLE) { | 58 | field(HOPR,DBF_DOUBLE) { |
369 | 57 | prompt("High Operating Range") | 59 | prompt("High Operating Range") |
370 | 58 | promptgroup(GUI_DISPLAY) | 60 | promptgroup(GUI_DISPLAY) |
371 | 59 | interest(1) | 61 | interest(1) |
372 | 62 | prop(YES) | ||
373 | 60 | } | 63 | } |
374 | 61 | field(LOPR,DBF_DOUBLE) { | 64 | field(LOPR,DBF_DOUBLE) { |
375 | 62 | prompt("Low Operating Range") | 65 | prompt("Low Operating Range") |
376 | 63 | promptgroup(GUI_DISPLAY) | 66 | promptgroup(GUI_DISPLAY) |
377 | 64 | interest(1) | 67 | interest(1) |
378 | 68 | prop(YES) | ||
379 | 65 | } | 69 | } |
380 | 66 | field(AOFF,DBF_DOUBLE) { | 70 | field(AOFF,DBF_DOUBLE) { |
381 | 67 | prompt("Adjustment Offset") | 71 | prompt("Adjustment Offset") |
382 | @@ -86,30 +90,35 @@ | |||
383 | 86 | promptgroup(GUI_ALARMS) | 90 | promptgroup(GUI_ALARMS) |
384 | 87 | pp(TRUE) | 91 | pp(TRUE) |
385 | 88 | interest(1) | 92 | interest(1) |
386 | 93 | prop(YES) | ||
387 | 89 | } | 94 | } |
388 | 90 | field(LOLO,DBF_DOUBLE) { | 95 | field(LOLO,DBF_DOUBLE) { |
389 | 91 | prompt("Lolo Alarm Limit") | 96 | prompt("Lolo Alarm Limit") |
390 | 92 | promptgroup(GUI_ALARMS) | 97 | promptgroup(GUI_ALARMS) |
391 | 93 | pp(TRUE) | 98 | pp(TRUE) |
392 | 94 | interest(1) | 99 | interest(1) |
393 | 100 | prop(YES) | ||
394 | 95 | } | 101 | } |
395 | 96 | field(HIGH,DBF_DOUBLE) { | 102 | field(HIGH,DBF_DOUBLE) { |
396 | 97 | prompt("High Alarm Limit") | 103 | prompt("High Alarm Limit") |
397 | 98 | promptgroup(GUI_ALARMS) | 104 | promptgroup(GUI_ALARMS) |
398 | 99 | pp(TRUE) | 105 | pp(TRUE) |
399 | 100 | interest(1) | 106 | interest(1) |
400 | 107 | prop(YES) | ||
401 | 101 | } | 108 | } |
402 | 102 | field(LOW,DBF_DOUBLE) { | 109 | field(LOW,DBF_DOUBLE) { |
403 | 103 | prompt("Low Alarm Limit") | 110 | prompt("Low Alarm Limit") |
404 | 104 | promptgroup(GUI_ALARMS) | 111 | promptgroup(GUI_ALARMS) |
405 | 105 | pp(TRUE) | 112 | pp(TRUE) |
406 | 106 | interest(1) | 113 | interest(1) |
407 | 114 | prop(YES) | ||
408 | 107 | } | 115 | } |
409 | 108 | field(HHSV,DBF_MENU) { | 116 | field(HHSV,DBF_MENU) { |
410 | 109 | prompt("Hihi Severity") | 117 | prompt("Hihi Severity") |
411 | 110 | promptgroup(GUI_ALARMS) | 118 | promptgroup(GUI_ALARMS) |
412 | 111 | pp(TRUE) | 119 | pp(TRUE) |
413 | 112 | interest(1) | 120 | interest(1) |
414 | 121 | prop(YES) | ||
415 | 113 | menu(menuAlarmSevr) | 122 | menu(menuAlarmSevr) |
416 | 114 | } | 123 | } |
417 | 115 | field(LLSV,DBF_MENU) { | 124 | field(LLSV,DBF_MENU) { |
418 | @@ -117,6 +126,7 @@ | |||
419 | 117 | promptgroup(GUI_ALARMS) | 126 | promptgroup(GUI_ALARMS) |
420 | 118 | pp(TRUE) | 127 | pp(TRUE) |
421 | 119 | interest(1) | 128 | interest(1) |
422 | 129 | prop(YES) | ||
423 | 120 | menu(menuAlarmSevr) | 130 | menu(menuAlarmSevr) |
424 | 121 | } | 131 | } |
425 | 122 | field(HSV,DBF_MENU) { | 132 | field(HSV,DBF_MENU) { |
426 | @@ -124,6 +134,7 @@ | |||
427 | 124 | promptgroup(GUI_ALARMS) | 134 | promptgroup(GUI_ALARMS) |
428 | 125 | pp(TRUE) | 135 | pp(TRUE) |
429 | 126 | interest(1) | 136 | interest(1) |
430 | 137 | prop(YES) | ||
431 | 127 | menu(menuAlarmSevr) | 138 | menu(menuAlarmSevr) |
432 | 128 | } | 139 | } |
433 | 129 | field(LSV,DBF_MENU) { | 140 | field(LSV,DBF_MENU) { |
434 | @@ -131,6 +142,7 @@ | |||
435 | 131 | promptgroup(GUI_ALARMS) | 142 | promptgroup(GUI_ALARMS) |
436 | 132 | pp(TRUE) | 143 | pp(TRUE) |
437 | 133 | interest(1) | 144 | interest(1) |
438 | 145 | prop(YES) | ||
439 | 134 | menu(menuAlarmSevr) | 146 | menu(menuAlarmSevr) |
440 | 135 | } | 147 | } |
441 | 136 | field(HYST,DBF_DOUBLE) { | 148 | field(HYST,DBF_DOUBLE) { |
442 | 137 | 149 | ||
443 | === modified file 'src/std/rec/aoRecord.dbd' | |||
444 | --- src/std/rec/aoRecord.dbd 2002-07-12 21:35:43 +0000 | |||
445 | +++ src/std/rec/aoRecord.dbd 2013-11-30 20:14:29 +0000 | |||
446 | @@ -53,6 +53,7 @@ | |||
447 | 53 | prompt("Display Precision") | 53 | prompt("Display Precision") |
448 | 54 | promptgroup(GUI_DISPLAY) | 54 | promptgroup(GUI_DISPLAY) |
449 | 55 | interest(1) | 55 | interest(1) |
450 | 56 | prop(YES) | ||
451 | 56 | } | 57 | } |
452 | 57 | field(LINR,DBF_MENU) { | 58 | field(LINR,DBF_MENU) { |
453 | 58 | prompt("Linearization") | 59 | prompt("Linearization") |
454 | @@ -81,6 +82,7 @@ | |||
455 | 81 | promptgroup(GUI_DISPLAY) | 82 | promptgroup(GUI_DISPLAY) |
456 | 82 | interest(1) | 83 | interest(1) |
457 | 83 | size(16) | 84 | size(16) |
458 | 85 | prop(YES) | ||
459 | 84 | } | 86 | } |
460 | 85 | field(ROFF,DBF_LONG) { | 87 | field(ROFF,DBF_LONG) { |
461 | 86 | prompt("Raw Offset, obsolete") | 88 | prompt("Raw Offset, obsolete") |
462 | @@ -105,22 +107,26 @@ | |||
463 | 105 | promptgroup(GUI_OUTPUT) | 107 | promptgroup(GUI_OUTPUT) |
464 | 106 | pp(TRUE) | 108 | pp(TRUE) |
465 | 107 | interest(1) | 109 | interest(1) |
466 | 110 | prop(YES) | ||
467 | 108 | } | 111 | } |
468 | 109 | field(DRVL,DBF_DOUBLE) { | 112 | field(DRVL,DBF_DOUBLE) { |
469 | 110 | prompt("Drive Low Limit") | 113 | prompt("Drive Low Limit") |
470 | 111 | promptgroup(GUI_OUTPUT) | 114 | promptgroup(GUI_OUTPUT) |
471 | 112 | pp(TRUE) | 115 | pp(TRUE) |
472 | 113 | interest(1) | 116 | interest(1) |
473 | 117 | prop(YES) | ||
474 | 114 | } | 118 | } |
475 | 115 | field(HOPR,DBF_DOUBLE) { | 119 | field(HOPR,DBF_DOUBLE) { |
476 | 116 | prompt("High Operating Range") | 120 | prompt("High Operating Range") |
477 | 117 | promptgroup(GUI_DISPLAY) | 121 | promptgroup(GUI_DISPLAY) |
478 | 118 | interest(1) | 122 | interest(1) |
479 | 123 | prop(YES) | ||
480 | 119 | } | 124 | } |
481 | 120 | field(LOPR,DBF_DOUBLE) { | 125 | field(LOPR,DBF_DOUBLE) { |
482 | 121 | prompt("Low Operating Range") | 126 | prompt("Low Operating Range") |
483 | 122 | promptgroup(GUI_DISPLAY) | 127 | promptgroup(GUI_DISPLAY) |
484 | 123 | interest(1) | 128 | interest(1) |
485 | 129 | prop(YES) | ||
486 | 124 | } | 130 | } |
487 | 125 | field(AOFF,DBF_DOUBLE) { | 131 | field(AOFF,DBF_DOUBLE) { |
488 | 126 | prompt("Adjustment Offset") | 132 | prompt("Adjustment Offset") |
489 | @@ -139,30 +145,35 @@ | |||
490 | 139 | promptgroup(GUI_ALARMS) | 145 | promptgroup(GUI_ALARMS) |
491 | 140 | pp(TRUE) | 146 | pp(TRUE) |
492 | 141 | interest(1) | 147 | interest(1) |
493 | 148 | prop(YES) | ||
494 | 142 | } | 149 | } |
495 | 143 | field(LOLO,DBF_DOUBLE) { | 150 | field(LOLO,DBF_DOUBLE) { |
496 | 144 | prompt("Lolo Alarm Limit") | 151 | prompt("Lolo Alarm Limit") |
497 | 145 | promptgroup(GUI_ALARMS) | 152 | promptgroup(GUI_ALARMS) |
498 | 146 | pp(TRUE) | 153 | pp(TRUE) |
499 | 147 | interest(1) | 154 | interest(1) |
500 | 155 | prop(YES) | ||
501 | 148 | } | 156 | } |
502 | 149 | field(HIGH,DBF_DOUBLE) { | 157 | field(HIGH,DBF_DOUBLE) { |
503 | 150 | prompt("High Alarm Limit") | 158 | prompt("High Alarm Limit") |
504 | 151 | promptgroup(GUI_ALARMS) | 159 | promptgroup(GUI_ALARMS) |
505 | 152 | pp(TRUE) | 160 | pp(TRUE) |
506 | 153 | interest(1) | 161 | interest(1) |
507 | 162 | prop(YES) | ||
508 | 154 | } | 163 | } |
509 | 155 | field(LOW,DBF_DOUBLE) { | 164 | field(LOW,DBF_DOUBLE) { |
510 | 156 | prompt("Low Alarm Limit") | 165 | prompt("Low Alarm Limit") |
511 | 157 | promptgroup(GUI_ALARMS) | 166 | promptgroup(GUI_ALARMS) |
512 | 158 | pp(TRUE) | 167 | pp(TRUE) |
513 | 159 | interest(1) | 168 | interest(1) |
514 | 169 | prop(YES) | ||
515 | 160 | } | 170 | } |
516 | 161 | field(HHSV,DBF_MENU) { | 171 | field(HHSV,DBF_MENU) { |
517 | 162 | prompt("Hihi Severity") | 172 | prompt("Hihi Severity") |
518 | 163 | promptgroup(GUI_ALARMS) | 173 | promptgroup(GUI_ALARMS) |
519 | 164 | pp(TRUE) | 174 | pp(TRUE) |
520 | 165 | interest(1) | 175 | interest(1) |
521 | 176 | prop(YES) | ||
522 | 166 | menu(menuAlarmSevr) | 177 | menu(menuAlarmSevr) |
523 | 167 | } | 178 | } |
524 | 168 | field(LLSV,DBF_MENU) { | 179 | field(LLSV,DBF_MENU) { |
525 | @@ -170,6 +181,7 @@ | |||
526 | 170 | promptgroup(GUI_ALARMS) | 181 | promptgroup(GUI_ALARMS) |
527 | 171 | pp(TRUE) | 182 | pp(TRUE) |
528 | 172 | interest(1) | 183 | interest(1) |
529 | 184 | prop(YES) | ||
530 | 173 | menu(menuAlarmSevr) | 185 | menu(menuAlarmSevr) |
531 | 174 | } | 186 | } |
532 | 175 | field(HSV,DBF_MENU) { | 187 | field(HSV,DBF_MENU) { |
533 | @@ -177,6 +189,7 @@ | |||
534 | 177 | promptgroup(GUI_ALARMS) | 189 | promptgroup(GUI_ALARMS) |
535 | 178 | pp(TRUE) | 190 | pp(TRUE) |
536 | 179 | interest(1) | 191 | interest(1) |
537 | 192 | prop(YES) | ||
538 | 180 | menu(menuAlarmSevr) | 193 | menu(menuAlarmSevr) |
539 | 181 | } | 194 | } |
540 | 182 | field(LSV,DBF_MENU) { | 195 | field(LSV,DBF_MENU) { |
541 | @@ -184,6 +197,7 @@ | |||
542 | 184 | promptgroup(GUI_ALARMS) | 197 | promptgroup(GUI_ALARMS) |
543 | 185 | pp(TRUE) | 198 | pp(TRUE) |
544 | 186 | interest(1) | 199 | interest(1) |
545 | 200 | prop(YES) | ||
546 | 187 | menu(menuAlarmSevr) | 201 | menu(menuAlarmSevr) |
547 | 188 | } | 202 | } |
548 | 189 | field(HYST,DBF_DOUBLE) { | 203 | field(HYST,DBF_DOUBLE) { |
549 | 190 | 204 | ||
550 | === modified file 'src/std/rec/biRecord.dbd' | |||
551 | --- src/std/rec/biRecord.dbd 2009-06-08 19:55:49 +0000 | |||
552 | +++ src/std/rec/biRecord.dbd 2013-11-30 20:14:29 +0000 | |||
553 | @@ -47,6 +47,7 @@ | |||
554 | 47 | pp(TRUE) | 47 | pp(TRUE) |
555 | 48 | interest(1) | 48 | interest(1) |
556 | 49 | size(26) | 49 | size(26) |
557 | 50 | prop(YES) | ||
558 | 50 | } | 51 | } |
559 | 51 | field(ONAM,DBF_STRING) { | 52 | field(ONAM,DBF_STRING) { |
560 | 52 | prompt("One Name") | 53 | prompt("One Name") |
561 | @@ -54,6 +55,7 @@ | |||
562 | 54 | pp(TRUE) | 55 | pp(TRUE) |
563 | 55 | interest(1) | 56 | interest(1) |
564 | 56 | size(26) | 57 | size(26) |
565 | 58 | prop(YES) | ||
566 | 57 | } | 59 | } |
567 | 58 | field(RVAL,DBF_ULONG) { | 60 | field(RVAL,DBF_ULONG) { |
568 | 59 | prompt("Raw Value") | 61 | prompt("Raw Value") |
569 | 60 | 62 | ||
570 | === modified file 'src/std/rec/boRecord.dbd' | |||
571 | --- src/std/rec/boRecord.dbd 2012-01-21 22:35:40 +0000 | |||
572 | +++ src/std/rec/boRecord.dbd 2013-11-30 20:14:29 +0000 | |||
573 | @@ -42,6 +42,7 @@ | |||
574 | 42 | pp(TRUE) | 42 | pp(TRUE) |
575 | 43 | interest(1) | 43 | interest(1) |
576 | 44 | size(26) | 44 | size(26) |
577 | 45 | prop(YES) | ||
578 | 45 | } | 46 | } |
579 | 46 | field(ONAM,DBF_STRING) { | 47 | field(ONAM,DBF_STRING) { |
580 | 47 | prompt("One Name") | 48 | prompt("One Name") |
581 | @@ -49,6 +50,7 @@ | |||
582 | 49 | pp(TRUE) | 50 | pp(TRUE) |
583 | 50 | interest(1) | 51 | interest(1) |
584 | 51 | size(26) | 52 | size(26) |
585 | 53 | prop(YES) | ||
586 | 52 | } | 54 | } |
587 | 53 | field(RVAL,DBF_ULONG) { | 55 | field(RVAL,DBF_ULONG) { |
588 | 54 | prompt("Raw Value") | 56 | prompt("Raw Value") |
589 | 55 | 57 | ||
590 | === modified file 'src/std/rec/calcRecord.dbd' | |||
591 | --- src/std/rec/calcRecord.dbd 2010-05-28 09:16:45 +0000 | |||
592 | +++ src/std/rec/calcRecord.dbd 2013-11-30 20:14:29 +0000 | |||
593 | @@ -85,51 +85,60 @@ | |||
594 | 85 | promptgroup(GUI_DISPLAY) | 85 | promptgroup(GUI_DISPLAY) |
595 | 86 | interest(1) | 86 | interest(1) |
596 | 87 | size(16) | 87 | size(16) |
597 | 88 | prop(YES) | ||
598 | 88 | } | 89 | } |
599 | 89 | field(PREC,DBF_SHORT) { | 90 | field(PREC,DBF_SHORT) { |
600 | 90 | prompt("Display Precision") | 91 | prompt("Display Precision") |
601 | 91 | promptgroup(GUI_DISPLAY) | 92 | promptgroup(GUI_DISPLAY) |
602 | 92 | interest(1) | 93 | interest(1) |
603 | 94 | prop(YES) | ||
604 | 93 | } | 95 | } |
605 | 94 | field(HOPR,DBF_DOUBLE) { | 96 | field(HOPR,DBF_DOUBLE) { |
606 | 95 | prompt("High Operating Rng") | 97 | prompt("High Operating Rng") |
607 | 96 | promptgroup(GUI_DISPLAY) | 98 | promptgroup(GUI_DISPLAY) |
608 | 97 | interest(1) | 99 | interest(1) |
609 | 100 | prop(YES) | ||
610 | 98 | } | 101 | } |
611 | 99 | field(LOPR,DBF_DOUBLE) { | 102 | field(LOPR,DBF_DOUBLE) { |
612 | 100 | prompt("Low Operating Range") | 103 | prompt("Low Operating Range") |
613 | 101 | promptgroup(GUI_DISPLAY) | 104 | promptgroup(GUI_DISPLAY) |
614 | 102 | interest(1) | 105 | interest(1) |
615 | 106 | prop(YES) | ||
616 | 103 | } | 107 | } |
617 | 104 | field(HIHI,DBF_DOUBLE) { | 108 | field(HIHI,DBF_DOUBLE) { |
618 | 105 | prompt("Hihi Alarm Limit") | 109 | prompt("Hihi Alarm Limit") |
619 | 106 | promptgroup(GUI_ALARMS) | 110 | promptgroup(GUI_ALARMS) |
620 | 107 | pp(TRUE) | 111 | pp(TRUE) |
621 | 108 | interest(1) | 112 | interest(1) |
622 | 113 | prop(YES) | ||
623 | 109 | } | 114 | } |
624 | 110 | field(LOLO,DBF_DOUBLE) { | 115 | field(LOLO,DBF_DOUBLE) { |
625 | 111 | prompt("Lolo Alarm Limit") | 116 | prompt("Lolo Alarm Limit") |
626 | 112 | promptgroup(GUI_ALARMS) | 117 | promptgroup(GUI_ALARMS) |
627 | 113 | pp(TRUE) | 118 | pp(TRUE) |
628 | 114 | interest(1) | 119 | interest(1) |
629 | 120 | prop(YES) | ||
630 | 115 | } | 121 | } |
631 | 116 | field(HIGH,DBF_DOUBLE) { | 122 | field(HIGH,DBF_DOUBLE) { |
632 | 117 | prompt("High Alarm Limit") | 123 | prompt("High Alarm Limit") |
633 | 118 | promptgroup(GUI_ALARMS) | 124 | promptgroup(GUI_ALARMS) |
634 | 119 | pp(TRUE) | 125 | pp(TRUE) |
635 | 120 | interest(1) | 126 | interest(1) |
636 | 127 | prop(YES) | ||
637 | 121 | } | 128 | } |
638 | 122 | field(LOW,DBF_DOUBLE) { | 129 | field(LOW,DBF_DOUBLE) { |
639 | 123 | prompt("Low Alarm Limit") | 130 | prompt("Low Alarm Limit") |
640 | 124 | promptgroup(GUI_ALARMS) | 131 | promptgroup(GUI_ALARMS) |
641 | 125 | pp(TRUE) | 132 | pp(TRUE) |
642 | 126 | interest(1) | 133 | interest(1) |
643 | 134 | prop(YES) | ||
644 | 127 | } | 135 | } |
645 | 128 | field(HHSV,DBF_MENU) { | 136 | field(HHSV,DBF_MENU) { |
646 | 129 | prompt("Hihi Severity") | 137 | prompt("Hihi Severity") |
647 | 130 | promptgroup(GUI_ALARMS) | 138 | promptgroup(GUI_ALARMS) |
648 | 131 | pp(TRUE) | 139 | pp(TRUE) |
649 | 132 | interest(1) | 140 | interest(1) |
650 | 141 | prop(YES) | ||
651 | 133 | menu(menuAlarmSevr) | 142 | menu(menuAlarmSevr) |
652 | 134 | } | 143 | } |
653 | 135 | field(LLSV,DBF_MENU) { | 144 | field(LLSV,DBF_MENU) { |
654 | @@ -137,6 +146,7 @@ | |||
655 | 137 | promptgroup(GUI_ALARMS) | 146 | promptgroup(GUI_ALARMS) |
656 | 138 | pp(TRUE) | 147 | pp(TRUE) |
657 | 139 | interest(1) | 148 | interest(1) |
658 | 149 | prop(YES) | ||
659 | 140 | menu(menuAlarmSevr) | 150 | menu(menuAlarmSevr) |
660 | 141 | } | 151 | } |
661 | 142 | field(HSV,DBF_MENU) { | 152 | field(HSV,DBF_MENU) { |
662 | @@ -144,6 +154,7 @@ | |||
663 | 144 | promptgroup(GUI_ALARMS) | 154 | promptgroup(GUI_ALARMS) |
664 | 145 | pp(TRUE) | 155 | pp(TRUE) |
665 | 146 | interest(1) | 156 | interest(1) |
666 | 157 | prop(YES) | ||
667 | 147 | menu(menuAlarmSevr) | 158 | menu(menuAlarmSevr) |
668 | 148 | } | 159 | } |
669 | 149 | field(LSV,DBF_MENU) { | 160 | field(LSV,DBF_MENU) { |
670 | @@ -151,6 +162,7 @@ | |||
671 | 151 | promptgroup(GUI_ALARMS) | 162 | promptgroup(GUI_ALARMS) |
672 | 152 | pp(TRUE) | 163 | pp(TRUE) |
673 | 153 | interest(1) | 164 | interest(1) |
674 | 165 | prop(YES) | ||
675 | 154 | menu(menuAlarmSevr) | 166 | menu(menuAlarmSevr) |
676 | 155 | } | 167 | } |
677 | 156 | field(AFTC, DBF_DOUBLE) { | 168 | field(AFTC, DBF_DOUBLE) { |
678 | 157 | 169 | ||
679 | === modified file 'src/std/rec/calcoutRecord.dbd' | |||
680 | --- src/std/rec/calcoutRecord.dbd 2012-06-22 22:58:12 +0000 | |||
681 | +++ src/std/rec/calcoutRecord.dbd 2013-11-30 20:14:29 +0000 | |||
682 | @@ -285,51 +285,60 @@ | |||
683 | 285 | promptgroup(GUI_DISPLAY) | 285 | promptgroup(GUI_DISPLAY) |
684 | 286 | interest(1) | 286 | interest(1) |
685 | 287 | size(16) | 287 | size(16) |
686 | 288 | prop(YES) | ||
687 | 288 | } | 289 | } |
688 | 289 | field(PREC,DBF_SHORT) { | 290 | field(PREC,DBF_SHORT) { |
689 | 290 | prompt("Display Precision") | 291 | prompt("Display Precision") |
690 | 291 | promptgroup(GUI_DISPLAY) | 292 | promptgroup(GUI_DISPLAY) |
691 | 292 | interest(1) | 293 | interest(1) |
692 | 294 | prop(YES) | ||
693 | 293 | } | 295 | } |
694 | 294 | field(HOPR,DBF_DOUBLE) { | 296 | field(HOPR,DBF_DOUBLE) { |
695 | 295 | prompt("High Operating Rng") | 297 | prompt("High Operating Rng") |
696 | 296 | promptgroup(GUI_DISPLAY) | 298 | promptgroup(GUI_DISPLAY) |
697 | 297 | interest(1) | 299 | interest(1) |
698 | 300 | prop(YES) | ||
699 | 298 | } | 301 | } |
700 | 299 | field(LOPR,DBF_DOUBLE) { | 302 | field(LOPR,DBF_DOUBLE) { |
701 | 300 | prompt("Low Operating Range") | 303 | prompt("Low Operating Range") |
702 | 301 | promptgroup(GUI_DISPLAY) | 304 | promptgroup(GUI_DISPLAY) |
703 | 302 | interest(1) | 305 | interest(1) |
704 | 306 | prop(YES) | ||
705 | 303 | } | 307 | } |
706 | 304 | field(HIHI,DBF_DOUBLE) { | 308 | field(HIHI,DBF_DOUBLE) { |
707 | 305 | prompt("Hihi Alarm Limit") | 309 | prompt("Hihi Alarm Limit") |
708 | 306 | promptgroup(GUI_ALARMS) | 310 | promptgroup(GUI_ALARMS) |
709 | 307 | pp(TRUE) | 311 | pp(TRUE) |
710 | 308 | interest(1) | 312 | interest(1) |
711 | 313 | prop(YES) | ||
712 | 309 | } | 314 | } |
713 | 310 | field(LOLO,DBF_DOUBLE) { | 315 | field(LOLO,DBF_DOUBLE) { |
714 | 311 | prompt("Lolo Alarm Limit") | 316 | prompt("Lolo Alarm Limit") |
715 | 312 | promptgroup(GUI_ALARMS) | 317 | promptgroup(GUI_ALARMS) |
716 | 313 | pp(TRUE) | 318 | pp(TRUE) |
717 | 314 | interest(1) | 319 | interest(1) |
718 | 320 | prop(YES) | ||
719 | 315 | } | 321 | } |
720 | 316 | field(HIGH,DBF_DOUBLE) { | 322 | field(HIGH,DBF_DOUBLE) { |
721 | 317 | prompt("High Alarm Limit") | 323 | prompt("High Alarm Limit") |
722 | 318 | promptgroup(GUI_ALARMS) | 324 | promptgroup(GUI_ALARMS) |
723 | 319 | pp(TRUE) | 325 | pp(TRUE) |
724 | 320 | interest(1) | 326 | interest(1) |
725 | 327 | prop(YES) | ||
726 | 321 | } | 328 | } |
727 | 322 | field(LOW,DBF_DOUBLE) { | 329 | field(LOW,DBF_DOUBLE) { |
728 | 323 | prompt("Low Alarm Limit") | 330 | prompt("Low Alarm Limit") |
729 | 324 | promptgroup(GUI_ALARMS) | 331 | promptgroup(GUI_ALARMS) |
730 | 325 | pp(TRUE) | 332 | pp(TRUE) |
731 | 326 | interest(1) | 333 | interest(1) |
732 | 334 | prop(YES) | ||
733 | 327 | } | 335 | } |
734 | 328 | field(HHSV,DBF_MENU) { | 336 | field(HHSV,DBF_MENU) { |
735 | 329 | prompt("Hihi Severity") | 337 | prompt("Hihi Severity") |
736 | 330 | promptgroup(GUI_ALARMS) | 338 | promptgroup(GUI_ALARMS) |
737 | 331 | pp(TRUE) | 339 | pp(TRUE) |
738 | 332 | interest(1) | 340 | interest(1) |
739 | 341 | prop(YES) | ||
740 | 333 | menu(menuAlarmSevr) | 342 | menu(menuAlarmSevr) |
741 | 334 | } | 343 | } |
742 | 335 | field(LLSV,DBF_MENU) { | 344 | field(LLSV,DBF_MENU) { |
743 | @@ -337,6 +346,7 @@ | |||
744 | 337 | promptgroup(GUI_ALARMS) | 346 | promptgroup(GUI_ALARMS) |
745 | 338 | pp(TRUE) | 347 | pp(TRUE) |
746 | 339 | interest(1) | 348 | interest(1) |
747 | 349 | prop(YES) | ||
748 | 340 | menu(menuAlarmSevr) | 350 | menu(menuAlarmSevr) |
749 | 341 | } | 351 | } |
750 | 342 | field(HSV,DBF_MENU) { | 352 | field(HSV,DBF_MENU) { |
751 | @@ -344,6 +354,7 @@ | |||
752 | 344 | promptgroup(GUI_ALARMS) | 354 | promptgroup(GUI_ALARMS) |
753 | 345 | pp(TRUE) | 355 | pp(TRUE) |
754 | 346 | interest(1) | 356 | interest(1) |
755 | 357 | prop(YES) | ||
756 | 347 | menu(menuAlarmSevr) | 358 | menu(menuAlarmSevr) |
757 | 348 | } | 359 | } |
758 | 349 | field(LSV,DBF_MENU) { | 360 | field(LSV,DBF_MENU) { |
759 | @@ -351,6 +362,7 @@ | |||
760 | 351 | promptgroup(GUI_ALARMS) | 362 | promptgroup(GUI_ALARMS) |
761 | 352 | pp(TRUE) | 363 | pp(TRUE) |
762 | 353 | interest(1) | 364 | interest(1) |
763 | 365 | prop(YES) | ||
764 | 354 | menu(menuAlarmSevr) | 366 | menu(menuAlarmSevr) |
765 | 355 | } | 367 | } |
766 | 356 | field(HYST,DBF_DOUBLE) { | 368 | field(HYST,DBF_DOUBLE) { |
767 | 357 | 369 | ||
768 | === modified file 'src/std/rec/compressRecord.dbd' | |||
769 | --- src/std/rec/compressRecord.dbd 2011-06-08 16:16:26 +0000 | |||
770 | +++ src/std/rec/compressRecord.dbd 2013-11-30 20:14:29 +0000 | |||
771 | @@ -70,22 +70,26 @@ | |||
772 | 70 | prompt("High Operating Range") | 70 | prompt("High Operating Range") |
773 | 71 | promptgroup(GUI_DISPLAY) | 71 | promptgroup(GUI_DISPLAY) |
774 | 72 | interest(1) | 72 | interest(1) |
775 | 73 | prop(YES) | ||
776 | 73 | } | 74 | } |
777 | 74 | field(LOPR,DBF_DOUBLE) { | 75 | field(LOPR,DBF_DOUBLE) { |
778 | 75 | prompt("Low Operating Range") | 76 | prompt("Low Operating Range") |
779 | 76 | promptgroup(GUI_DISPLAY) | 77 | promptgroup(GUI_DISPLAY) |
780 | 77 | interest(1) | 78 | interest(1) |
781 | 79 | prop(YES) | ||
782 | 78 | } | 80 | } |
783 | 79 | field(PREC,DBF_SHORT) { | 81 | field(PREC,DBF_SHORT) { |
784 | 80 | prompt("Display Precision") | 82 | prompt("Display Precision") |
785 | 81 | promptgroup(GUI_DISPLAY) | 83 | promptgroup(GUI_DISPLAY) |
786 | 82 | interest(1) | 84 | interest(1) |
787 | 85 | prop(YES) | ||
788 | 83 | } | 86 | } |
789 | 84 | field(EGU,DBF_STRING) { | 87 | field(EGU,DBF_STRING) { |
790 | 85 | prompt("EngineeringUnits") | 88 | prompt("EngineeringUnits") |
791 | 86 | promptgroup(GUI_DISPLAY) | 89 | promptgroup(GUI_DISPLAY) |
792 | 87 | interest(1) | 90 | interest(1) |
793 | 88 | size(16) | 91 | size(16) |
794 | 92 | prop(YES) | ||
795 | 89 | } | 93 | } |
796 | 90 | field(OFF,DBF_ULONG) { | 94 | field(OFF,DBF_ULONG) { |
797 | 91 | prompt("Offset") | 95 | prompt("Offset") |
798 | 92 | 96 | ||
799 | === modified file 'src/std/rec/dfanoutRecord.dbd' | |||
800 | --- src/std/rec/dfanoutRecord.dbd 2002-07-12 21:35:43 +0000 | |||
801 | +++ src/std/rec/dfanoutRecord.dbd 2013-11-30 20:14:29 +0000 | |||
802 | @@ -91,51 +91,60 @@ | |||
803 | 91 | promptgroup(GUI_DISPLAY) | 91 | promptgroup(GUI_DISPLAY) |
804 | 92 | interest(1) | 92 | interest(1) |
805 | 93 | size(16) | 93 | size(16) |
806 | 94 | prop(YES) | ||
807 | 94 | } | 95 | } |
808 | 95 | field(PREC,DBF_SHORT) { | 96 | field(PREC,DBF_SHORT) { |
809 | 96 | prompt("Display Precision") | 97 | prompt("Display Precision") |
810 | 97 | promptgroup(GUI_DISPLAY) | 98 | promptgroup(GUI_DISPLAY) |
811 | 98 | interest(1) | 99 | interest(1) |
812 | 100 | prop(YES) | ||
813 | 99 | } | 101 | } |
814 | 100 | field(HOPR,DBF_DOUBLE) { | 102 | field(HOPR,DBF_DOUBLE) { |
815 | 101 | prompt("High Operating Range") | 103 | prompt("High Operating Range") |
816 | 102 | promptgroup(GUI_DISPLAY) | 104 | promptgroup(GUI_DISPLAY) |
817 | 103 | interest(1) | 105 | interest(1) |
818 | 106 | prop(YES) | ||
819 | 104 | } | 107 | } |
820 | 105 | field(LOPR,DBF_DOUBLE) { | 108 | field(LOPR,DBF_DOUBLE) { |
821 | 106 | prompt("Low Operating Range") | 109 | prompt("Low Operating Range") |
822 | 107 | promptgroup(GUI_DISPLAY) | 110 | promptgroup(GUI_DISPLAY) |
823 | 108 | interest(1) | 111 | interest(1) |
824 | 112 | prop(YES) | ||
825 | 109 | } | 113 | } |
826 | 110 | field(HIHI,DBF_DOUBLE) { | 114 | field(HIHI,DBF_DOUBLE) { |
827 | 111 | prompt("Hihi Alarm Limit") | 115 | prompt("Hihi Alarm Limit") |
828 | 112 | promptgroup(GUI_ALARMS) | 116 | promptgroup(GUI_ALARMS) |
829 | 113 | pp(TRUE) | 117 | pp(TRUE) |
830 | 114 | interest(1) | 118 | interest(1) |
831 | 119 | prop(YES) | ||
832 | 115 | } | 120 | } |
833 | 116 | field(LOLO,DBF_DOUBLE) { | 121 | field(LOLO,DBF_DOUBLE) { |
834 | 117 | prompt("Lolo Alarm Limit") | 122 | prompt("Lolo Alarm Limit") |
835 | 118 | promptgroup(GUI_ALARMS) | 123 | promptgroup(GUI_ALARMS) |
836 | 119 | pp(TRUE) | 124 | pp(TRUE) |
837 | 120 | interest(1) | 125 | interest(1) |
838 | 126 | prop(YES) | ||
839 | 121 | } | 127 | } |
840 | 122 | field(HIGH,DBF_DOUBLE) { | 128 | field(HIGH,DBF_DOUBLE) { |
841 | 123 | prompt("High Alarm Limit") | 129 | prompt("High Alarm Limit") |
842 | 124 | promptgroup(GUI_ALARMS) | 130 | promptgroup(GUI_ALARMS) |
843 | 125 | pp(TRUE) | 131 | pp(TRUE) |
844 | 126 | interest(1) | 132 | interest(1) |
845 | 133 | prop(YES) | ||
846 | 127 | } | 134 | } |
847 | 128 | field(LOW,DBF_DOUBLE) { | 135 | field(LOW,DBF_DOUBLE) { |
848 | 129 | prompt("Low Alarm Limit") | 136 | prompt("Low Alarm Limit") |
849 | 130 | promptgroup(GUI_ALARMS) | 137 | promptgroup(GUI_ALARMS) |
850 | 131 | pp(TRUE) | 138 | pp(TRUE) |
851 | 132 | interest(1) | 139 | interest(1) |
852 | 140 | prop(YES) | ||
853 | 133 | } | 141 | } |
854 | 134 | field(HHSV,DBF_MENU) { | 142 | field(HHSV,DBF_MENU) { |
855 | 135 | prompt("Hihi Severity") | 143 | prompt("Hihi Severity") |
856 | 136 | promptgroup(GUI_ALARMS) | 144 | promptgroup(GUI_ALARMS) |
857 | 137 | pp(TRUE) | 145 | pp(TRUE) |
858 | 138 | interest(1) | 146 | interest(1) |
859 | 147 | prop(YES) | ||
860 | 139 | menu(menuAlarmSevr) | 148 | menu(menuAlarmSevr) |
861 | 140 | } | 149 | } |
862 | 141 | field(LLSV,DBF_MENU) { | 150 | field(LLSV,DBF_MENU) { |
863 | @@ -143,6 +152,7 @@ | |||
864 | 143 | promptgroup(GUI_ALARMS) | 152 | promptgroup(GUI_ALARMS) |
865 | 144 | pp(TRUE) | 153 | pp(TRUE) |
866 | 145 | interest(1) | 154 | interest(1) |
867 | 155 | prop(YES) | ||
868 | 146 | menu(menuAlarmSevr) | 156 | menu(menuAlarmSevr) |
869 | 147 | } | 157 | } |
870 | 148 | field(HSV,DBF_MENU) { | 158 | field(HSV,DBF_MENU) { |
871 | @@ -150,6 +160,7 @@ | |||
872 | 150 | promptgroup(GUI_ALARMS) | 160 | promptgroup(GUI_ALARMS) |
873 | 151 | pp(TRUE) | 161 | pp(TRUE) |
874 | 152 | interest(1) | 162 | interest(1) |
875 | 163 | prop(YES) | ||
876 | 153 | menu(menuAlarmSevr) | 164 | menu(menuAlarmSevr) |
877 | 154 | } | 165 | } |
878 | 155 | field(LSV,DBF_MENU) { | 166 | field(LSV,DBF_MENU) { |
879 | @@ -157,6 +168,7 @@ | |||
880 | 157 | promptgroup(GUI_ALARMS) | 168 | promptgroup(GUI_ALARMS) |
881 | 158 | pp(TRUE) | 169 | pp(TRUE) |
882 | 159 | interest(1) | 170 | interest(1) |
883 | 171 | prop(YES) | ||
884 | 160 | menu(menuAlarmSevr) | 172 | menu(menuAlarmSevr) |
885 | 161 | } | 173 | } |
886 | 162 | field(HYST,DBF_DOUBLE) { | 174 | field(HYST,DBF_DOUBLE) { |
887 | 163 | 175 | ||
888 | === modified file 'src/std/rec/histogramRecord.dbd' | |||
889 | --- src/std/rec/histogramRecord.dbd 2012-01-21 22:35:40 +0000 | |||
890 | +++ src/std/rec/histogramRecord.dbd 2013-11-30 20:14:29 +0000 | |||
891 | @@ -46,12 +46,14 @@ | |||
892 | 46 | promptgroup(GUI_HIST) | 46 | promptgroup(GUI_HIST) |
893 | 47 | special(SPC_RESET) | 47 | special(SPC_RESET) |
894 | 48 | interest(1) | 48 | interest(1) |
895 | 49 | prop(YES) | ||
896 | 49 | } | 50 | } |
897 | 50 | field(LLIM,DBF_DOUBLE) { | 51 | field(LLIM,DBF_DOUBLE) { |
898 | 51 | prompt("Lower Signal Limit ") | 52 | prompt("Lower Signal Limit ") |
899 | 52 | promptgroup(GUI_HIST) | 53 | promptgroup(GUI_HIST) |
900 | 53 | special(SPC_RESET) | 54 | special(SPC_RESET) |
901 | 54 | interest(1) | 55 | interest(1) |
902 | 56 | prop(YES) | ||
903 | 55 | } | 57 | } |
904 | 56 | field(WDTH,DBF_DOUBLE) { | 58 | field(WDTH,DBF_DOUBLE) { |
905 | 57 | prompt("Element Width") | 59 | prompt("Element Width") |
906 | @@ -66,6 +68,7 @@ | |||
907 | 66 | prompt("Display Precision") | 68 | prompt("Display Precision") |
908 | 67 | promptgroup(GUI_DISPLAY) | 69 | promptgroup(GUI_DISPLAY) |
909 | 68 | interest(1) | 70 | interest(1) |
910 | 71 | prop(YES) | ||
911 | 69 | } | 72 | } |
912 | 70 | field(SVL,DBF_INLINK) { | 73 | field(SVL,DBF_INLINK) { |
913 | 71 | prompt("Signal Value Location") | 74 | prompt("Signal Value Location") |
914 | @@ -128,11 +131,13 @@ | |||
915 | 128 | prompt("High Operating Range") | 131 | prompt("High Operating Range") |
916 | 129 | promptgroup(GUI_DISPLAY) | 132 | promptgroup(GUI_DISPLAY) |
917 | 130 | interest(1) | 133 | interest(1) |
918 | 134 | prop(YES) | ||
919 | 131 | } | 135 | } |
920 | 132 | field(LOPR,DBF_ULONG) { | 136 | field(LOPR,DBF_ULONG) { |
921 | 133 | prompt("Low Operating Range") | 137 | prompt("Low Operating Range") |
922 | 134 | promptgroup(GUI_DISPLAY) | 138 | promptgroup(GUI_DISPLAY) |
923 | 135 | interest(1) | 139 | interest(1) |
924 | 140 | prop(YES) | ||
925 | 136 | } | 141 | } |
926 | 137 | } | 142 | } |
927 | 138 | 143 | ||
928 | 139 | 144 | ||
929 | === modified file 'src/std/rec/longinRecord.dbd' | |||
930 | --- src/std/rec/longinRecord.dbd 2010-05-28 09:16:45 +0000 | |||
931 | +++ src/std/rec/longinRecord.dbd 2013-11-30 20:14:29 +0000 | |||
932 | @@ -25,40 +25,47 @@ | |||
933 | 25 | promptgroup(GUI_DISPLAY) | 25 | promptgroup(GUI_DISPLAY) |
934 | 26 | interest(1) | 26 | interest(1) |
935 | 27 | size(16) | 27 | size(16) |
936 | 28 | prop(YES) | ||
937 | 28 | } | 29 | } |
938 | 29 | field(HOPR,DBF_LONG) { | 30 | field(HOPR,DBF_LONG) { |
939 | 30 | prompt("High Operating Range") | 31 | prompt("High Operating Range") |
940 | 31 | promptgroup(GUI_DISPLAY) | 32 | promptgroup(GUI_DISPLAY) |
941 | 32 | interest(1) | 33 | interest(1) |
942 | 34 | prop(YES) | ||
943 | 33 | } | 35 | } |
944 | 34 | field(LOPR,DBF_LONG) { | 36 | field(LOPR,DBF_LONG) { |
945 | 35 | prompt("Low Operating Range") | 37 | prompt("Low Operating Range") |
946 | 36 | promptgroup(GUI_DISPLAY) | 38 | promptgroup(GUI_DISPLAY) |
947 | 37 | interest(1) | 39 | interest(1) |
948 | 40 | prop(YES) | ||
949 | 38 | } | 41 | } |
950 | 39 | field(HIHI,DBF_LONG) { | 42 | field(HIHI,DBF_LONG) { |
951 | 40 | prompt("Hihi Alarm Limit") | 43 | prompt("Hihi Alarm Limit") |
952 | 41 | promptgroup(GUI_ALARMS) | 44 | promptgroup(GUI_ALARMS) |
953 | 42 | pp(TRUE) | 45 | pp(TRUE) |
954 | 43 | interest(1) | 46 | interest(1) |
955 | 47 | prop(YES) | ||
956 | 44 | } | 48 | } |
957 | 45 | field(LOLO,DBF_LONG) { | 49 | field(LOLO,DBF_LONG) { |
958 | 46 | prompt("Lolo Alarm Limit") | 50 | prompt("Lolo Alarm Limit") |
959 | 47 | promptgroup(GUI_ALARMS) | 51 | promptgroup(GUI_ALARMS) |
960 | 48 | pp(TRUE) | 52 | pp(TRUE) |
961 | 49 | interest(1) | 53 | interest(1) |
962 | 54 | prop(YES) | ||
963 | 50 | } | 55 | } |
964 | 51 | field(HIGH,DBF_LONG) { | 56 | field(HIGH,DBF_LONG) { |
965 | 52 | prompt("High Alarm Limit") | 57 | prompt("High Alarm Limit") |
966 | 53 | promptgroup(GUI_ALARMS) | 58 | promptgroup(GUI_ALARMS) |
967 | 54 | pp(TRUE) | 59 | pp(TRUE) |
968 | 55 | interest(1) | 60 | interest(1) |
969 | 61 | prop(YES) | ||
970 | 56 | } | 62 | } |
971 | 57 | field(LOW,DBF_LONG) { | 63 | field(LOW,DBF_LONG) { |
972 | 58 | prompt("Low Alarm Limit") | 64 | prompt("Low Alarm Limit") |
973 | 59 | promptgroup(GUI_ALARMS) | 65 | promptgroup(GUI_ALARMS) |
974 | 60 | pp(TRUE) | 66 | pp(TRUE) |
975 | 61 | interest(1) | 67 | interest(1) |
976 | 68 | prop(YES) | ||
977 | 62 | } | 69 | } |
978 | 63 | field(HHSV,DBF_MENU) { | 70 | field(HHSV,DBF_MENU) { |
979 | 64 | prompt("Hihi Severity") | 71 | prompt("Hihi Severity") |
980 | 65 | 72 | ||
981 | === modified file 'src/std/rec/longoutRecord.dbd' | |||
982 | --- src/std/rec/longoutRecord.dbd 2002-07-12 21:35:43 +0000 | |||
983 | +++ src/std/rec/longoutRecord.dbd 2013-11-30 20:14:29 +0000 | |||
984 | @@ -36,52 +36,61 @@ | |||
985 | 36 | promptgroup(GUI_DISPLAY) | 36 | promptgroup(GUI_DISPLAY) |
986 | 37 | interest(1) | 37 | interest(1) |
987 | 38 | size(16) | 38 | size(16) |
988 | 39 | prop(YES) | ||
989 | 39 | } | 40 | } |
990 | 40 | field(DRVH,DBF_LONG) { | 41 | field(DRVH,DBF_LONG) { |
991 | 41 | prompt("Drive High Limit") | 42 | prompt("Drive High Limit") |
992 | 42 | promptgroup(GUI_OUTPUT) | 43 | promptgroup(GUI_OUTPUT) |
993 | 43 | pp(TRUE) | 44 | pp(TRUE) |
994 | 44 | interest(1) | 45 | interest(1) |
995 | 46 | prop(YES) | ||
996 | 45 | } | 47 | } |
997 | 46 | field(DRVL,DBF_LONG) { | 48 | field(DRVL,DBF_LONG) { |
998 | 47 | prompt("Drive Low Limit") | 49 | prompt("Drive Low Limit") |
999 | 48 | promptgroup(GUI_OUTPUT) | 50 | promptgroup(GUI_OUTPUT) |
1000 | 49 | pp(TRUE) | 51 | pp(TRUE) |
1001 | 50 | interest(1) | 52 | interest(1) |
1002 | 53 | prop(YES) | ||
1003 | 51 | } | 54 | } |
1004 | 52 | field(HOPR,DBF_LONG) { | 55 | field(HOPR,DBF_LONG) { |
1005 | 53 | prompt("High Operating Range") | 56 | prompt("High Operating Range") |
1006 | 54 | promptgroup(GUI_DISPLAY) | 57 | promptgroup(GUI_DISPLAY) |
1007 | 55 | interest(1) | 58 | interest(1) |
1008 | 59 | prop(YES) | ||
1009 | 56 | } | 60 | } |
1010 | 57 | field(LOPR,DBF_LONG) { | 61 | field(LOPR,DBF_LONG) { |
1011 | 58 | prompt("Low Operating Range") | 62 | prompt("Low Operating Range") |
1012 | 59 | promptgroup(GUI_DISPLAY) | 63 | promptgroup(GUI_DISPLAY) |
1013 | 60 | interest(1) | 64 | interest(1) |
1014 | 65 | prop(YES) | ||
1015 | 61 | } | 66 | } |
1016 | 62 | field(HIHI,DBF_LONG) { | 67 | field(HIHI,DBF_LONG) { |
1017 | 63 | prompt("Hihi Alarm Limit") | 68 | prompt("Hihi Alarm Limit") |
1018 | 64 | promptgroup(GUI_ALARMS) | 69 | promptgroup(GUI_ALARMS) |
1019 | 65 | pp(TRUE) | 70 | pp(TRUE) |
1020 | 66 | interest(1) | 71 | interest(1) |
1021 | 72 | prop(YES) | ||
1022 | 67 | } | 73 | } |
1023 | 68 | field(LOLO,DBF_LONG) { | 74 | field(LOLO,DBF_LONG) { |
1024 | 69 | prompt("Lolo Alarm Limit") | 75 | prompt("Lolo Alarm Limit") |
1025 | 70 | promptgroup(GUI_ALARMS) | 76 | promptgroup(GUI_ALARMS) |
1026 | 71 | pp(TRUE) | 77 | pp(TRUE) |
1027 | 72 | interest(1) | 78 | interest(1) |
1028 | 79 | prop(YES) | ||
1029 | 73 | } | 80 | } |
1030 | 74 | field(HIGH,DBF_LONG) { | 81 | field(HIGH,DBF_LONG) { |
1031 | 75 | prompt("High Alarm Limit") | 82 | prompt("High Alarm Limit") |
1032 | 76 | promptgroup(GUI_ALARMS) | 83 | promptgroup(GUI_ALARMS) |
1033 | 77 | pp(TRUE) | 84 | pp(TRUE) |
1034 | 78 | interest(1) | 85 | interest(1) |
1035 | 86 | prop(YES) | ||
1036 | 79 | } | 87 | } |
1037 | 80 | field(LOW,DBF_LONG) { | 88 | field(LOW,DBF_LONG) { |
1038 | 81 | prompt("Low Alarm Limit") | 89 | prompt("Low Alarm Limit") |
1039 | 82 | promptgroup(GUI_ALARMS) | 90 | promptgroup(GUI_ALARMS) |
1040 | 83 | pp(TRUE) | 91 | pp(TRUE) |
1041 | 84 | interest(1) | 92 | interest(1) |
1042 | 93 | prop(YES) | ||
1043 | 85 | } | 94 | } |
1044 | 86 | field(HHSV,DBF_MENU) { | 95 | field(HHSV,DBF_MENU) { |
1045 | 87 | prompt("Hihi Severity") | 96 | prompt("Hihi Severity") |
1046 | 88 | 97 | ||
1047 | === modified file 'src/std/rec/selRecord.dbd' | |||
1048 | --- src/std/rec/selRecord.dbd 2005-08-29 19:49:39 +0000 | |||
1049 | +++ src/std/rec/selRecord.dbd 2013-11-30 20:14:29 +0000 | |||
1050 | @@ -103,46 +103,54 @@ | |||
1051 | 103 | promptgroup(GUI_DISPLAY) | 103 | promptgroup(GUI_DISPLAY) |
1052 | 104 | interest(1) | 104 | interest(1) |
1053 | 105 | size(16) | 105 | size(16) |
1054 | 106 | prop(YES) | ||
1055 | 106 | } | 107 | } |
1056 | 107 | field(HOPR,DBF_DOUBLE) { | 108 | field(HOPR,DBF_DOUBLE) { |
1057 | 108 | prompt("High Operating Rng") | 109 | prompt("High Operating Rng") |
1058 | 109 | promptgroup(GUI_DISPLAY) | 110 | promptgroup(GUI_DISPLAY) |
1059 | 110 | interest(1) | 111 | interest(1) |
1060 | 112 | prop(YES) | ||
1061 | 111 | } | 113 | } |
1062 | 112 | field(LOPR,DBF_DOUBLE) { | 114 | field(LOPR,DBF_DOUBLE) { |
1063 | 113 | prompt("Low Operating Range") | 115 | prompt("Low Operating Range") |
1064 | 114 | promptgroup(GUI_DISPLAY) | 116 | promptgroup(GUI_DISPLAY) |
1065 | 115 | interest(1) | 117 | interest(1) |
1066 | 118 | prop(YES) | ||
1067 | 116 | } | 119 | } |
1068 | 117 | field(HIHI,DBF_DOUBLE) { | 120 | field(HIHI,DBF_DOUBLE) { |
1069 | 118 | prompt("Hihi Alarm Limit") | 121 | prompt("Hihi Alarm Limit") |
1070 | 119 | promptgroup(GUI_ALARMS) | 122 | promptgroup(GUI_ALARMS) |
1071 | 120 | pp(TRUE) | 123 | pp(TRUE) |
1072 | 121 | interest(1) | 124 | interest(1) |
1073 | 125 | prop(YES) | ||
1074 | 122 | } | 126 | } |
1075 | 123 | field(LOLO,DBF_DOUBLE) { | 127 | field(LOLO,DBF_DOUBLE) { |
1076 | 124 | prompt("Lolo Alarm Limit") | 128 | prompt("Lolo Alarm Limit") |
1077 | 125 | promptgroup(GUI_ALARMS) | 129 | promptgroup(GUI_ALARMS) |
1078 | 126 | pp(TRUE) | 130 | pp(TRUE) |
1079 | 127 | interest(1) | 131 | interest(1) |
1080 | 132 | prop(YES) | ||
1081 | 128 | } | 133 | } |
1082 | 129 | field(HIGH,DBF_DOUBLE) { | 134 | field(HIGH,DBF_DOUBLE) { |
1083 | 130 | prompt("High Alarm Limit") | 135 | prompt("High Alarm Limit") |
1084 | 131 | promptgroup(GUI_ALARMS) | 136 | promptgroup(GUI_ALARMS) |
1085 | 132 | pp(TRUE) | 137 | pp(TRUE) |
1086 | 133 | interest(1) | 138 | interest(1) |
1087 | 139 | prop(YES) | ||
1088 | 134 | } | 140 | } |
1089 | 135 | field(LOW,DBF_DOUBLE) { | 141 | field(LOW,DBF_DOUBLE) { |
1090 | 136 | prompt("Low Alarm Limit") | 142 | prompt("Low Alarm Limit") |
1091 | 137 | promptgroup(GUI_ALARMS) | 143 | promptgroup(GUI_ALARMS) |
1092 | 138 | pp(TRUE) | 144 | pp(TRUE) |
1093 | 139 | interest(1) | 145 | interest(1) |
1094 | 146 | prop(YES) | ||
1095 | 140 | } | 147 | } |
1096 | 141 | field(HHSV,DBF_MENU) { | 148 | field(HHSV,DBF_MENU) { |
1097 | 142 | prompt("Hihi Severity") | 149 | prompt("Hihi Severity") |
1098 | 143 | promptgroup(GUI_ALARMS) | 150 | promptgroup(GUI_ALARMS) |
1099 | 144 | pp(TRUE) | 151 | pp(TRUE) |
1100 | 145 | interest(1) | 152 | interest(1) |
1101 | 153 | prop(YES) | ||
1102 | 146 | menu(menuAlarmSevr) | 154 | menu(menuAlarmSevr) |
1103 | 147 | } | 155 | } |
1104 | 148 | field(LLSV,DBF_MENU) { | 156 | field(LLSV,DBF_MENU) { |
1105 | @@ -150,6 +158,7 @@ | |||
1106 | 150 | promptgroup(GUI_ALARMS) | 158 | promptgroup(GUI_ALARMS) |
1107 | 151 | pp(TRUE) | 159 | pp(TRUE) |
1108 | 152 | interest(1) | 160 | interest(1) |
1109 | 161 | prop(YES) | ||
1110 | 153 | menu(menuAlarmSevr) | 162 | menu(menuAlarmSevr) |
1111 | 154 | } | 163 | } |
1112 | 155 | field(HSV,DBF_MENU) { | 164 | field(HSV,DBF_MENU) { |
1113 | @@ -157,6 +166,7 @@ | |||
1114 | 157 | promptgroup(GUI_ALARMS) | 166 | promptgroup(GUI_ALARMS) |
1115 | 158 | pp(TRUE) | 167 | pp(TRUE) |
1116 | 159 | interest(1) | 168 | interest(1) |
1117 | 169 | prop(YES) | ||
1118 | 160 | menu(menuAlarmSevr) | 170 | menu(menuAlarmSevr) |
1119 | 161 | } | 171 | } |
1120 | 162 | field(LSV,DBF_MENU) { | 172 | field(LSV,DBF_MENU) { |
1121 | @@ -164,6 +174,7 @@ | |||
1122 | 164 | promptgroup(GUI_ALARMS) | 174 | promptgroup(GUI_ALARMS) |
1123 | 165 | pp(TRUE) | 175 | pp(TRUE) |
1124 | 166 | interest(1) | 176 | interest(1) |
1125 | 177 | prop(YES) | ||
1126 | 167 | menu(menuAlarmSevr) | 178 | menu(menuAlarmSevr) |
1127 | 168 | } | 179 | } |
1128 | 169 | field(HYST,DBF_DOUBLE) { | 180 | field(HYST,DBF_DOUBLE) { |
1129 | 170 | 181 | ||
1130 | === modified file 'src/std/rec/subArrayRecord.dbd' | |||
1131 | --- src/std/rec/subArrayRecord.dbd 2002-07-12 21:35:43 +0000 | |||
1132 | +++ src/std/rec/subArrayRecord.dbd 2013-11-30 20:14:29 +0000 | |||
1133 | @@ -20,6 +20,7 @@ | |||
1134 | 20 | prompt("Display Precision") | 20 | prompt("Display Precision") |
1135 | 21 | promptgroup(GUI_COMMON) | 21 | promptgroup(GUI_COMMON) |
1136 | 22 | interest(1) | 22 | interest(1) |
1137 | 23 | prop(YES) | ||
1138 | 23 | } | 24 | } |
1139 | 24 | field(FTVL,DBF_MENU) { | 25 | field(FTVL,DBF_MENU) { |
1140 | 25 | prompt("Field Type of Value") | 26 | prompt("Field Type of Value") |
1141 | @@ -38,16 +39,19 @@ | |||
1142 | 38 | promptgroup(GUI_BITS2) | 39 | promptgroup(GUI_BITS2) |
1143 | 39 | interest(1) | 40 | interest(1) |
1144 | 40 | size(16) | 41 | size(16) |
1145 | 42 | prop(YES) | ||
1146 | 41 | } | 43 | } |
1147 | 42 | field(HOPR,DBF_DOUBLE) { | 44 | field(HOPR,DBF_DOUBLE) { |
1148 | 43 | prompt("High Operating Range") | 45 | prompt("High Operating Range") |
1149 | 44 | promptgroup(GUI_CALC) | 46 | promptgroup(GUI_CALC) |
1150 | 45 | interest(1) | 47 | interest(1) |
1151 | 48 | prop(YES) | ||
1152 | 46 | } | 49 | } |
1153 | 47 | field(LOPR,DBF_DOUBLE) { | 50 | field(LOPR,DBF_DOUBLE) { |
1154 | 48 | prompt("Low Operating Range") | 51 | prompt("Low Operating Range") |
1155 | 49 | promptgroup(GUI_CLOCK) | 52 | promptgroup(GUI_CLOCK) |
1156 | 50 | interest(1) | 53 | interest(1) |
1157 | 54 | prop(YES) | ||
1158 | 51 | } | 55 | } |
1159 | 52 | field(MALM,DBF_ULONG) { | 56 | field(MALM,DBF_ULONG) { |
1160 | 53 | prompt("Maximum Elements ") | 57 | prompt("Maximum Elements ") |
1161 | 54 | 58 | ||
1162 | === modified file 'src/std/rec/subRecord.dbd' | |||
1163 | --- src/std/rec/subRecord.dbd 2008-04-24 16:30:37 +0000 | |||
1164 | +++ src/std/rec/subRecord.dbd 2013-11-30 20:14:29 +0000 | |||
1165 | @@ -100,45 +100,53 @@ | |||
1166 | 100 | promptgroup(GUI_DISPLAY) | 100 | promptgroup(GUI_DISPLAY) |
1167 | 101 | interest(1) | 101 | interest(1) |
1168 | 102 | size(16) | 102 | size(16) |
1169 | 103 | prop(YES) | ||
1170 | 103 | } | 104 | } |
1171 | 104 | field(HOPR,DBF_DOUBLE) { | 105 | field(HOPR,DBF_DOUBLE) { |
1172 | 105 | prompt("High Operating Rng") | 106 | prompt("High Operating Rng") |
1173 | 106 | promptgroup(GUI_DISPLAY) | 107 | promptgroup(GUI_DISPLAY) |
1174 | 107 | interest(1) | 108 | interest(1) |
1175 | 109 | prop(YES) | ||
1176 | 108 | } | 110 | } |
1177 | 109 | field(LOPR,DBF_DOUBLE) { | 111 | field(LOPR,DBF_DOUBLE) { |
1178 | 110 | prompt("Low Operating Range") | 112 | prompt("Low Operating Range") |
1179 | 111 | promptgroup(GUI_DISPLAY) | 113 | promptgroup(GUI_DISPLAY) |
1180 | 112 | interest(1) | 114 | interest(1) |
1181 | 115 | prop(YES) | ||
1182 | 113 | } | 116 | } |
1183 | 114 | field(HIHI,DBF_DOUBLE) { | 117 | field(HIHI,DBF_DOUBLE) { |
1184 | 115 | prompt("Hihi Alarm Limit") | 118 | prompt("Hihi Alarm Limit") |
1185 | 116 | promptgroup(GUI_ALARMS) | 119 | promptgroup(GUI_ALARMS) |
1186 | 117 | pp(TRUE) | 120 | pp(TRUE) |
1187 | 118 | interest(1) | 121 | interest(1) |
1188 | 122 | prop(YES) | ||
1189 | 119 | } | 123 | } |
1190 | 120 | field(LOLO,DBF_DOUBLE) { | 124 | field(LOLO,DBF_DOUBLE) { |
1191 | 121 | prompt("Lolo Alarm Limit") | 125 | prompt("Lolo Alarm Limit") |
1192 | 122 | promptgroup(GUI_ALARMS) | 126 | promptgroup(GUI_ALARMS) |
1193 | 123 | pp(TRUE) | 127 | pp(TRUE) |
1194 | 124 | interest(1) | 128 | interest(1) |
1195 | 129 | prop(YES) | ||
1196 | 125 | } | 130 | } |
1197 | 126 | field(HIGH,DBF_DOUBLE) { | 131 | field(HIGH,DBF_DOUBLE) { |
1198 | 127 | prompt("High Alarm Limit") | 132 | prompt("High Alarm Limit") |
1199 | 128 | promptgroup(GUI_ALARMS) | 133 | promptgroup(GUI_ALARMS) |
1200 | 129 | pp(TRUE) | 134 | pp(TRUE) |
1201 | 130 | interest(1) | 135 | interest(1) |
1202 | 136 | prop(YES) | ||
1203 | 131 | } | 137 | } |
1204 | 132 | field(LOW,DBF_DOUBLE) { | 138 | field(LOW,DBF_DOUBLE) { |
1205 | 133 | prompt("Low Alarm Limit") | 139 | prompt("Low Alarm Limit") |
1206 | 134 | promptgroup(GUI_ALARMS) | 140 | promptgroup(GUI_ALARMS) |
1207 | 135 | pp(TRUE) | 141 | pp(TRUE) |
1208 | 136 | interest(1) | 142 | interest(1) |
1209 | 143 | prop(YES) | ||
1210 | 137 | } | 144 | } |
1211 | 138 | field(PREC,DBF_SHORT) { | 145 | field(PREC,DBF_SHORT) { |
1212 | 139 | prompt("Display Precision") | 146 | prompt("Display Precision") |
1213 | 140 | promptgroup(GUI_DISPLAY) | 147 | promptgroup(GUI_DISPLAY) |
1214 | 141 | interest(1) | 148 | interest(1) |
1215 | 149 | prop(YES) | ||
1216 | 142 | } | 150 | } |
1217 | 143 | field(BRSV,DBF_MENU) { | 151 | field(BRSV,DBF_MENU) { |
1218 | 144 | prompt("Bad Return Severity") | 152 | prompt("Bad Return Severity") |
1219 | @@ -152,6 +160,7 @@ | |||
1220 | 152 | promptgroup(GUI_ALARMS) | 160 | promptgroup(GUI_ALARMS) |
1221 | 153 | pp(TRUE) | 161 | pp(TRUE) |
1222 | 154 | interest(1) | 162 | interest(1) |
1223 | 163 | prop(YES) | ||
1224 | 155 | menu(menuAlarmSevr) | 164 | menu(menuAlarmSevr) |
1225 | 156 | } | 165 | } |
1226 | 157 | field(LLSV,DBF_MENU) { | 166 | field(LLSV,DBF_MENU) { |
1227 | @@ -159,6 +168,7 @@ | |||
1228 | 159 | promptgroup(GUI_ALARMS) | 168 | promptgroup(GUI_ALARMS) |
1229 | 160 | pp(TRUE) | 169 | pp(TRUE) |
1230 | 161 | interest(1) | 170 | interest(1) |
1231 | 171 | prop(YES) | ||
1232 | 162 | menu(menuAlarmSevr) | 172 | menu(menuAlarmSevr) |
1233 | 163 | } | 173 | } |
1234 | 164 | field(HSV,DBF_MENU) { | 174 | field(HSV,DBF_MENU) { |
1235 | @@ -166,6 +176,7 @@ | |||
1236 | 166 | promptgroup(GUI_ALARMS) | 176 | promptgroup(GUI_ALARMS) |
1237 | 167 | pp(TRUE) | 177 | pp(TRUE) |
1238 | 168 | interest(1) | 178 | interest(1) |
1239 | 179 | prop(YES) | ||
1240 | 169 | menu(menuAlarmSevr) | 180 | menu(menuAlarmSevr) |
1241 | 170 | } | 181 | } |
1242 | 171 | field(LSV,DBF_MENU) { | 182 | field(LSV,DBF_MENU) { |
1243 | @@ -173,6 +184,7 @@ | |||
1244 | 173 | promptgroup(GUI_ALARMS) | 184 | promptgroup(GUI_ALARMS) |
1245 | 174 | pp(TRUE) | 185 | pp(TRUE) |
1246 | 175 | interest(1) | 186 | interest(1) |
1247 | 187 | prop(YES) | ||
1248 | 176 | menu(menuAlarmSevr) | 188 | menu(menuAlarmSevr) |
1249 | 177 | } | 189 | } |
1250 | 178 | field(HYST,DBF_DOUBLE) { | 190 | field(HYST,DBF_DOUBLE) { |
1251 | 179 | 191 | ||
1252 | === modified file 'src/std/rec/waveformRecord.dbd' | |||
1253 | --- src/std/rec/waveformRecord.dbd 2009-04-03 21:05:40 +0000 | |||
1254 | +++ src/std/rec/waveformRecord.dbd 2013-11-30 20:14:29 +0000 | |||
1255 | @@ -29,6 +29,7 @@ | |||
1256 | 29 | prompt("Display Precision") | 29 | prompt("Display Precision") |
1257 | 30 | promptgroup(GUI_DISPLAY) | 30 | promptgroup(GUI_DISPLAY) |
1258 | 31 | interest(1) | 31 | interest(1) |
1259 | 32 | prop(YES) | ||
1260 | 32 | } | 33 | } |
1261 | 33 | field(INP,DBF_INLINK) { | 34 | field(INP,DBF_INLINK) { |
1262 | 34 | prompt("Input Specification") | 35 | prompt("Input Specification") |
1263 | @@ -40,16 +41,19 @@ | |||
1264 | 40 | promptgroup(GUI_DISPLAY) | 41 | promptgroup(GUI_DISPLAY) |
1265 | 41 | interest(1) | 42 | interest(1) |
1266 | 42 | size(16) | 43 | size(16) |
1267 | 44 | prop(YES) | ||
1268 | 43 | } | 45 | } |
1269 | 44 | field(HOPR,DBF_DOUBLE) { | 46 | field(HOPR,DBF_DOUBLE) { |
1270 | 45 | prompt("High Operating Range") | 47 | prompt("High Operating Range") |
1271 | 46 | promptgroup(GUI_DISPLAY) | 48 | promptgroup(GUI_DISPLAY) |
1272 | 47 | interest(1) | 49 | interest(1) |
1273 | 50 | prop(YES) | ||
1274 | 48 | } | 51 | } |
1275 | 49 | field(LOPR,DBF_DOUBLE) { | 52 | field(LOPR,DBF_DOUBLE) { |
1276 | 50 | prompt("Low Operating Range") | 53 | prompt("Low Operating Range") |
1277 | 51 | promptgroup(GUI_DISPLAY) | 54 | promptgroup(GUI_DISPLAY) |
1278 | 52 | interest(1) | 55 | interest(1) |
1279 | 56 | prop(YES) | ||
1280 | 53 | } | 57 | } |
1281 | 54 | field(NELM,DBF_ULONG) { | 58 | field(NELM,DBF_ULONG) { |
1282 | 55 | prompt("Number of Elements") | 59 | prompt("Number of Elements") |
1283 | 56 | 60 | ||
1284 | === modified file 'src/tools/DBD/Recfield.pm' | |||
1285 | --- src/tools/DBD/Recfield.pm 2012-08-22 21:54:54 +0000 | |||
1286 | +++ src/tools/DBD/Recfield.pm 2013-11-30 20:14:29 +0000 | |||
1287 | @@ -35,7 +35,8 @@ | |||
1288 | 35 | base => qr/^(?:DECIMAL|HEX)$/, | 35 | base => qr/^(?:DECIMAL|HEX)$/, |
1289 | 36 | size => qr/^\d+$/, | 36 | size => qr/^\d+$/, |
1290 | 37 | extra => qr/^.*$/, | 37 | extra => qr/^.*$/, |
1292 | 38 | menu => qr/^$RXident$/o | 38 | menu => qr/^$RXident$/o, |
1293 | 39 | prop => qr/^(?:YES|NO)$/ | ||
1294 | 39 | ); | 40 | ); |
1295 | 40 | 41 | ||
1296 | 41 | sub new { | 42 | sub new { |
Like, merging...