Skip to content

Fix usage when AXIS1 and AXIS2 are not defined #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix usage when AXIS1 and AXIS2 are not defined #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions motionSetPointsApp/Db/motionSetPoints.db
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ record(stringin, "$(P)COORD2:NAME")
}


alias("$(AXIS1):MTR","$(P)COORD1:MTR")
alias("$(AXIS2=$(AXIS1)):MTR","$(P)COORD2:MTR")
alias("$(AXIS1=):MTR","$(P)COORD1:MTR")
alias("$(AXIS2=$(AXIS1=)):MTR","$(P)COORD2:MTR")


record(stringin, "$(P)POSN:SP:RBV")
Expand Down Expand Up @@ -75,8 +75,8 @@ record(scalcout, "$(P)POSN_CALC")
{
field(DESC, "Add error to current position")
field(INAA, "$(P)POSN_NO_ERR")
field(INPA, "$(TARGET_RBV1=$(AXIS1)) MS")
field(INPB, "$(TARGET_RBV2=$(TARGET_RBV1=$(AXIS2=$(AXIS1)))) MS")
field(INPA, "$(TARGET_RBV1=$(AXIS1=)) MS")
field(INPB, "$(TARGET_RBV2=$(TARGET_RBV1=$(AXIS2=$(AXIS1=)))) MS")

field(CALC, "AA")
field(OUT, "$(P)POSN MS")
Expand All @@ -103,7 +103,7 @@ record(ai, "$(P)STATIONARY")
{
field(DESC, "Is sample in position")
field(SCAN, "1 second")
field(INP, "$(TARGET_DONE=$(AXIS1):DMOV)")
field(INP, "$(TARGET_DONE=$(AXIS1=):DMOV)")
field(FLNK, "$(P)POSITIONED")
field(EGU, "")
info(INTEREST, "HIGH")
Expand Down Expand Up @@ -174,10 +174,10 @@ record(dfanout, "$(P)INT:WRITE1")
field(DESC, "Pushes COORD1 to motor")
field(DOL, "$(P)COORD1")
field(OMSL, "closed_loop")
field(OUTA, "$(TARGET_PV1=$(AXIS1):SP)")
field(OUTA, "$(TARGET_PV1=$(AXIS1=):SP)")
field(SELM, "Mask")
field(SELN, "1")
field(FLNK, "$(TARGET_PV1=$(AXIS1):SP)")
field(FLNK, "$(TARGET_PV1=$(AXIS1=):SP)")
}

record(ao, "$(P)COORD1:RBV")
Expand Down Expand Up @@ -218,7 +218,7 @@ record(dfanout, "$(P)INT:READ1")
{
field(DESC, "Updates COORD1:RBV")
field(SCAN, "1 second")
field(DOL, "$(TARGET_RBV1=$(AXIS1)) MS")
field(DOL, "$(TARGET_RBV1=$(AXIS1=)) MS")
field(OMSL, "closed_loop")
field(OUTA, "$(P)COORD1:RBV MS")
field(SELM, "Mask")
Expand Down Expand Up @@ -377,8 +377,8 @@ record(ai, "$(P)TOLERENCE")
record(calc, "$(P)POSITIONED")
{
field(SCAN, "1 second")
field(INPA, "$(TARGET_DONE=$(AXIS1):DMOV) MS")
field(INPB, "$(TARGET_DONE2=$(TARGET_DONE=$(AXIS2=$(AXIS1)):DMOV)) MS")
field(INPA, "$(TARGET_DONE=$(AXIS1=):DMOV) MS")
field(INPB, "$(TARGET_DONE2=$(TARGET_DONE=$(AXIS2=$(AXIS1=)):DMOV)) MS")
field(INPC, "$(P)NUMAXES")
field(CALC, "C==1?A:A&&B")
}
Expand Down