Skip to content

Commit

Permalink
refactor: Omsl-FOut.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jerzyjamroz
jerzyjamroz committed Oct 3, 2024
1 parent 1cd97d9 commit 56a314d
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 38 deletions.
35 changes: 16 additions & 19 deletions evgMrmApp/Db/evgDbus.db
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,24 +665,30 @@ record(bo, "$(P)Src$(s=:)RearInp15-Sel") {
# multiple sources then the OMSL field for the *Src* records should be
# "supervisory" mode.
#
record(dfanout, "$(P)Omsl-FOut") {

record(bo, "$(P)Omsl-Sel") {
field(DESC, "Multiple sources")
field(PINI, "YES")
field(VAL, "1")
field(UDF, "0")
field(OMSL, "supervisory")
field(ZNAM, "supervisory")
field(ONAM, "closed_loop")
field(OUT, "$(P)Omsl-FOut_ PP")
info(autosaveFields_pass0, "VAL")
}

record(dfanout, "$(P)Omsl-FOut_") {
field(ASG, "private")
field(OMSL, "closed_loop")
field(OUTA, "$(P)Omsl0-FOut_ PP")
field(OUTB, "$(P)Omsl1-FOut_ PP")
field(OUTC, "$(P)Omsl2-FOut_ PP")
field(OUTD, "$(P)Omsl3-FOut_ PP")
info(autosaveFields_pass0, "VAL")
}

record(dfanout, "$(P)Omsl0-FOut_") {
field(ASG, "private")
#field(PINI, "YES")
field(VAL, "1")
field(UDF, "0")
field(OMSL, "supervisory")
field(OMSL, "closed_loop")
field(OUTA, "$(P)Src$(s=:)FrontInp0-Sel.OMSL")
field(OUTB, "$(P)Src$(s=:)FrontInp1-Sel.OMSL")
field(OUTC, "$(P)Src$(s=:)UnivInp0-Sel.OMSL")
Expand All @@ -695,10 +701,7 @@ record(dfanout, "$(P)Omsl0-FOut_") {

record(dfanout, "$(P)Omsl1-FOut_") {
field(ASG, "private")
#field(PINI, "YES")
field(VAL, "1")
field(UDF, "0")
field(OMSL, "supervisory")
field(OMSL, "closed_loop")
field(OUTA, "$(P)Src$(s=:)UnivInp6-Sel.OMSL")
field(OUTB, "$(P)Src$(s=:)UnivInp7-Sel.OMSL")
field(OUTC, "$(P)Src$(s=:)UnivInp8-Sel.OMSL")
Expand All @@ -709,10 +712,7 @@ record(dfanout, "$(P)Omsl1-FOut_") {

record(dfanout, "$(P)Omsl2-FOut_") {
field(ASG, "private")
#field(PINI, "YES")
field(VAL, "1")
field(UDF, "0")
field(OMSL, "supervisory")
field(OMSL, "closed_loop")
field(OUTA, "$(P)Src$(s=:)RearInp0-Sel.OMSL")
field(OUTB, "$(P)Src$(s=:)RearInp1-Sel.OMSL")
field(OUTC, "$(P)Src$(s=:)RearInp2-Sel.OMSL")
Expand All @@ -725,10 +725,7 @@ record(dfanout, "$(P)Omsl2-FOut_") {

record(dfanout, "$(P)Omsl3-FOut_") {
field(ASG, "private")
#field(PINI, "YES")
field(VAL, "1")
field(UDF, "0")
field(OMSL, "supervisory")
field(OMSL, "closed_loop")
field(OUTA, "$(P)Src$(s=:)RearInp8-Sel.OMSL")
field(OUTB, "$(P)Src$(s=:)RearInp9-Sel.OMSL")
field(OUTC, "$(P)Src$(s=:)RearInp10-Sel.OMSL")
Expand Down
48 changes: 29 additions & 19 deletions evgMrmApp/Db/evgTrigEvt.db
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ record(mbbo, "$(P)TrigSrc-Sel") {
field(FFVL, "16384")
field(UNSV, "INVALID")
field(IVOA, "Don't drive outputs")
field(FLNK, "$(P)TrigSrc-MbbiDir_")
#field(FLNK, "$(P)TrigSrc-MbbiDir_")
field(FLNK, "$(P)TrigSrc-SQ_")
info(autosaveFields_pass0, "VAL")
}
Expand Down Expand Up @@ -617,11 +617,32 @@ record(bo, "$(P)TrigSrc$(s=:)RearInp15-Sel") {
# "supervisory" mode. In order to select multiple sources use directly *TrigSrc*
# records bypassing the TrigSrc-Sel record.
#
record(dfanout, "$(P)Omsl-FOut") {

record(bo, "$(P)Omsl-Sel") {
field(DESC, "Multiple sources")
field(PINI, "YES")
field(VAL, "1")
field(UDF, "0")
field(OMSL, "supervisory")
field(ZNAM, "supervisory")
field(ONAM, "closed_loop")
field(OUT, "$(P)Omsl-FOut_ PP")
info(autosaveFields_pass0, "VAL")
}

record(dfanout, "$(P)Omsl-FOut_") {
field(ASG, "private")
field(OMSL, "closed_loop")
field(OUTA, "$(P)Omsl0-FOut_ PP")
field(OUTB, "$(P)Omsl1-FOut_ PP")
field(OUTC, "$(P)Omsl2-FOut_ PP")
field(OUTD, "$(P)Omsl3-FOut_ PP")
field(OUTE, "$(P)Omsl4-FOut_ PP")
field(OUTF, "$(P)Omsl5-FOut_ PP")
}

record(dfanout, "$(P)Omsl0-FOut_") {
field(ASG, "private")
field(OMSL, "closed_loop")
field(OUTA, "$(P)TrigSrc$(s=:)Mxc0-Sel.OMSL")
field(OUTB, "$(P)TrigSrc$(s=:)Mxc1-Sel.OMSL")
field(OUTC, "$(P)TrigSrc$(s=:)Mxc2-Sel.OMSL")
Expand All @@ -630,14 +651,11 @@ record(dfanout, "$(P)Omsl-FOut") {
field(OUTF, "$(P)TrigSrc$(s=:)Mxc5-Sel.OMSL")
field(OUTG, "$(P)TrigSrc$(s=:)Mxc6-Sel.OMSL")
field(OUTH, "$(P)TrigSrc$(s=:)Mxc7-Sel.OMSL")
field(FLNK, "$(P)Omsl$(s=:)Cont-FOut_")
info(autosaveFields_pass0, "VAL")
}

record(dfanout, "$(P)Omsl$(s=:)Cont-FOut_") {
record(dfanout, "$(P)Omsl1-FOut_") {
field(ASG, "private")
field(OMSL, "closed_loop")
field(DOL, "$(P)Omsl-FOut")
field(OUTA, "$(P)TrigSrc$(s=:)AC-Sel.OMSL")
field(OUTB, "$(P)TrigSrc$(s=:)FrontInp0-Sel.OMSL")
field(OUTC, "$(P)TrigSrc$(s=:)FrontInp1-Sel.OMSL")
Expand All @@ -646,13 +664,11 @@ record(dfanout, "$(P)Omsl$(s=:)Cont-FOut_") {
field(OUTF, "$(P)TrigSrc$(s=:)UnivInp1-Sel.OMSL")
field(OUTG, "$(P)TrigSrc$(s=:)UnivInp2-Sel.OMSL")
field(OUTH, "$(P)TrigSrc$(s=:)UnivInp3-Sel.OMSL")
field(FLNK, "$(P)Omsl$(s=:)Cont1-FOut_")
}

record(dfanout, "$(P)Omsl$(s=:)Cont1-FOut_") {
record(dfanout, "$(P)Omsl2-FOut_") {
field(ASG, "private")
field(OMSL, "closed_loop")
field(DOL, "$(P)Omsl-FOut")
field(OUTA, "$(P)TrigSrc$(s=:)UnivInp4-Sel.OMSL")
field(OUTB, "$(P)TrigSrc$(s=:)UnivInp5-Sel.OMSL")
field(OUTC, "$(P)TrigSrc$(s=:)UnivInp6-Sel.OMSL")
Expand All @@ -661,13 +677,11 @@ record(dfanout, "$(P)Omsl$(s=:)Cont1-FOut_") {
field(OUTF, "$(P)TrigSrc$(s=:)UnivInp9-Sel.OMSL")
field(OUTG, "$(P)TrigSrc$(s=:)UnivInp10-Sel.OMSL")
field(OUTH, "$(P)TrigSrc$(s=:)UnivInp11-Sel.OMSL")
field(FLNK, "$(P)Omsl$(s=:)Cont2-FOut_")
}

record(dfanout, "$(P)Omsl$(s=:)Cont2-FOut_") {
record(dfanout, "$(P)Omsl3-FOut_") {
field(ASG, "private")
field(OMSL, "closed_loop")
field(DOL, "$(P)Omsl-FOut")
field(OUTA, "$(P)TrigSrc$(s=:)UnivInp12-Sel.OMSL")
field(OUTB, "$(P)TrigSrc$(s=:)UnivInp13-Sel.OMSL")
field(OUTC, "$(P)TrigSrc$(s=:)UnivInp14-Sel.OMSL")
Expand All @@ -676,13 +690,11 @@ record(dfanout, "$(P)Omsl$(s=:)Cont2-FOut_") {
field(OUTF, "$(P)TrigSrc$(s=:)RearInp1-Sel.OMSL")
field(OUTG, "$(P)TrigSrc$(s=:)RearInp2-Sel.OMSL")
field(OUTH, "$(P)TrigSrc$(s=:)RearInp3-Sel.OMSL")
field(FLNK, "$(P)Omsl$(s=:)Cont3-FOut_")
}

record(dfanout, "$(P)Omsl$(s=:)Cont3-FOut_") {
record(dfanout, "$(P)Omsl4-FOut_") {
field(ASG, "private")
field(OMSL, "closed_loop")
field(DOL, "$(P)Omsl-FOut")
field(OUTA, "$(P)TrigSrc$(s=:)RearInp4-Sel.OMSL")
field(OUTB, "$(P)TrigSrc$(s=:)RearInp5-Sel.OMSL")
field(OUTC, "$(P)TrigSrc$(s=:)RearInp6-Sel.OMSL")
Expand All @@ -691,13 +703,11 @@ record(dfanout, "$(P)Omsl$(s=:)Cont3-FOut_") {
field(OUTF, "$(P)TrigSrc$(s=:)RearInp9-Sel.OMSL")
field(OUTG, "$(P)TrigSrc$(s=:)RearInp10-Sel.OMSL")
field(OUTH, "$(P)TrigSrc$(s=:)RearInp11-Sel.OMSL")
field(FLNK, "$(P)Omsl$(s=:)Cont4-FOut_")
}

record(dfanout, "$(P)Omsl$(s=:)Cont4-FOut_") {
record(dfanout, "$(P)Omsl5-FOut_") {
field(ASG, "private")
field(OMSL, "closed_loop")
field(DOL, "$(P)Omsl-FOut")
field(OUTA, "$(P)TrigSrc$(s=:)RearInp12-Sel.OMSL")
field(OUTB, "$(P)TrigSrc$(s=:)RearInp13-Sel.OMSL")
field(OUTC, "$(P)TrigSrc$(s=:)RearInp14-Sel.OMSL")
Expand Down

0 comments on commit 56a314d

Please sign in to comment.