Skip to content
Snippets Groups Projects
Commit 10c46351 authored by Gabriel Fedel's avatar Gabriel Fedel :speech_balloon:
Browse files

Merge branch 'next' into 'master' 

Fixes on auto save and control table update

See merge request !17
parents f4716350 b428cc12
No related branches found
Tags 5.1.0
1 merge request!17Fixes on auto save and control table update
Hide whitespace changes
Inline Side-by-side
db/sis8300llrf-Main-Aux-CG.template
+ 7
− 6
View file @ 10c46351
...@@ -28,6 +28,7 @@ record(bo, "$(P)$(R)ChGrpDwnEn") { ...@@ -28,6 +28,7 @@ record(bo, "$(P)$(R)ChGrpDwnEn") {
field(FLNK, "$(P)$(R)#ChGrpDwnEnSeq") field(FLNK, "$(P)$(R)#ChGrpDwnEnSeq")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "0")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
...@@ -64,6 +65,7 @@ record(bo, "$(P)$(R)ChGrpDwnEnTransf") { ...@@ -64,6 +65,7 @@ record(bo, "$(P)$(R)ChGrpDwnEnTransf") {
field(FLNK, "$(P)$(R)#ChGrpDwnEnTransfSeq") field(FLNK, "$(P)$(R)#ChGrpDwnEnTransfSeq")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "0")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
...@@ -100,6 +102,7 @@ record(bo, "$(P)$(R)ChGrpDwnDecEn") { ...@@ -100,6 +102,7 @@ record(bo, "$(P)$(R)ChGrpDwnDecEn") {
field(FLNK, "$(P)$(R)#ChGrpDwnDecEnSeq") field(FLNK, "$(P)$(R)#ChGrpDwnDecEnSeq")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "0")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
...@@ -138,8 +141,7 @@ record(ao, "$(P)$(R)ChGrpDwnSmpNm") { ...@@ -138,8 +141,7 @@ record(ao, "$(P)$(R)ChGrpDwnSmpNm") {
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
field(DRVL, "1") field(DRVL, "1")
field(DRVH, "$(AI_NELM)") field(DRVH, "$(AI_NELM)")
field(VAL, "$(SMNM_AUX="32")") field(VAL, "$(SMNM_AUX="35000")")
field(PINI, "YES")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
...@@ -175,7 +177,6 @@ record(ao, "$(P)$(R)ChGrpDwnDecF") { ...@@ -175,7 +177,6 @@ record(ao, "$(P)$(R)ChGrpDwnDecF") {
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
field(VAL, "$(DECFAC_AUX="1")") field(VAL, "$(DECFAC_AUX="1")")
field(PINI, "YES")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
...@@ -214,7 +215,6 @@ record(mbbo, "$(P)$(R)ChGrpDwnFmt") { ...@@ -214,7 +215,6 @@ record(mbbo, "$(P)$(R)ChGrpDwnFmt") {
field(TWVL, "2") field(TWVL, "2")
field(TWST, "DC") field(TWST, "DC")
field(VAL, "0") field(VAL, "0")
field(PINI, "YES")
field(FLNK, "$(P)$(R)#ChGrpDwnFmtSeq") field(FLNK, "$(P)$(R)#ChGrpDwnFmtSeq")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
...@@ -258,6 +258,7 @@ record(bo, "$(P)$(R)ChGrpIntEn") { ...@@ -258,6 +258,7 @@ record(bo, "$(P)$(R)ChGrpIntEn") {
field(FLNK, "$(P)$(R)#ChGrpIntEnSeq") field(FLNK, "$(P)$(R)#ChGrpIntEnSeq")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "0")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
...@@ -286,6 +287,7 @@ record(bo, "$(P)$(R)ChGrpIntEnTransf") { ...@@ -286,6 +287,7 @@ record(bo, "$(P)$(R)ChGrpIntEnTransf") {
field(FLNK, "$(P)$(R)#ChGrpIntEnTransfSeq") field(FLNK, "$(P)$(R)#ChGrpIntEnTransfSeq")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "0")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
...@@ -314,6 +316,7 @@ record(bo, "$(P)$(R)ChGrpIntDecEn") { ...@@ -314,6 +316,7 @@ record(bo, "$(P)$(R)ChGrpIntDecEn") {
field(FLNK, "$(P)$(R)#ChGrpIntDecEnSeq") field(FLNK, "$(P)$(R)#ChGrpIntDecEnSeq")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "0")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
...@@ -341,7 +344,6 @@ record(ao, "$(P)$(R)ChGrpIntSmpNm") { ...@@ -341,7 +344,6 @@ record(ao, "$(P)$(R)ChGrpIntSmpNm") {
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
field(VAL, "$(SMNM_AUX="32")") field(VAL, "$(SMNM_AUX="32")")
field(PINI, "YES")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
...@@ -369,7 +371,6 @@ record(ao, "$(P)$(R)ChGrpIntDecF") { ...@@ -369,7 +371,6 @@ record(ao, "$(P)$(R)ChGrpIntDecF") {
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
field(VAL, "$(DECFAC_AUX="1")") field(VAL, "$(DECFAC_AUX="1")")
field(PINI, "YES")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
......
db/sis8300llrf-Main-DownSampled-CH.template
+ 4
− 4
View file @ 10c46351
...@@ -11,6 +11,7 @@ record(bo, "$(P)$(R)$(CHANNEL_ID)-En") { ...@@ -11,6 +11,7 @@ record(bo, "$(P)$(R)$(CHANNEL_ID)-En") {
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnable") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnable")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "$(ENDWNVAL=0)")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
...@@ -48,8 +49,7 @@ record(ao, "$(P)$(R)$(CHANNEL_ID)-SmpNm") { ...@@ -48,8 +49,7 @@ record(ao, "$(P)$(R)$(CHANNEL_ID)-SmpNm") {
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXSamplesCount") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXSamplesCount")
field(DRVL, "1") field(DRVL, "1")
field(DRVH, "$(AI_NELM)") field(DRVH, "$(AI_NELM)")
field(VAL, "32") field(VAL, "$(SMNM_AUX="35000")")
field(PINI, "YES")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
...@@ -72,6 +72,7 @@ record(bo, "$(P)$(R)$(CHANNEL_ID)-DecEn") { ...@@ -72,6 +72,7 @@ record(bo, "$(P)$(R)$(CHANNEL_ID)-DecEn") {
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXDecEnable") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXDecEnable")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "0")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
...@@ -97,7 +98,6 @@ record(ao, "$(P)$(R)$(CHANNEL_ID)-DecF") { ...@@ -97,7 +98,6 @@ record(ao, "$(P)$(R)$(CHANNEL_ID)-DecF") {
field(DTYP, "asynInt32") field(DTYP, "asynInt32")
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXDecFactor") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXDecFactor")
field(VAL, "1") field(VAL, "1")
field(PINI, "YES")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
...@@ -134,6 +134,7 @@ record(bo, "$(P)$(R)$(CHANNEL_ID)-EnTransf") { ...@@ -134,6 +134,7 @@ record(bo, "$(P)$(R)$(CHANNEL_ID)-EnTransf") {
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnableTransf") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnableTransf")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "$(ENDWNVAL=1)")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
...@@ -152,7 +153,6 @@ record(mbbo, "$(P)$(R)$(CHANNEL_ID)-Fmt") { ...@@ -152,7 +153,6 @@ record(mbbo, "$(P)$(R)$(CHANNEL_ID)-Fmt") {
field(TWVL, "2") field(TWVL, "2")
field(TWST, "DC") field(TWST, "DC")
field(VAL, "0") field(VAL, "0")
field(PINI, "YES")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
......
db/sis8300llrf-Main-Internal-CH.template
+ 5
− 5
View file @ 10c46351
...@@ -11,6 +11,7 @@ record(bo, "$(P)$(R)IntCh$(CHANNEL_ID)En") { ...@@ -11,6 +11,7 @@ record(bo, "$(P)$(R)IntCh$(CHANNEL_ID)En") {
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnable") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnable")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "$(ENINTVAL=1)")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
...@@ -48,8 +49,7 @@ record(ao, "$(P)$(R)IntCh$(CHANNEL_ID)SmpNm") { ...@@ -48,8 +49,7 @@ record(ao, "$(P)$(R)IntCh$(CHANNEL_ID)SmpNm") {
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXSamplesCount") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXSamplesCount")
field(DRVL, "1") field(DRVL, "1")
field(DRVH, "$(AI_NELM)") field(DRVH, "$(AI_NELM)")
field(VAL, "32") field(VAL, "35000")
field(PINI, "YES")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
...@@ -72,6 +72,7 @@ record(bo, "$(P)$(R)IntCh$(CHANNEL_ID)DecEn") { ...@@ -72,6 +72,7 @@ record(bo, "$(P)$(R)IntCh$(CHANNEL_ID)DecEn") {
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXDecEnable") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXDecEnable")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "0")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
...@@ -96,8 +97,7 @@ record(ao, "$(P)$(R)IntCh$(CHANNEL_ID)DecF") { ...@@ -96,8 +97,7 @@ record(ao, "$(P)$(R)IntCh$(CHANNEL_ID)DecF") {
info(DESCRIPTION, "Decimation factor") info(DESCRIPTION, "Decimation factor")
field(DTYP, "asynInt32") field(DTYP, "asynInt32")
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXDecFactor") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXDecFactor")
field(VAL, "1") field(VAL, "0")
field(PINI, "YES")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
...@@ -134,9 +134,9 @@ record(bo, "$(P)$(R)IntCh$(CHANNEL_ID)EnTransf") { ...@@ -134,9 +134,9 @@ record(bo, "$(P)$(R)IntCh$(CHANNEL_ID)EnTransf") {
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnableTransf") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnableTransf")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "$(ENINTVAL=1)")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
field(PINI, "YES")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
......
db/sis8300llrf-Main-PIERRILC-CH.template
+ 3
− 3
View file @ 10c46351
...@@ -11,6 +11,7 @@ record(bo, "$(P)$(R)IntCh$(CHANNEL_ID)En") { ...@@ -11,6 +11,7 @@ record(bo, "$(P)$(R)IntCh$(CHANNEL_ID)En") {
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnable") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnable")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "$(ENINTVAL=1)")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
...@@ -47,8 +48,7 @@ record(ao, "$(P)$(R)IntCh$(CHANNEL_ID)SmpNm") { ...@@ -47,8 +48,7 @@ record(ao, "$(P)$(R)IntCh$(CHANNEL_ID)SmpNm") {
field(DTYP, "asynInt32") field(DTYP, "asynInt32")
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXSamplesCount") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXSamplesCount")
field(DRVL, "32") field(DRVL, "32")
field(VAL, "32") field(VAL, "35000")
field(PINI, "YES")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
...@@ -85,9 +85,9 @@ record(bo, "$(P)$(R)IntCh$(CHANNEL_ID)EnTransf") { ...@@ -85,9 +85,9 @@ record(bo, "$(P)$(R)IntCh$(CHANNEL_ID)EnTransf") {
field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnableTransf") field(OUT, "@asyn( $(ASYN_PORT).aux, $(ASYN_ADDR)) AUXEnableTransf")
field(ZNAM, "Disabled") field(ZNAM, "Disabled")
field(ONAM, "Enabled") field(ONAM, "Enabled")
field(VAL, "$(ENINTVAL=1)")
field(STAT, "NO_ALARM") field(STAT, "NO_ALARM")
field(SEVR, "NO_ALARM") field(SEVR, "NO_ALARM")
field(PINI, "YES")
info(autosaveFields, "VAL") info(autosaveFields, "VAL")
info(SYSTEM, "LLRF") info(SYSTEM, "LLRF")
} }
......
db/sis8300llrf.substitutions
+ 11
− 11
View file @ 10c46351
...@@ -149,17 +149,17 @@ file sis8300llrf-Main-ControlTable-CG.template ...@@ -149,17 +149,17 @@ file sis8300llrf-Main-ControlTable-CG.template
####### DOWNSAMPLED AND INERNAL ########## ####### DOWNSAMPLED AND INERNAL ##########
file sis8300llrf-Main-DownSampled-CH.template file sis8300llrf-Main-DownSampled-CH.template
{ {
pattern{CHANNEL_ID, ASYN_ADDR} pattern{CHANNEL_ID, ASYN_ADDR, ENDWNVAL}
{Dwn0, 0} {Dwn0, 0, 1}
{Dwn1, 1} {Dwn1, 1, 1}
{Dwn2, 2} {Dwn2, 2, 1}
{Dwn3, 3} {Dwn3, 3, 1}
{Dwn4, 4} {Dwn4, 4, 1}
{Dwn5, 5} {Dwn5, 5, 1}
{Dwn6, 6} {Dwn6, 6, 1}
{Dwn7, 7} {Dwn7, 7, 1}
{Dwn8, 8} {Dwn8, 8, 0}
{Dwn9, 9} {Dwn9, 9, 0}
} }
file sis8300llrf-Main-Internal-CH.template file sis8300llrf-Main-Internal-CH.template
......
iocsh/sis8300llrf.iocsh
+ 0
− 19
View file @ 10c46351
...@@ -43,25 +43,6 @@ afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):AI7-En 1") ...@@ -43,25 +43,6 @@ afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):AI7-En 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):AI0-En.DISP 1") afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):AI0-En.DISP 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):AI1-En.DISP 1") afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):AI1-En.DISP 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn0-En 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn1-En 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn2-En 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn3-En 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn4-En 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn5-En 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn6-En 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn7-En 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn0-EnTransf 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn1-EnTransf 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn2-EnTransf 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn3-EnTransf 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn4-EnTransf 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn5-EnTransf 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn6-EnTransf 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):Dwn7-EnTransf 1")
# Restore autosaved values # Restore autosaved values
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):#RestoreSIS8300 1") afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):#RestoreSIS8300 1")
afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):#RestoreSIS8300LLRF 1") afterInit("dbpf $(LLRF_DIGRTM_PREFIX):$(LLRF_DIG_R=DIG01):#RestoreSIS8300LLRF 1")
......
src/sis8300llrfControlTableChannel.cpp
+ 9
− 3
View file @ 10c46351
...@@ -89,6 +89,7 @@ sis8300llrfControlTableChannel::sis8300llrfControlTableChannel() : ...@@ -89,6 +89,7 @@ sis8300llrfControlTableChannel::sis8300llrfControlTableChannel() :
_TableMode = (sis8300llrfdrv_table_mode) table_mode_normal; _TableMode = (sis8300llrfdrv_table_mode) table_mode_normal;
_TableSpeed = 0; _TableSpeed = 0;
_ConstantEnable = 0; _ConstantEnable = 0;
_Initialized = 0;
_writeTableLoopTaskRun = 1; _writeTableLoopTaskRun = 1;
std::string taskname = "writeTableLoopTask"; std::string taskname = "writeTableLoopTask";
...@@ -141,10 +142,9 @@ ndsStatus sis8300llrfControlTableChannel::initialize() { ...@@ -141,10 +142,9 @@ ndsStatus sis8300llrfControlTableChannel::initialize() {
sis8300llrfdrv_table_mode ffMode; sis8300llrfdrv_table_mode ffMode;
if (_Initialized) { if (_Initialized) {
/* Inform of reinitialization, because the tables will be NDS_DBG("The table %s is already initialized. It won't be initialized again",
* reset */
NDS_WRN("Reinitializing %s: this will RESET ALL THE TABLES!",
_ChanStringIdentifier); _ChanStringIdentifier);
return ndsSuccess;
} }
freeBuffers(); freeBuffers();
...@@ -627,6 +627,12 @@ ndsStatus sis8300llrfControlTableChannel::markAllParametersChanged() { ...@@ -627,6 +627,12 @@ ndsStatus sis8300llrfControlTableChannel::markAllParametersChanged() {
_ConstantEnableChange = 1; _ConstantEnableChange = 1;
// When the state machine goes to init the memory positions are written
// again and the wrong control table could be used so we force to
// write again the current table this way we assure the right table will
// be used after init
_WriteTable=1;
return ndsSuccess; return ndsSuccess;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment