diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/Db/Makefile b/PfeifferEDUApp/Db/Makefile old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/Db/O.linux-x86_64/Makefile b/PfeifferEDUApp/Db/O.linux-x86_64/Makefile old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/Db/PfeifferEDU_Acc.db b/PfeifferEDUApp/Db/PfeifferEDU_Acc.db old mode 100644 new mode 100755 index b787078..c932020 --- a/PfeifferEDUApp/Db/PfeifferEDU_Acc.db +++ b/PfeifferEDUApp/Db/PfeifferEDU_Acc.db @@ -14,7 +14,7 @@ record(mbbi, "$(Sys)$(Dev)Mode:A1-Sts"){ field(SXST, "Always 0") field(SVST, "Always 1") field(EIST, "Power Fail Vent Unit") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(mbbo, "$(Sys)$(Dev)Mode:A1-Sel"){ @@ -43,7 +43,7 @@ record(mbbi, "$(Sys)$(Dev)Mode:B1-Sts"){ field(SXST, "Always 0") field(SVST, "Always 1") field(EIST, "Power Fail Vent Unit") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(mbbo, "$(Sys)$(Dev)Mode:B1-Sel"){ @@ -72,7 +72,7 @@ record(mbbi, "$(Sys)$(Dev)Mode:A2-Sts"){ field(SXST, "Always 0") field(SVST, "Always 1") field(EIST, "Power Fail Vent Unit") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(mbbo, "$(Sys)$(Dev)Mode:A2-Sel"){ @@ -101,7 +101,7 @@ record(mbbi, "$(Sys)$(Dev)Mode:B2-Sts"){ field(SXST, "Always 0") field(SVST, "Always 1") field(EIST, "Power Fail Vent Unit") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(mbbo, "$(Sys)$(Dev)Mode:B2-Sel"){ @@ -128,7 +128,7 @@ record(mbbi, "$(Sys)$(Dev)Mode:DI1-Sts"){ field(FRST, "Run-up Control") field(FVST, "Rot. Speed Setting") field(SXST, "Motor") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(mbbo, "$(Sys)$(Dev)Mode:DI1-Sel"){ @@ -153,7 +153,7 @@ record(mbbi, "$(Sys)$(Dev)Mode:DI2-Sts"){ field(FRST, "Run-up Control") field(FVST, "Rot. Speed Setting") field(SXST, "Motor") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(mbbo, "$(Sys)$(Dev)Mode:DI2-Sel"){ @@ -170,3 +170,4 @@ record(mbbo, "$(Sys)$(Dev)Mode:DI2-Sel"){ } + diff --git a/PfeifferEDUApp/Db/PfeifferEDU_Base.db b/PfeifferEDUApp/Db/PfeifferEDU_Base.db old mode 100644 new mode 100755 index 507ca43..c363c0c --- a/PfeifferEDUApp/Db/PfeifferEDU_Base.db +++ b/PfeifferEDUApp/Db/PfeifferEDU_Base.db @@ -2,12 +2,19 @@ # Pump ON/OFF Commands # -record(bo, "$(Sys)$(Dev)Pwr-Sel"){ +record(bo, "$(Sys)$(Dev)Cmd:On-Cmd"){ field(DTYP, "stream") - field(OUT, "@pfeiffer.proto writeBoolParam($(ID),010) $(PORT)") - field(FLNK, "$(Sys)$(Dev)Pwr-Sts") - field(ZNAM, "OFF") - field(ONAM, "ON") + field(OUT, "@pfeiffer.proto writePumpOn($(ID)) $(PORT)") +} + +record(bo, "$(Sys)$(Dev)Cmd:Off-Cmd"){ + field(DTYP, "stream") + field(OUT, "@pfeiffer.proto writePumpOff($(ID)) $(PORT)") +} + +record(bo, "$(Sys)$(Dev)Cmd:OffVent-Cmd"){ + field(DTYP, "stream") + field(OUT, "@pfeiffer.proto writePumpOffVent($(ID)) $(PORT)") } record(bi, "$(Sys)$(Dev)Pwr-Sts__"){ @@ -162,7 +169,7 @@ record(mbbi, "$(Sys)$(Dev)Err-Sts_"){ record(longin, "$(Sys)$(Dev)Err-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),303) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err-Sts_ PP MS") field(DISV, "256") } @@ -181,7 +188,7 @@ record(mbbi, "$(Sys)$(Dev)Err:1-Sts_"){ record(longin, "$(Sys)$(Dev)Err:1-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),360) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err:1-Sts_ PP MS") field(DISV, "256") } @@ -200,7 +207,7 @@ record(mbbi, "$(Sys)$(Dev)Err:2-Sts_"){ record(longin, "$(Sys)$(Dev)Err:2-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),361) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err:2-Sts_ PP MS") field(DISV, "256") } @@ -219,7 +226,7 @@ record(mbbi, "$(Sys)$(Dev)Err:3-Sts_"){ record(longin, "$(Sys)$(Dev)Err:3-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),362) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err:3-Sts_ PP MS") field(DISV, "256") } @@ -238,7 +245,7 @@ record(mbbi, "$(Sys)$(Dev)Err:4-Sts_"){ record(longin, "$(Sys)$(Dev)Err:4-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),363) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err:4-Sts_ PP MS") field(DISV, "256") } @@ -257,7 +264,7 @@ record(mbbi, "$(Sys)$(Dev)Err:5-Sts_"){ record(longin, "$(Sys)$(Dev)Err:5-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),364) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err:5-Sts_ PP MS") field(DISV, "256") } @@ -276,7 +283,7 @@ record(mbbi, "$(Sys)$(Dev)Err:6-Sts_"){ record(longin, "$(Sys)$(Dev)Err:6-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),365) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err:6-Sts_ PP MS") field(DISV, "256") } @@ -295,7 +302,7 @@ record(mbbi, "$(Sys)$(Dev)Err:7-Sts_"){ record(longin, "$(Sys)$(Dev)Err:7-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),366) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err:7-Sts_ PP MS") field(DISV, "256") } @@ -314,7 +321,7 @@ record(mbbi, "$(Sys)$(Dev)Err:8-Sts_"){ record(longin, "$(Sys)$(Dev)Err:8-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),367) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err:8-Sts_ PP MS") field(DISV, "256") } @@ -333,7 +340,7 @@ record(mbbi, "$(Sys)$(Dev)Err:9-Sts_"){ record(longin, "$(Sys)$(Dev)Err:9-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),368) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err:9-Sts_ PP MS") field(DISV, "256") } @@ -352,7 +359,7 @@ record(mbbi, "$(Sys)$(Dev)Err:10-Sts_"){ record(longin, "$(Sys)$(Dev)Err:10-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readErrorCodeParam($(ID),369) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(SDIS, "$(Sys)$(Dev)Err:10-Sts_ PP MS") field(DISV, "256") } @@ -367,7 +374,7 @@ record(mbbi, "$(Sys)$(Dev)Mode:Vent-Sts"){ field(ZRST, "DELAYED VENTING") field(ONST, "NO VENTING") field(TWST, "DIRECT VENTING") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(mbbo, "$(Sys)$(Dev)Mode:Vent-Sel"){ @@ -379,15 +386,15 @@ record(mbbo, "$(Sys)$(Dev)Mode:Vent-Sel"){ field(FLNK, "$(Sys)$(Dev)Mode:Vent-Sts") } -record(bi, "$(Sys)$(Dev)Sw:Vent-Sts"){ +record(bi, "$(Sys)$(Dev)Enbl:Vent-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readBoolParam($(ID),012) $(PORT)") field(ZNAM, "DISABLED") field(ONAM, "ENABLED") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } -record(bo, "$(Sys)$(Dev)Sw:Vent-Sel"){ +record(bo, "$(Sys)$(Dev)Enbl:Vent-Sel"){ field(DTYP, "stream") field(OUT, "@pfeiffer.proto writeBoolParam($(ID),012) $(PORT)") field(ZNAM, "DISABLED") @@ -403,7 +410,7 @@ record(bi, "$(Sys)$(Dev)Mode:Rmt-Sts"){ field(INP, "@pfeiffer.proto readBoolParam($(ID),300) $(PORT)") field(ONAM, "ON") field(ZNAM, "OFF") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(bi, "$(Sys)$(Dev)T:EDU-Sts"){ @@ -411,7 +418,7 @@ record(bi, "$(Sys)$(Dev)T:EDU-Sts"){ field(INP, "@pfeiffer.proto readBoolParam($(ID),304) $(PORT)") field(ONAM, "OVER TEMP") field(ZNAM, "OK") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(bi, "$(Sys)$(Dev)T:Pump-Sts"){ @@ -419,7 +426,7 @@ record(bi, "$(Sys)$(Dev)T:Pump-Sts"){ field(INP, "@pfeiffer.proto readBoolParam($(ID),305) $(PORT)") field(ONAM, "OVER TEMP") field(ZNAM, "OK") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(bi, "$(Sys)$(Dev)S:SP-Sts"){ @@ -427,7 +434,7 @@ record(bi, "$(Sys)$(Dev)S:SP-Sts"){ field(INP, "@pfeiffer.proto readBoolParam($(ID),302) $(PORT)") field(ONAM, "AT SPEED") field(ZNAM, "NOT AT SPEED") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(bi, "$(Sys)$(Dev)S:Max-Sts"){ @@ -435,7 +442,7 @@ record(bi, "$(Sys)$(Dev)S:Max-Sts"){ field(INP, "@pfeiffer.proto readBoolParam($(ID),306) $(PORT)") field(ONAM, "AT SPEED") field(ZNAM, "NOT AT SPEED") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } # @@ -448,22 +455,7 @@ record(bi, "$(Sys)$(Dev)Sw:Heat-Sts"){ field(INP, "@pfeiffer.proto readBoolParam($(ID),001) $(PORT)") field(ONAM, "ON") field(ZNAM, "OFF") - field(SCAN, "10 second") -} - -record(bo, "$(Sys)$(Dev)Sw:Heat-Sel"){ - field(DTYP, "stream") - field(OUT, "@pfeiffer.proto writeBoolParam($(ID),001) $(PORT)") - field(ONAM, "ON") - field(ZNAM, "OFF") -} - -record(bi, "$(Sys)$(Dev)Sw:Heat-Sts"){ - field(DTYP, "stream") - field(INP, "@pfeiffer.proto readBoolParam($(ID),001) $(PORT)") - field(ONAM, "ON") - field(ZNAM, "OFF") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(bo, "$(Sys)$(Dev)Sw:Heat-Sel"){ @@ -472,13 +464,28 @@ record(bo, "$(Sys)$(Dev)Sw:Heat-Sel"){ field(ONAM, "ON") field(ZNAM, "OFF") } +# TODO delete these 2 records. REPEATS ABOVE +#record(bi, "$(Sys)$(Dev)Sw:Heat-Sts"){ +# field(DTYP, "stream") +# field(INP, "@pfeiffer.proto readBoolParam($(ID),001) $(PORT)") +# field(ONAM, "ON") +# field(ZNAM, "OFF") +# field(SCAN, "$(SCAN)") +#} +# +#record(bo, "$(Sys)$(Dev)Sw:Heat-Sel"){ +# field(DTYP, "stream") +# field(OUT, "@pfeiffer.proto writeBoolParam($(ID),001) $(PORT)") +# field(ONAM, "ON") +# field(ZNAM, "OFF") +#} record(bi, "$(Sys)$(Dev)Mode:RunCtl-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readBoolParam($(ID),003) $(PORT)") field(ONAM, "ON") field(ZNAM, "OFF") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(bo, "$(Sys)$(Dev)Mode:RunCtl-Sel"){ @@ -493,7 +500,7 @@ record(bi, "$(Sys)$(Dev)Mode:Stby-Sts"){ field(INP, "@pfeiffer.proto readBoolParam($(ID),002) $(PORT)") field(ONAM, "ON") field(ZNAM, "OFF") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(bo, "$(Sys)$(Dev)Mode:Stby-Sel"){ @@ -508,7 +515,7 @@ record(bi, "$(Sys)$(Dev)Mode:CfgSpdSw-Sts"){ field(INP, "@pfeiffer.proto readShortIntParam($(ID),017) $(PORT)") field(ONAM, "SWITCH 1+2") field(ZNAM, "SWICH 1") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(bo, "$(Sys)$(Dev)Mode:CfgSpdSw-Sel"){ @@ -523,7 +530,7 @@ record(bi, "$(Sys)$(Dev)Mode:SpdSet-Sts"){ field(INP, "@pfeiffer.proto readShortIntParam($(ID),026) $(PORT)") field(ONAM, "ON") field(ZNAM, "OFF") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } record(bo, "$(Sys)$(Dev)Mode:SpdSet-Sel"){ @@ -535,8 +542,8 @@ record(bo, "$(Sys)$(Dev)Mode:SpdSet-Sel"){ record(mbbi, "$(Sys)$(Dev)Mode:GasTyp-Sts"){ field(DTYP, "stream") - field(INP, "@pfeiffer.proto readShortIntParam($(ID),026) $(PORT)") - field(SCAN, "10 second") + field(INP, "@pfeiffer.proto readShortIntParam($(ID),027) $(PORT)") + field(SCAN, "$(SCAN)") field(ZRST, "HEAVY GAS") field(ONST, "LIGHT GAS") field(TWST, "HELIUM") @@ -544,7 +551,7 @@ record(mbbi, "$(Sys)$(Dev)Mode:GasTyp-Sts"){ record(mbbo, "$(Sys)$(Dev)Mode:GasTyp-Sel"){ field(DTYP, "stream") - field(OUT, "@pfeiffer.proto writeShortIntParam($(ID),026) $(PORT)") + field(OUT, "@pfeiffer.proto writeShortIntParam($(ID),027) $(PORT)") field(ZRST, "HEAVY GAS") field(ONST, "LIGHT GAS") field(TWST, "HELIUM") @@ -557,7 +564,7 @@ record(mbbo, "$(Sys)$(Dev)Mode:GasTyp-Sel"){ record(longin, "$(Sys)$(Dev)Time:RunUp-RB"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readIntParam($(ID),700) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(EGU, "min") } @@ -570,7 +577,7 @@ record(longout, "$(Sys)$(Dev)Time:RunUp-SP"){ record(longin, "$(Sys)$(Dev)S:SwPt1-RB"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readIntParam($(ID),701) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(EGU, "%") } @@ -583,7 +590,7 @@ record(longout, "$(Sys)$(Dev)S:SwPt1-SP"){ record(longin, "$(Sys)$(Dev)S:SwPt2-RB"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readIntParam($(ID),719) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(EGU, "%") } @@ -596,7 +603,7 @@ record(longout, "$(Sys)$(Dev)S:SwPt2-SP"){ record(longin, "$(Sys)$(Dev)S:Vent-RB"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readShortIntParam($(ID),720) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(EGU, "%") } @@ -609,7 +616,7 @@ record(longout, "$(Sys)$(Dev)S:Vent-SP"){ record(longin, "$(Sys)$(Dev)Time:Vent-RB"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readIntParam($(ID),721) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(EGU, "sec") } @@ -628,7 +635,7 @@ record(longout, "$(Sys)$(Dev)S:Nom-SP"){ record(longin, "$(Sys)$(Dev)S:Nom-RB"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readIntParam($(ID),777) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(EGU, "Hz") } @@ -642,7 +649,7 @@ record(ao, "$(Sys)$(Dev)S:Stby-SP"){ record(ai, "$(Sys)$(Dev)S:Stby-RB"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readIntParam($(ID),717) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(EGU, "%") field(ASLO, "0.01") } @@ -657,7 +664,7 @@ record(ao, "$(Sys)$(Dev)S:SSet-SP"){ record(ai, "$(Sys)$(Dev)S:SSet-RB"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readIntParam($(ID),707) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(EGU, "%") field(ASLO, "0.01") } diff --git a/PfeifferEDUApp/Db/PfeifferEDU_Extra.db b/PfeifferEDUApp/Db/PfeifferEDU_Extra.db old mode 100644 new mode 100755 index 6496e55..3d4cf63 --- a/PfeifferEDUApp/Db/PfeifferEDU_Extra.db +++ b/PfeifferEDUApp/Db/PfeifferEDU_Extra.db @@ -5,7 +5,7 @@ record(mbbi, "$(Sys)$(Dev)Out:Rly1-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readShortIntParam($(ID),045) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(ZRST, "Speed SP") field(ONST, "No Error") field(TWST, "Error") @@ -48,7 +48,7 @@ record(mbbo, "$(Sys)$(Dev)Out:Rly1-Sel"){ record(mbbi, "$(Sys)$(Dev)Out:Rly2-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readShortIntParam($(ID),046) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(ZRST, "Speed SP") field(ONST, "No Error") field(TWST, "Error") @@ -91,7 +91,7 @@ record(mbbo, "$(Sys)$(Dev)Out:Rly2-Sel"){ record(mbbi, "$(Sys)$(Dev)Out:Rly3-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readShortIntParam($(ID),047) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(ZRST, "Speed SP") field(ONST, "No Error") field(TWST, "Error") @@ -134,7 +134,7 @@ record(mbbo, "$(Sys)$(Dev)Out:Rly3-Sel"){ record(mbbi, "$(Sys)$(Dev)Mode:Rly-Sts"){ field(DTYP, "stream") field(INP, "@pfeiffer.proto readShortIntParam($(ID),028) $(PORT)") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") field(ZRST, "Standard") field(ONST, "Inverted") field(ZRVL, "0") @@ -173,5 +173,5 @@ record(mbbi, "$(Sys)$(Dev)Mode:DI3-Sts"){ field(FRST, "Run-up Control") field(FVST, "Rot. Speed Setting") field(SXST, "Motor") - field(SCAN, "10 second") + field(SCAN, "$(SCAN)") } diff --git a/PfeifferEDUApp/Db/PfeifferEDU_TC110.db b/PfeifferEDUApp/Db/PfeifferEDU_TC110.db old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/Db/PfeifferEDU_TC400.db b/PfeifferEDUApp/Db/PfeifferEDU_TC400.db old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/Db/test.db b/PfeifferEDUApp/Db/test.db old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/Makefile b/PfeifferEDUApp/Makefile old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/src/Makefile b/PfeifferEDUApp/src/Makefile old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/src/O.Common/PfeifferEDU.dbd b/PfeifferEDUApp/src/O.Common/PfeifferEDU.dbd index f105bed..39b3d68 100644 --- a/PfeifferEDUApp/src/O.Common/PfeifferEDU.dbd +++ b/PfeifferEDUApp/src/O.Common/PfeifferEDU.dbd @@ -268,6 +268,11 @@ menu(menuAlarmSevr) { choice(menuAlarmSevrMAJOR,"MAJOR") choice(menuAlarmSevrINVALID,"INVALID") } +menu(ipDRTO) { + choice(ipDRTO_unknown,"Unknown") + choice(ipDRTO_No,"No") + choice(ipDRTO_Yes,"Yes") +} menu(gpibUCMD) { choice(gpibUCMD_None,"None") choice(gpibUCMD_Device_Clear__DCL_,"Device Clear (DCL)") @@ -19852,6 +19857,21 @@ recordtype(asyn) { menu(serialIX) interest(2) } + field(HOSTINFO,DBF_STRING) { + prompt("host info") + initial("") + promptgroup(GUI_INPUTS) + special(100) + size(40) + interest(1) + } + field(DRTO,DBF_MENU) { + prompt("Disconnect on timeout") + promptgroup(GUI_INPUTS) + special(100) + menu(ipDRTO) + interest(2) + } field(UCMD,DBF_MENU) { prompt("Universal command") promptgroup(GUI_OUTPUT) @@ -20116,6 +20136,7 @@ device(waveform,INST_IO,asynWfOctetCmdResponse,"asynOctetCmdResponse") device(waveform,INST_IO,asynWfOctetWriteRead,"asynOctetWriteRead") device(waveform,INST_IO,asynWfOctetRead,"asynOctetRead") device(waveform,INST_IO,asynWfOctetWrite,"asynOctetWrite") +device(waveform,INST_IO,asynWfOctetWriteBinary,"asynOctetWriteBinary") device(waveform,INST_IO,asynInt8ArrayWfIn,"asynInt8ArrayIn") device(waveform,INST_IO,asynInt8ArrayWfOut,"asynInt8ArrayOut") device(waveform,INST_IO,asynInt16ArrayWfIn,"asynInt16ArrayIn") diff --git a/PfeifferEDUApp/src/O.Common/PfeifferEDUInclude.dbd b/PfeifferEDUApp/src/O.Common/PfeifferEDUInclude.dbd old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/src/O.linux-x86_64/Makefile b/PfeifferEDUApp/src/O.linux-x86_64/Makefile old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU index 1e52667..33cce30 100755 Binary files a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU and b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU differ diff --git a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU.dbd.d b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU.dbd.d index 11d1449..4afb66e 100644 --- a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU.dbd.d +++ b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU.dbd.d @@ -1,45 +1,45 @@ # DO NOT EDIT: This file created by mkmf.pl,v 1.5 2002/03/25 21:33:24 jba Exp $ -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/base.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/base.dbd ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/calc-3-4-2-1/dbd/calcSupport.dbd ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/autosave-5-6-1/dbd/asSupport.dbd ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/busy-1-6-1/dbd/busySupport.dbd ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/stream-2-6a/dbd/stream.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/asyn.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/drvAsynIPPort.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/system.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/asyn.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/drvAsynIPPort.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/system.dbd ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/devIocStats-3-1-13/dbd/devIocStats.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuGlobal.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuConvert.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/aaiRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/aaoRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/aiRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/aoRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/aSubRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/biRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/boRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/calcRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/calcoutRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/compressRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/dfanoutRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/eventRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/fanoutRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/longinRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/longoutRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/mbbiRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/mbbiDirectRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/mbboRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/mbboDirectRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/permissiveRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/selRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/seqRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/stateRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/stringinRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/stringoutRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/subRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/subArrayRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/waveformRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/devSoft.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuGlobal.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuConvert.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/aaiRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/aaoRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/aiRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/aoRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/aSubRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/biRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/boRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/calcRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/calcoutRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/compressRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/dfanoutRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/eventRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/fanoutRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/longinRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/longoutRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/mbbiRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/mbbiDirectRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/mbboRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/mbboDirectRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/permissiveRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/selRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/seqRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/stateRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/stringinRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/stringoutRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/subRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/subArrayRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/waveformRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/devSoft.dbd ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/calc-3-4-2-1/dbd/transformRecord.dbd ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/calc-3-4-2-1/dbd/sCalcoutRecord.dbd ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/calc-3-4-2-1/dbd/aCalcoutRecord.dbd @@ -47,32 +47,32 @@ ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/calc-3-4-2-1/dbd/swaitRecord.dbd ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/calc-3-4-2-1/dbd/editSseq.dbd ../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/busy-1-6-1/dbd/busyRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/asynRecord.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devEpics.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuAlarmSevr.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuAlarmStat.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuCompress.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuFtype.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuIvoa.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuOmsl.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuPini.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuPriority.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuScan.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuSimm.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/menuYesNo.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5/dbd/dbCommon.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynOctet.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynInt32.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynInt8Array.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynInt16Array.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynInt32Array.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynInt32TimeSeries.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynFloat64.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynFloat32Array.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynFloat64Array.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynFloat64TimeSeries.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynUInt32Digital.dbd -../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-26/dbd/devAsynRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/asynRecord.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devEpics.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuAlarmSevr.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuAlarmStat.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuCompress.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuFtype.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuIvoa.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuOmsl.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuPini.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuPriority.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuScan.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuSimm.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/menuYesNo.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/base-3.14.12.5//dbd/dbCommon.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynOctet.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynInt32.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynInt8Array.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynInt16Array.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynInt32Array.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynInt32TimeSeries.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynFloat64.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynFloat32Array.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynFloat64Array.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynFloat64TimeSeries.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynUInt32Digital.dbd +../O.Common/PfeifferEDU.dbd : /epics/xf/23id/apps/synApps_5_8/support/asyn-4-31/dbd/devAsynRecord.dbd ../O.Common/PfeifferEDUInclude.dbd : ../Makefile diff --git a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDUMain.d b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDUMain.d old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDUMain.o b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDUMain.o old mode 100644 new mode 100755 diff --git a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.cpp b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.cpp index 5cc19ba..da98d36 100644 --- a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.cpp +++ b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.cpp @@ -247,6 +247,7 @@ epicsShareExtern dset *pvar_dset_asynWfOctetCmdResponse; epicsShareExtern dset *pvar_dset_asynWfOctetWriteRead; epicsShareExtern dset *pvar_dset_asynWfOctetRead; epicsShareExtern dset *pvar_dset_asynWfOctetWrite; +epicsShareExtern dset *pvar_dset_asynWfOctetWriteBinary; epicsShareExtern dset *pvar_dset_asynInt8ArrayWfIn; epicsShareExtern dset *pvar_dset_asynInt8ArrayWfOut; epicsShareExtern dset *pvar_dset_asynInt16ArrayWfIn; @@ -268,7 +269,7 @@ epicsShareExtern dset *pvar_dset_devBusySoftRaw; epicsShareExtern dset *pvar_dset_asynBusyInt32; epicsShareExtern dset *pvar_dset_asynRecordDevice; -static const char * const deviceSupportNames[110] = { +static const char * const deviceSupportNames[111] = { "devAaiSoft", "devaaiStream", "devAaoSoft", @@ -359,6 +360,7 @@ static const char * const deviceSupportNames[110] = { "asynWfOctetWriteRead", "asynWfOctetRead", "asynWfOctetWrite", + "asynWfOctetWriteBinary", "asynInt8ArrayWfIn", "asynInt8ArrayWfOut", "asynInt16ArrayWfIn", @@ -381,7 +383,7 @@ static const char * const deviceSupportNames[110] = { "asynRecordDevice" }; -static const dset * const devsl[110] = { +static const dset * const devsl[111] = { pvar_dset_devAaiSoft, pvar_dset_devaaiStream, pvar_dset_devAaoSoft, @@ -472,6 +474,7 @@ static const dset * const devsl[110] = { pvar_dset_asynWfOctetWriteRead, pvar_dset_asynWfOctetRead, pvar_dset_asynWfOctetWrite, + pvar_dset_asynWfOctetWriteBinary, pvar_dset_asynInt8ArrayWfIn, pvar_dset_asynInt8ArrayWfOut, pvar_dset_asynInt16ArrayWfIn, @@ -595,7 +598,7 @@ static struct iocshVarDef vardefs[] = { int PfeifferEDU_registerRecordDeviceDriver(DBBASE *pbase) { - const char *bldTop = "/home/swilkins/Repos/iocs/PfeifferEDU"; + const char *bldTop = "/epics/iocs/es-pfeiffer"; const char *envTop = getenv("TOP"); if (envTop && strcmp(envTop, bldTop)) { @@ -610,7 +613,7 @@ int PfeifferEDU_registerRecordDeviceDriver(DBBASE *pbase) } registerRecordTypes(pbase, 35, recordTypeNames, rtl); - registerDevices(pbase, 110, deviceSupportNames, devsl); + registerDevices(pbase, 111, deviceSupportNames, devsl); registerDrivers(pbase, 2, driverSupportNames, drvsl); (*pvar_func_asSub)(); (*pvar_func_subAveRegister)(); diff --git a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.d b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.d old mode 100644 new mode 100755 index 30a8346..dbdd4f5 --- a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.d +++ b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.d @@ -1,20 +1,20 @@ PfeifferEDU_registerRecordDeviceDriver.o: \ PfeifferEDU_registerRecordDeviceDriver.cpp \ - /epics/xf/23id/apps/base-3.14.12.5/include/epicsStdlib.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/shareLib.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/os/Linux/osdStrtod.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/iocsh.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/shareLib.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/iocshRegisterCommon.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/registryCommon.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/dbStaticLib.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/dbFldTypes.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/dbBase.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/epicsTypes.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/ellLib.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/dbDefs.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/link.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/errMdef.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/cantProceed.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/registryRecordType.h \ - /epics/xf/23id/apps/base-3.14.12.5/include/recSup.h + /epics/xf/23id/apps/base-3.14.12.5//include/epicsStdlib.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/shareLib.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/os/Linux/osdStrtod.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/iocsh.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/shareLib.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/iocshRegisterCommon.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/registryCommon.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/dbStaticLib.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/dbFldTypes.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/dbBase.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/epicsTypes.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/ellLib.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/dbDefs.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/link.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/errMdef.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/cantProceed.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/registryRecordType.h \ + /epics/xf/23id/apps/base-3.14.12.5//include/recSup.h diff --git a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.o b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.o index 3c8d921..9db0fdb 100644 Binary files a/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.o and b/PfeifferEDUApp/src/O.linux-x86_64/PfeifferEDU_registerRecordDeviceDriver.o differ diff --git a/PfeifferEDUApp/src/PfeifferEDUMain.cpp b/PfeifferEDUApp/src/PfeifferEDUMain.cpp old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/configure/CONFIG b/configure/CONFIG old mode 100644 new mode 100755 diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE old mode 100644 new mode 100755 diff --git a/configure/Makefile b/configure/Makefile old mode 100644 new mode 100755 diff --git a/configure/O.linux-x86_64/Makefile b/configure/O.linux-x86_64/Makefile old mode 100644 new mode 100755 diff --git a/configure/RELEASE b/configure/RELEASE index e4a5427..827ae7c 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -1,45 +1,31 @@ -# RELEASE - Location of external support modules -# -# IF YOU MAKE ANY CHANGES to this file you must subsequently -# do a "gnumake rebuild" in this application's top level -# directory. -# -# The build process does not check dependencies against files -# that are outside this application, thus you should do a -# "gnumake rebuild" in the top level directory after EPICS_BASE -# or any other external module pointed to below is rebuilt. -# -# Host- or target-specific settings can be given in files named -# RELEASE.$(EPICS_HOST_ARCH).Common -# RELEASE.Common.$(T_A) -# RELEASE.$(EPICS_HOST_ARCH).$(T_A) -# -# This file should ONLY define paths to other support modules, -# or include statements that pull in similar RELEASE files. -# Build settings that are NOT module paths should appear in a -# CONFIG_SITE file. +#FILENAME: RELEASE +#USAGE: Specify directory paths to synApps support modules +#Version: $Revision: 19158 $ +#Modified By: $Author: mooney $ +#Last Modified: $Date: 2015-03-19 15:44:13 -0500 (Thu, 19 Mar 2015) $ +#HeadURL: $URL: https://subversion.xray.aps.anl.gov/synApps/configure/tags/synApps_5_8/RELEASE $ -TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top +#NOTES +# - To remove modules from the build, delete or comment out the +# module name. +# - Refer to the "MODULE_LIST" in /configure/Makefile +# for the inter-dependencies of the different modules. -# If using the sequencer, point SNCSEQ at its top directory: -#SNCSEQ=$(EPICS_BASE)/../modules/soft/seq - -# EPICS_BASE usually appears last so other apps can override stuff: -EPICS_BASE=/epics/xf/23id/apps/base-3.14.12.5 - -# Set RULES here if you want to take build rules from somewhere -# other than EPICS_BASE: -#RULES=/path/to/epics/support/module/rules/x-y SUPPORT=/epics/xf/23id/apps/synApps_5_8/support +-include $(TOP)/configure/SUPPORT.$(EPICS_HOST_ARCH) +EPICS_BASE=/epics/xf/23id/apps/base-3.14.12.5/ +-include $(TOP)/configure/EPICS_BASE +-include $(TOP)/configure/EPICS_BASE.$(EPICS_HOST_ARCH) +#/usr/local/iocapps/cvsroot/modules/bus/allenBradley #ALIVE=$(SUPPORT)/alive-1-0 #ALLEN_BRADLEY=$(SUPPORT)/allenBradley-2-3 #AREA_DETECTOR=$(SUPPORT)/areaDetector-R2-0 -AREA_DETECTOR=/epics/xf/23id/apps/areaDetector +#AREA_DETECTOR=/epics/xf/23id/apps/areaDetector #ADCORE=$(AREA_DETECTOR)/ADCore-R2-2 #ADBINARIES=$(AREA_DETECTOR)/ADBinaries-R2-2 #https://svn.aps.anl.gov/epics/asyn/ -ASYN=$(SUPPORT)/asyn-4-26 +ASYN=$(SUPPORT)/asyn-4-31 AUTOSAVE=$(SUPPORT)/autosave-5-6-1 BUSY=$(SUPPORT)/busy-1-6-1 CALC=$(SUPPORT)/calc-3-4-2-1 @@ -49,7 +35,7 @@ CAMAC=$(SUPPORT)/camac-2-7 #DELAYGEN=$(SUPPORT)/delaygen-1-1-1 #http://www.slac.stanford.edu/grp/cd/soft/epics/site/devIocStats/ DEVIOCSTATS=$(SUPPORT)/devIocStats-3-1-13 -DXP=$(SUPPORT)/dxp-3-4 +#DXP=$(SUPPORT)/dxp-3-4 #IP=$(SUPPORT)/ip-2-17 #IP330=$(SUPPORT)/ip330-2-8 #https://svn.aps.anl.gov/epics/ipac/ diff --git a/configure/RULES b/configure/RULES old mode 100644 new mode 100755 diff --git a/configure/RULES.ioc b/configure/RULES.ioc old mode 100644 new mode 100755 diff --git a/configure/RULES_DIRS b/configure/RULES_DIRS old mode 100644 new mode 100755 diff --git a/configure/RULES_TOP b/configure/RULES_TOP old mode 100644 new mode 100755 diff --git a/iocBoot/Makefile b/iocBoot/Makefile old mode 100644 new mode 100755 diff --git a/iocBoot/iocPfeifferEDU/Makefile b/iocBoot/iocPfeifferEDU/Makefile old mode 100644 new mode 100755 diff --git a/iocBoot/iocPfeifferEDU/st.cmd b/iocBoot/iocPfeifferEDU/st.cmd index 278e10d..e9632b3 100755 --- a/iocBoot/iocPfeifferEDU/st.cmd +++ b/iocBoot/iocPfeifferEDU/st.cmd @@ -24,13 +24,51 @@ drvAsynIPPortConfigure("PUMP3","10.23.2.65:4016",0,0,0) drvAsynIPPortConfigure("PUMP4","10.23.2.65:4015",0,0,0) #asynSetTraceMask("PUMP4", 0, 0x9) #asynSetTraceIOMask("PUMP4", 0, 0x2) +drvAsynIPPortConfigure("PUMP5","10.23.2.63:4014",0,0,0) +#asynSetTraceMask("PUMP5", 0, 0x9) +#asynSetTraceIOMask("PUMP5", 0, 0x2) +drvAsynIPPortConfigure("PUMP6","10.23.2.63:4013",0,0,0) +#asynSetTraceMask("PUMP6", 0, 0x9) +#asynSetTraceIOMask("PUMP6", 0, 0x2) +drvAsynIPPortConfigure("PUMP7","10.23.2.65:4014",0,0,0) +#asynSetTraceMask("PUMP7", 0, 0x9) +#asynSetTraceIOMask("PUMP7", 0, 0x2) +drvAsynIPPortConfigure("PUMP8","10.23.2.65:4013",0,0,0) +#asynSetTraceMask("PUMP8", 0, 0x9) +#asynSetTraceIOMask("PUMP8", 0, 0x2) +drvAsynIPPortConfigure("PUMP9","10.23.2.65:4012",0,0,0) +#asynSetTraceMask("PUMP9", 0, 0x9) +#asynSetTraceIOMask("PUMP9", 0, 0x2) +drvAsynIPPortConfigure("PUMP10","10.23.2.65:4011",0,0,0) +#asynSetTraceMask("PUMP10", 0, 0x9) +#asynSetTraceIOMask("PUMP10", 0, 0x2) +drvAsynIPPortConfigure("PUMP11","10.23.2.65:4010",0,0,0) +#asynSetTraceMask("PUMP11", 0, 0x9) +#asynSetTraceIOMask("PUMP11", 0, 0x2) +drvAsynIPPortConfigure("PUMP12","10.23.2.65:4009",0,0,0) +#asynSetTraceMask("PUMP12", 0, 0x9) +#asynSetTraceIOMask("PUMP12", 0, 0x2) ## Load record instances -dbLoadRecords("db/PfeifferEDU_TC110.db","Sys=XF:23ID1-VA,Dev={Dif:LoadLck-TMP:1},ID=001,PORT=PUMP1,SCAN=2 second") -dbLoadRecords("db/PfeifferEDU_TC400.db","Sys=XF:23ID1-VA,Dev={Dif-TMP:2},ID=001,PORT=PUMP2,SCAN=2 second") -dbLoadRecords("db/PfeifferEDU_TC110.db","Sys=XF:23ID2-VA,Dev={IOXAS:LoadLck-TMP:1},ID=001,PORT=PUMP3,SCAN=2 second") -dbLoadRecords("db/PfeifferEDU_TC110.db","Sys=XF:23ID2-VA,Dev={APPES:LoadLck-TMP:1},ID=001,PORT=PUMP4,SCAN=2 second") +dbLoadRecords("db/PfeifferEDU_TC110.db","Sys=XF:23ID1-VA,Dev={Dif:LoadLck-TMP:1},ID=001,PORT=PUMP1,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC400.db","Sys=XF:23ID1-VA,Dev={Dif-TMP:2},ID=001,PORT=PUMP2,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC110.db","Sys=XF:23ID2-VA,Dev={IOXAS:LoadLck-TMP:1},ID=001,PORT=PUMP3,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC110.db","Sys=XF:23ID2-VA,Dev={APPES:LoadLck-TMP:1},ID=001,PORT=PUMP4,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC110.db","Sys=XF:23ID1-VA,Dev={Dif:Seal-TMP:1},ID=001,PORT=PUMP5,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC110.db","Sys=XF:23ID1-VA,Dev={Dif:Wdw-TMP:1},ID=001,PORT=PUMP6,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC400.db","Sys=XF:23ID2-VA,Dev={APPES-TMP:4},ID=001,PORT=PUMP7,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC400.db","Sys=XF:23ID2-VA,Dev={APPES-TMP:1},ID=001,PORT=PUMP8,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC400.db","Sys=XF:23ID2-VA,Dev={APPES-TMP:2},ID=001,PORT=PUMP9,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC400.db","Sys=XF:23ID2-VA,Dev={APPES-TMP:3},ID=001,PORT=PUMP10,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC110.db","Sys=XF:23ID2-VA,Dev={APPES-TMP:5},ID=001,PORT=PUMP11,SCAN=1 second") +dbLoadRecords("db/PfeifferEDU_TC110.db","Sys=XF:23ID2-VA,Dev={APPES-TMP:6},ID=001,PORT=PUMP12,SCAN=1 second") + +asSetSubstitutions("WS=csxws1") +asSetFilename("/epics/xf/23id/xf23id.acf") + iocInit() +caPutLogInit("xf23id-ca.cs.nsls2.local:7004", 0) + dbl > $(TOP)/records.dbl system("cp $(TOP)/records.dbl /cf-update/xf23id1-ioc3.es-pfeiffer.dbl") diff --git a/proto/pfeiffer.proto b/proto/pfeiffer.proto old mode 100644 new mode 100755 index e3a10fd..b09fa8d --- a/proto/pfeiffer.proto +++ b/proto/pfeiffer.proto @@ -1,5 +1,27 @@ Terminator = CR; + +writePumpOn { + out "\$11001206000000%+"; + in "\$11001206000000%+"; + out "\$11001006111111%+"; + in "\$11001006111111%+"; +} + +writePumpOff { + out "\$11001206000000%+"; + in "\$11001206000000%+"; + out "\$11001006000000%+"; + in "\$11001006000000%+"; +} + +writePumpOffVent { + out "\$11001206111111%+"; + in "\$11001206111111%+"; + out "\$11001006000000%+"; + in "\$11001006000000%+"; +} + readBoolParam { out "\$100\$202=?%+"; in "\$110\$206%{000000|111111}%+";