Skip to content

Added maxRetries to flexCombinedMotion #17

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

Merged
keenanlang merged 1 commit into from
Feb 25, 2026
Merged

Added maxRetries to flexCombinedMotion #17

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions opticsApp/Db/flexCombinedMotion.db
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,12 @@ record(longout, "$(P)$(M):retries")
field(VAL, "0")
}

record(longout, "$(P)$(M):maxRetries")
{
field(DESC, "Coarse motor max retries")
field(VAL, "10")
}

record(ao, "$(P)$(M):setPoint")
{
field(DESC, "Combined-motion target")
Expand Down
1 change: 1 addition & 0 deletions opticsApp/Db/flexCombinedMotion_settings.req
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ $(P)$(M):setPoint.DESC
$(P)$(M):setPoint.PREC
$(P)$(M):deadband.VAL
$(P)$(M):deadband.PREC
$(P)$(M):maxRetries.VAL
$(P)$(M):upperLimit.VAL
$(P)$(M):upperLimit.PREC
$(P)$(M):homePos.VAL
Expand Down
178 changes: 103 additions & 75 deletions opticsApp/op/adl/flexCombinedMotion.adl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@

file {
name="/home/beams3/KPETERSN/development/github-forks/optics/opticsApp/op/adl/flexCombinedMotion.adl"
name="/net/s9dserv/xorApps/epics/synApps_6_3/support/optics-git/opticsApp/op/adl/flexCombinedMotion.adl"
version=030111
}
display {
object {
x=616
y=127
x=606
y=119
width=210
height=302
height=325
}
clr=14
bclr=4
Expand Down Expand Up @@ -295,10 +295,39 @@ composite {
}
}
}
text {
object {
x=13
y=198
width=75
height=18
}
"basic attribute" {
clr=14
fill="outline"
}
textix="Busy"
}
"text update" {
object {
x=93
y=198
width=100
height=18
}
monitor {
chan="$(P)$(M):busy"
clr=54
bclr=3
}
format="string"
limits {
}
}
composite {
object {
x=13
y=267
y=221
width=180
height=18
}
Expand All @@ -307,35 +336,69 @@ composite {
text {
object {
x=13
y=267
y=221
width=75
height=18
}
"basic attribute" {
clr=14
fill="outline"
}
textix="Mode"
textix="Retries"
}
menu {
"text update" {
object {
x=93
y=267
y=221
width=100
height=18
}
control {
chan="$(P)$(M):mode"
clr=14
monitor {
chan="$(P)$(M):retries"
clr=54
bclr=3
}
format="string"
limits {
}
}
}
}
"text update" {
object {
x=93
y=152
width=100
height=18
}
monitor {
chan="$(P)$(M):rehome"
clr=54
bclr=3
}
format="string"
limits {
}
}
"message button" {
object {
x=13
y=152
width=75
height=18
}
control {
chan="$(P)$(M):rehome"
clr=54
bclr=3
}
label="Rehome"
press_msg="1"
}
composite {
object {
x=13
y=244
y=267
width=176
height=18
}
Expand All @@ -344,7 +407,7 @@ composite {
text {
object {
x=13
y=244
y=267
width=75
height=18
}
Expand All @@ -357,7 +420,7 @@ composite {
"text entry" {
object {
x=93
y=244
y=267
width=96
height=18
}
Expand All @@ -371,39 +434,10 @@ composite {
}
}
}
text {
object {
x=13
y=198
width=75
height=18
}
"basic attribute" {
clr=14
fill="outline"
}
textix="Busy"
}
"text update" {
object {
x=93
y=198
width=100
height=18
}
monitor {
chan="$(P)$(M):busy"
clr=54
bclr=3
}
format="string"
limits {
}
}
composite {
object {
x=13
y=221
y=290
width=180
height=18
}
Expand All @@ -412,62 +446,56 @@ composite {
text {
object {
x=13
y=221
y=290
width=75
height=18
}
"basic attribute" {
clr=14
fill="outline"
}
textix="Retries"
textix="Mode"
}
"text update" {
menu {
object {
x=93
y=221
y=290
width=100
height=18
}
monitor {
chan="$(P)$(M):retries"
clr=54
control {
chan="$(P)$(M):mode"
clr=14
bclr=3
}
format="string"
limits {
}
}
}
}
"text update" {
text {
object {
x=93
y=152
width=100
x=13
y=244
width=75
height=18
}
monitor {
chan="$(P)$(M):rehome"
clr=54
bclr=3
}
format="string"
limits {
"basic attribute" {
clr=14
fill="outline"
}
textix="Max Retries"
}
"message button" {
"text entry" {
object {
x=13
y=152
width=75
x=93
y=244
width=96
height=18
}
control {
chan="$(P)$(M):rehome"
clr=54
bclr=3
chan="$(P)$(M):maxRetries"
clr=14
bclr=50
}
limits {
}
label="Rehome"
press_msg="1"
}
Loading
Loading