Skip to content

Commit

Permalink
Fixed another bug in a description field causing db to not load.
Browse files Browse the repository at this point in the history
  • Loading branch information
@NSLentz
NSLentz committed Aug 20, 2024
1 parent 88e4f82 commit db8d3f7
Show file tree
Hide file tree
Showing 3 changed files with 139 additions and 64 deletions.
48 changes: 24 additions & 24 deletions iocBoot/ioc-mrco-motion/mrco_motion.db
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4577,8 +4577,8 @@ record(ao, "TMO:MRCO:SP:Gamma") {
}

record(ai, "TMO:MRCO:SP:PTransform3D:fADeg_RBV") {
# alpha, the acute angle in degrees between motor axis "x" and resultant coordinate system "x".
field(DESC, "alpha, the acute ang...inate system "x".")
# alpha, the acute angle in degrees between motor axis x and resultant coordinate system x.
field(DESC, "alpha, the acute ang...rdinate system x.")
field(SCAN, "I/O Intr")
field(PINI, "1")
field(TSE, "-2")
Expand All @@ -4590,8 +4590,8 @@ record(ai, "TMO:MRCO:SP:PTransform3D:fADeg_RBV") {
}

record(ao, "TMO:MRCO:SP:PTransform3D:fADeg") {
# alpha, the acute angle in degrees between motor axis "x" and resultant coordinate system "x".
field(DESC, "alpha, the acute ang...inate system "x".")
# alpha, the acute angle in degrees between motor axis x and resultant coordinate system x.
field(DESC, "alpha, the acute ang...rdinate system x.")
field(DTYP, "asynFloat64")
field(UDFS, "0")
field(OUT, "@asyn($(PORT),0,1)ADSPORT=851/Main.stPMotionTransform3D.fADeg=")
Expand All @@ -4601,8 +4601,8 @@ record(ao, "TMO:MRCO:SP:PTransform3D:fADeg") {
}

record(ai, "TMO:MRCO:SP:PTransform3D:fBDeg_RBV") {
# beta, the acute angle in degrees between motor axis "y" and resultant coordinate system "y".
field(DESC, "beta, the acute angl...inate system "y".")
# beta, the acute angle in degrees between motor axis y and resultant coordinate system y.
field(DESC, "beta, the acute angl...rdinate system y.")
field(SCAN, "I/O Intr")
field(PINI, "1")
field(TSE, "-2")
Expand All @@ -4614,8 +4614,8 @@ record(ai, "TMO:MRCO:SP:PTransform3D:fBDeg_RBV") {
}

record(ao, "TMO:MRCO:SP:PTransform3D:fBDeg") {
# beta, the acute angle in degrees between motor axis "y" and resultant coordinate system "y".
field(DESC, "beta, the acute angl...inate system "y".")
# beta, the acute angle in degrees between motor axis y and resultant coordinate system y.
field(DESC, "beta, the acute angl...rdinate system y.")
field(DTYP, "asynFloat64")
field(UDFS, "0")
field(OUT, "@asyn($(PORT),0,1)ADSPORT=851/Main.stPMotionTransform3D.fBDeg=")
Expand All @@ -4625,8 +4625,8 @@ record(ao, "TMO:MRCO:SP:PTransform3D:fBDeg") {
}

record(ai, "TMO:MRCO:SP:PTransform3D:fGDeg_RBV") {
# gamma, the acute angle in degrees between motor axis "z" and resultant coordinate system "z".
field(DESC, "gamma, the acute ang...inate system "z".")
# gamma, the acute angle in degrees between motor axis z and resultant coordinate system z.
field(DESC, "gamma, the acute ang...rdinate system z.")
field(SCAN, "I/O Intr")
field(PINI, "1")
field(TSE, "-2")
Expand All @@ -4638,8 +4638,8 @@ record(ai, "TMO:MRCO:SP:PTransform3D:fGDeg_RBV") {
}

record(ao, "TMO:MRCO:SP:PTransform3D:fGDeg") {
# gamma, the acute angle in degrees between motor axis "z" and resultant coordinate system "z".
field(DESC, "gamma, the acute ang...inate system "z".")
# gamma, the acute angle in degrees between motor axis z and resultant coordinate system z.
field(DESC, "gamma, the acute ang...rdinate system z.")
field(DTYP, "asynFloat64")
field(UDFS, "0")
field(OUT, "@asyn($(PORT),0,1)ADSPORT=851/Main.stPMotionTransform3D.fGDeg=")
Expand Down Expand Up @@ -4838,8 +4838,8 @@ record(ao, "TMO:MRCO:SP:PTransform3D:fZSP") {
}

record(ai, "TMO:MRCO:SP:VTransform3D:fADeg_RBV") {
# alpha, the acute angle in degrees between motor axis "x" and resultant coordinate system "x".
field(DESC, "alpha, the acute ang...inate system "x".")
# alpha, the acute angle in degrees between motor axis x and resultant coordinate system x.
field(DESC, "alpha, the acute ang...rdinate system x.")
field(SCAN, "I/O Intr")
field(PINI, "1")
field(TSE, "-2")
Expand All @@ -4851,8 +4851,8 @@ record(ai, "TMO:MRCO:SP:VTransform3D:fADeg_RBV") {
}

record(ao, "TMO:MRCO:SP:VTransform3D:fADeg") {
# alpha, the acute angle in degrees between motor axis "x" and resultant coordinate system "x".
field(DESC, "alpha, the acute ang...inate system "x".")
# alpha, the acute angle in degrees between motor axis x and resultant coordinate system x.
field(DESC, "alpha, the acute ang...rdinate system x.")
field(DTYP, "asynFloat64")
field(UDFS, "0")
field(OUT, "@asyn($(PORT),0,1)ADSPORT=851/Main.stVMotionTransform3D.fADeg=")
Expand All @@ -4862,8 +4862,8 @@ record(ao, "TMO:MRCO:SP:VTransform3D:fADeg") {
}

record(ai, "TMO:MRCO:SP:VTransform3D:fBDeg_RBV") {
# beta, the acute angle in degrees between motor axis "y" and resultant coordinate system "y".
field(DESC, "beta, the acute angl...inate system "y".")
# beta, the acute angle in degrees between motor axis y and resultant coordinate system y.
field(DESC, "beta, the acute angl...rdinate system y.")
field(SCAN, "I/O Intr")
field(PINI, "1")
field(TSE, "-2")
Expand All @@ -4875,8 +4875,8 @@ record(ai, "TMO:MRCO:SP:VTransform3D:fBDeg_RBV") {
}

record(ao, "TMO:MRCO:SP:VTransform3D:fBDeg") {
# beta, the acute angle in degrees between motor axis "y" and resultant coordinate system "y".
field(DESC, "beta, the acute angl...inate system "y".")
# beta, the acute angle in degrees between motor axis y and resultant coordinate system y.
field(DESC, "beta, the acute angl...rdinate system y.")
field(DTYP, "asynFloat64")
field(UDFS, "0")
field(OUT, "@asyn($(PORT),0,1)ADSPORT=851/Main.stVMotionTransform3D.fBDeg=")
Expand All @@ -4886,8 +4886,8 @@ record(ao, "TMO:MRCO:SP:VTransform3D:fBDeg") {
}

record(ai, "TMO:MRCO:SP:VTransform3D:fGDeg_RBV") {
# gamma, the acute angle in degrees between motor axis "z" and resultant coordinate system "z".
field(DESC, "gamma, the acute ang...inate system "z".")
# gamma, the acute angle in degrees between motor axis z and resultant coordinate system z.
field(DESC, "gamma, the acute ang...rdinate system z.")
field(SCAN, "I/O Intr")
field(PINI, "1")
field(TSE, "-2")
Expand All @@ -4899,8 +4899,8 @@ record(ai, "TMO:MRCO:SP:VTransform3D:fGDeg_RBV") {
}

record(ao, "TMO:MRCO:SP:VTransform3D:fGDeg") {
# gamma, the acute angle in degrees between motor axis "z" and resultant coordinate system "z".
field(DESC, "gamma, the acute ang...inate system "z".")
# gamma, the acute angle in degrees between motor axis z and resultant coordinate system z.
field(DESC, "gamma, the acute ang...rdinate system z.")
field(DTYP, "asynFloat64")
field(UDFS, "0")
field(OUT, "@asyn($(PORT),0,1)ADSPORT=851/Main.stVMotionTransform3D.fGDeg=")
Expand Down
6 changes: 3 additions & 3 deletions lcls-plc-mrco-motion/mrco_motion/DUTs/ST_MotionTransform3D.TcDUT
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ STRUCT
{attribute 'pytmc' := '
pv: fADeg
io: io
field: DESC alpha, the acute angle in degrees between motor axis "x" and resultant coordinate system "x".
field: DESC alpha, the acute angle in degrees between motor axis x and resultant coordinate system x.
'}
fADeg: LREAL; // "alpha" - the acute angle in degrees between motor axis "x" and resultant coordinate system "x".
{attribute 'pytmc' := '
pv: fBDeg
io: io
field: DESC beta, the acute angle in degrees between motor axis "y" and resultant coordinate system "y".
field: DESC beta, the acute angle in degrees between motor axis y and resultant coordinate system y.
'}
fBDeg: LREAL; // "beta" - the acute angle in degrees between motor axis "y" and resultant coordinate system "y".
{attribute 'pytmc' := '
pv: fGDeg
io: io
field: DESC gamma, the acute angle in degrees between motor axis "z" and resultant coordinate system "z".
field: DESC gamma, the acute angle in degrees between motor axis z and resultant coordinate system z.
'}
fGDeg: LREAL; // "gamma" - The acute angle in degrees between motor axis "z" and resultant coordinate system "z".
Expand Down
Loading

0 comments on commit db8d3f7

Please sign in to comment.