Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
14 changes: 9 additions & 5 deletions sscanApp/Db/saveData.db
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,33 @@ record(stringout, "$(P)saveData_comment2") {
field(DTYP, "Soft Channel")
}

record(stringout, "$(P)saveData_fileName") {
record(lso, "$(P)saveData_fileName") {
field(DTYP, "Soft Channel")
field(SIZV, "256")
}

record(stringout, "$(P)saveData_fileSystem") {
record(lso, "$(P)saveData_fileSystem") {
field(DTYP, "Soft Channel")
field(SIZV, "256")
}

record(stringout, "$(P)saveData_message") {
field(DTYP, "Soft Channel")
}

record(stringout, "$(P)saveData_subDir") {
record(lso, "$(P)saveData_subDir") {
field(DTYP, "Soft Channel")
field(SIZV, "256")
}

record(stringout, "$(P)saveData_baseName") {
record(lso, "$(P)saveData_baseName") {
field(DTYP, "Soft Channel")
field(SIZV, "256")
}

record(waveform, "$(P)saveData_fullPathName") {
field(DTYP, "Soft Channel")
field(NELM, "100")
field(NELM, "512")
field(FTVL, "CHAR")
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you miss this record intentionally?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That has always been a waveform, so I didn't necessarily want to change it and potentially affect functionality beyond what was asked for. But if the recommendation is to phase out waveforms, I will change it.


Expand Down
6 changes: 3 additions & 3 deletions sscanApp/Db/saveData_settings.req
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$(P)saveData_fileSystem
$(P)saveData_subDir
$(P)saveData_baseName
$(P)saveData_fileSystem.$
$(P)saveData_subDir.$
$(P)saveData_baseName.$
$(P)saveData_scanNumber
$(P)saveData_realTime1D
$(P)saveData_maxAllowedRetries
Expand Down
206 changes: 92 additions & 114 deletions sscanApp/op/adl/scan_saveData.adl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

file {
name="/home/oxygen4/MOONEY/epics/synAppsSVN/support/sscan/sscanApp/op/adl/scan_saveData.adl"
version=030107
name="/home/beams1/KLANG/Documents/Projects/Repository/git/sscan/sscanApp/op/adl/scan_saveData.adl"
version=030111
}
display {
object {
Expand Down Expand Up @@ -107,7 +107,7 @@ text {
height=20
}
control {
chan="$(P)saveData_fileSystem"
chan="$(P)saveData_fileSystem.$"
clr=14
bclr=51
}
Expand Down Expand Up @@ -238,58 +238,47 @@ text {
}
textix="Example: //"
}
composite {
text {
object {
x=10
y=63
width=80
height=14
}
"basic attribute" {
clr=14
}
textix="Subdirectory"
}
"text entry" {
object {
x=100
y=60
width=380
width=260
height=20
}
"composite name"=""
children {
text {
object {
x=10
y=63
width=80
height=14
}
"basic attribute" {
clr=14
}
textix="Subdirectory"
}
"text entry" {
object {
x=100
y=60
width=260
height=20
}
control {
chan="$(P)saveData_subDir"
clr=14
bclr=51
}
format="string"
limits {
}
}
"text entry" {
object {
x=370
y=60
width=20
height=20
}
control {
chan="$(P)saveData_subDir.DISP"
clr=14
bclr=51
}
limits {
}
}
control {
chan="$(P)saveData_subDir.$"
clr=14
bclr=51
}
format="string"
limits {
}
}
"text entry" {
object {
x=370
y=60
width=20
height=20
}
control {
chan="$(P)saveData_subDir.DISP"
clr=14
bclr=51
}
limits {
}
}
text {
Expand All @@ -312,7 +301,7 @@ text {
height=20
}
control {
chan="$(P)saveData_baseName"
chan="$(P)saveData_baseName.$"
clr=14
bclr=51
}
Expand Down Expand Up @@ -746,74 +735,63 @@ composite {
}
}
}
composite {
"text update" {
object {
x=50
y=150
width=340
height=14
}
monitor {
chan="$(P)saveData_fileName.$"
clr=53
bclr=1
}
format="string"
limits {
}
}
"text update" {
object {
x=50
y=130
width=340
height=14
}
monitor {
chan="$(P)saveData_fullPathName"
clr=53
bclr=1
}
format="string"
limits {
}
}
text {
object {
x=10
y=130
width=380
height=34
width=40
height=14
}
"composite name"=""
children {
"text update" {
object {
x=50
y=150
width=340
height=14
}
monitor {
chan="$(P)saveData_fileName"
clr=53
bclr=1
}
format="string"
limits {
}
}
"text update" {
object {
x=50
y=130
width=340
height=14
}
monitor {
chan="$(P)saveData_fullPathName"
clr=53
bclr=1
}
format="string"
limits {
}
}
text {
object {
x=10
y=130
width=40
height=14
}
"basic attribute" {
clr=14
}
textix="PATH:"
align="horiz. centered"
}
text {
object {
x=10
y=150
width=40
height=14
}
"basic attribute" {
clr=14
}
textix="NAME:"
align="horiz. centered"
}
"basic attribute" {
clr=14
}
textix="PATH:"
align="horiz. centered"
}
text {
object {
x=10
y=150
width=40
height=14
}
"basic attribute" {
clr=14
}
textix="NAME:"
align="horiz. centered"
}
text {
object {
Expand Down
Loading
Loading