Merge branch 'ICSHWI-10243' into 'master'

Fixes to make IOC start correctly when in Mixed/Global

See merge request e3/wrappers/rf/e3-evrisland!13

CHANGELOG.md

+# 1.8.4
+* Fix counter start for Mixed/Global mode
+
 # 1.8.3
 * Fix issue when starts the IOC in Mixed/Global mode (now for real)
 

configure/CONFIG_MODULE

 EPICS_MODULE_NAME:=evrisland
-E3_MODULE_VERSION:=1.8.3+0
+E3_MODULE_VERSION:=1.8.4+0
 
 BUSY_DEP_VERSION:=1.7.3+1
 IOCMETADATA_DEP_VERSION:=0.1.0+0

evrisland/evrislandApp/Db/evrisland.template

@@ -286,13 +286,13 @@ record(seq, "$(P)$(R=)Seq0-Enable") {
     field(SELM, "All")
     # Load sequencer 0
     field(DOL0, "1")
-    field(LNK0, "$(EVRPREFIX)SoftSeq-0-Load-Cmd CP")
+    field(LNK0, "$(EVRPREFIX)SoftSeq-0-Load-Cmd PP")
     # Commit sequencer 0
     field(DOL1, "1")
-    field(LNK1, "$(EVRPREFIX)SoftSeq-0-Commit-Cmd CP")
+    field(LNK1, "$(EVRPREFIX)SoftSeq-0-Commit-Cmd PP")
     # Enable sequencer 0
     field(DOL2, "1")
-    field(LNK2, "$(EVRPREFIX)SoftSeq-0-Enable-Cmd CP")
+    field(LNK2, "$(EVRPREFIX)SoftSeq-0-Enable-Cmd PP")
 
 }
 
@@ -509,16 +509,12 @@ record(seq, "$(P)$(R=)#SeqSetMixed"){
     field(DOLA, "0") 
     field(LNKA, "$(EVRPREFIX)SoftSeq-0-TrigSrc-0-Sel PP")
 
-    # Commit sequencer 0
+    # Start sequencer as usual
     field(DOLB, "1")
-    field(LNKB, "$(EVRPREFIX)SoftSeq-0-Commit-Cmd PP")
+    field(LNKB, "$(P)$(R=)Seq0-Enable.PROC")
 
-    # Restart Sequencer
     field(DOLC, "1")
-    field(LNKC, "$(EVRPREFIX)SoftSeq-0-Enable-Cmd PP")
-
-    field(DOLD, "1")
-    field(LNKD, "$(P)$(R=)#ReloadDelays.PROC" )
+    field(LNKC, "$(P)$(R=)#ReloadDelays.PROC" )
 
 }
 
@@ -725,13 +721,8 @@ record(seq, "$(P)$(R=)#SeqSetGlobal"){
     field(DOL8, "0") # Pulser 0 / Modulator (follow the RF Start)
     field(LNK8, "$(EVRPREFIX)SoftSeq-0-TrigSrc-0-Sel PP")
 
-    # Commit sequencer 0
     field(DOL9, "1")
-    field(LNK9, "$(EVRPREFIX)SoftSeq-0-Commit-Cmd PP")
-
-    # Restart Sequencer
-    field(DOLA, "1")
-    field(LNKA, "$(EVRPREFIX)SoftSeq-0-Enable-Cmd PP")
+    field(LNK9, "$(P)$(R=)Seq0-Enable.PROC PP")
 
 #    # Block Cycle Frequency from Island mode
 #    field(DOL3, "1")

iocsh/evrisland-base.iocsh

@@ -29,11 +29,12 @@ afterInit("create_monitor_set("values_pass2.req",5)")
 # Restore the saved values
 afterInit("fdbrestore("$(AS_TOP)/$(IOCDIR)/save/values_pass2.sav")")
 
-#-This is need to Local mode start correctly
+#This is need to Local mode start correctly
 afterInit("epicsThreadSleep 2")
 afterInit("dbpf $(PREFIX):PS-0-Div-SP.PROC 1")
-#-And for Mixed mode/Global mode starts the count correctly after restart
 afterInit("dbpf $(PREFIX):#SeqChOpMode.PROC 1")
+#For Mixed mode/Global mode starts the count correctly after restart
+afterInit("dbpf $(PREFIX):Seq0-Enable.PROC 1")
 
 # Generate list of PVs to archive
 pvlistFromInfo("ARCHIVE_THIS", "$(PREFIX):ArchiverList")