diff --git a/config/Makefile.linux b/config/Makefile.linux index 09ab87383f13938041ba32d486d4bba7aa2114a6..4705da69325ec5f0fc851152fa686ae784e80fd7 100644 --- a/config/Makefile.linux +++ b/config/Makefile.linux @@ -136,13 +136,14 @@ install: $(DB) cat $$i | sed s/%IFO%/$$ifo/g\;s/%IFO0%/$$ifo0/g\;s/%SYS%/$$system/g > target/$(TARGET)/db/$$ifo/`basename $$i`; \ grep record target/$(TARGET)/db/$$ifo/`basename $$i` | egrep 'record\(ao|record\(stringout' | sed 's/.*"\(.*\)\".*/\1/g' | awk '{ printf "RO %s\n", $$0 }' >> target/$(TARGET)/db/$$ifo/autoBurt.req; \ grep record target/$(TARGET)/db/$$ifo/`basename $$i` | egrep 'record\(stringin' | sed 's/.*"\(.*\)\".*/\1/g' | awk '{ printf "%s\n", $$0 }' >> target/$(TARGET)/db/$$ifo/autoBurt.req; \ - grep record target/$(TARGET)/db/$$ifo/`basename $$i` | egrep 'record\(ao' | sed 's/.*"\(.*\)\".*/\1/g' | awk '{ printf "%s.HSV\n%s.LSV\n%s.HIGH\n%s.LOW\n", $$0, $$0, $$0, $$0 }' >> target/$(TARGET)/db/$$ifo/autoBurt.req; \ + grep record target/$(TARGET)/db/$$ifo/`basename $$i` | egrep 'record\(ao' | egrep -v 'SWSTAT' | sed 's/.*"\(.*\)\".*/\1/g' | awk '{ printf "%s.HSV\n%s.LSV\n%s.HIGH\n%s.LOW\n", $$0, $$0, $$0, $$0 }' >> target/$(TARGET)/db/$$ifo/autoBurt.req; \ + grep record target/$(TARGET)/db/$$ifo/`basename $$i` | egrep 'SWSTAT' | sed 's/.*"\(.*\)\".*/\1/g' | awk '{ printf "%s.HSV\n%s.LSV\n%s.LOW\n", $$0, $$0, $$0 }' >> target/$(TARGET)/db/$$ifo/autoBurt.req; \ \ grep record target/$(TARGET)/db/$$ifo/`basename $$i` | egrep 'record\(bo|record\(bi' | sed 's/.*"\(.*\)\".*/\1/g' >> target/$(TARGET)/db/$$ifo/autoBurt.req; \ grep record target/$(TARGET)/db/$$ifo/`basename $$i` | egrep 'record\(bo|record\(bi' | sed 's/.*"\(.*\)\".*/\1/g' | awk '{ printf "%s.OSV\n%s.ZSV\n", $$0, $$0 }' >> target/$(TARGET)/db/$$ifo/autoBurt.req; \ \ grep record target/$(TARGET)/db/$$ifo/`basename $$i` | egrep -v 'record\(ao|record\(string|record\(bi|record\(bo'| sed 's/.*"\(.*\)\".*/\1/g' >> target/$(TARGET)/db/$$ifo/autoBurt.req; \ - grep record target/$(TARGET)/db/$$ifo/`basename $$i` | egrep -v 'record\(ao|record\(string|record\(bi|record\(bo' | sed 's/.*"\(.*\)\".*/\1/g' | awk '{ printf "%s.HSV\n%s.LSV\n%s.HIGH\n%s.LOW\n", $$0 , $$0, $$0, $$0 }' >> target/$(TARGET)/db/$$ifo/autoBurt.req; \ + grep record target/$(TARGET)/db/$$ifo/`basename $$i` | egrep -v 'SWSTAT|record\(ao|record\(string|record\(bi|record\(bo' | sed 's/.*"\(.*\)\".*/\1/g' | awk '{ printf "%s.HSV\n%s.LSV\n%s.HIGH\n%s.LOW\n", $$0 , $$0, $$0, $$0 }' >> target/$(TARGET)/db/$$ifo/autoBurt.req; \ \ grep record target/$(TARGET)/db/$$ifo/`basename $$i` | sed 's/.*"\(.*\)\".*/\1/g' | egrep -v 'VME_Reset|SEVERITY|MAJOR_COUNT|MINOR_COUNT|SETPOINT_ID|FILTER_PARAM|GDS_MON|FESTAT|STATUS_COUNT|FILTER_ID|MTRXSTAT|MTRX_STAT_ERR|_MSG|_TIME_STRING|_STAT_ERR_CNT|BURT|LOAD_CONFIG|VME_RES|LOAD_NEW_COEFF|DIAG_RESET|SYNC_RESET|TOTAL$$|Name|_SW1|_SW2|_SW1R|_SW2R|_RSET|_OUTMON|_SW2S|_SW1S' | awk '{ printf "[%s]\n", $$0 }' >> target/$(TARGET)/db/$$ifo/auto.ini; \ echo "dbLoadRecords \"db/$${ifo}/`basename $$i`\"" >> target/$(TARGET)/$(TARGET)$$ifo.cmd; \ diff --git a/src/epics/util/fmseq.pl b/src/epics/util/fmseq.pl index b871c644ca86e743f909a97e79a50385a87d8519..f40f6d82648ac97457dae458631018babd6a3c31 100755 --- a/src/epics/util/fmseq.pl +++ b/src/epics/util/fmseq.pl @@ -676,6 +676,7 @@ $cnt2 = $cnt*2; $cnt10 = $cnt*10; $fpar{"gain_ramp_time"} = "TRAMP"; +$fpar{"swstat_alarm_level"} = "SWSTAT.HIGH"; @a = ( \%fpar, "double", \%ipar, "int", \%spar, "string" ); diff --git a/src/epics/util/skeleton.st b/src/epics/util/skeleton.st index 646a908031511394f73d50c9c3558652a02f065d..1a7c169a39162e5df1897365a42a85cd5720f702 100644 --- a/src/epics/util/skeleton.st +++ b/src/epics/util/skeleton.st @@ -454,6 +454,7 @@ state init saveSwitch2[ii] = 0; swMask[ii] = 0; swReq[ii] = 0; + swstat_alarm_level[ii] = 0x7fff; pvPut(sw1[ii]); pvPut(switchR1[ii]); pvPut(saveSwitch1[ii]); @@ -462,6 +463,7 @@ state init pvPut(saveSwitch2[ii]); pvPut(swMask[ii]); pvPut(swReq[ii]); + pvPut(swstat_alarm_level[ii]); %% } #endif