Merge branch 'ICSHWI-17605' into 'master'

Resolve ICSHWI-17605

Closes ICSHWI-17605

See merge request !38

CHANGELOG.md

+# 2.5.0+0
+* Include mechanism to support Piezo Start on Mixed Mode (ICSHWI-17605)
+
 # 2.4.0+0
 * Implement RF Blanking feature (ICSHWI-17119)
 

configure/CONFIG_MODULE

 EPICS_MODULE_NAME:=evrisland
-E3_MODULE_VERSION:=2.4.0+1
+E3_MODULE_VERSION:=2.5.0+0
 
 BUSY_DEP_VERSION:=1.7.3+6
 IOCMETADATA_DEP_VERSION:=0.1.0+5

evrisland/evrislandApp/Db/evrisland.template

@@ -42,6 +42,17 @@ record(ao, "$(P)$(R=)RFSyncWdt-SP") {
     info(ARCHIVE_THIS, "")
 }
 
+record(ao, "$(P)$(R=)PiezoDiffRfSt") {
+    field(DESC, "Piezo Dif. from Rf St")
+    field(VAL,  "$(PIEZODIFRFST=3000)")
+    field(DRVL, "0")
+    field(DRVH, "$(MAXPIEZODIFRFST=5800)")
+    field(EGU,  "us")
+
+    info(autosaveFields_pass2, "VAL")
+    info(ARCHIVE_THIS, "")
+}
+
 # Select which records should be processed depending on the Operation Mode
 record(fanout, "$(P)$(R=)#FanRFWdtProc") {
     field(SELM, "Specified")
@@ -192,6 +203,18 @@ record(calcout, "$(P)$(R=)#SetPulser6Dly"){
     field(OUT,  "$(EVRPREFIX)DlyGen-6-Delay-SP PP" )
 }
 
+# Pulser 8 - Piezo
+record(calcout, "$(P)$(R=)#SetPulser8Dly"){
+    field(INPA, "$(P)$(R=)OpMode")
+    field(INPB, "$(P)$(R=)RFSyncDly-SP CP")  # When updates value, update evr
+    field(INPC, "$(P)$(R=)SCDly CP")
+    field(INPD, "$(P)$(R=)MMDly CP")
+    field(INPE, "$(P)$(R=)PiezoDiffRfSt CP")
+    field(CALC, "A=0?B+D-E:B+C")
+    field(OUT,  "$(EVRPREFIX)DlyGen-8-Delay-SP PP" )
+}
+
+
 # Set all initial values
 record(fanout, "$(P)$(R=)#SetInitVals") {
     field(LNK1, "$(P)$(R=)#SetPulser1Dly")
@@ -200,7 +223,8 @@ record(fanout, "$(P)$(R=)#SetInitVals") {
     field(LNK4, "$(P)$(R=)#SetPulser4Dly")
     field(LNK5, "$(P)$(R=)#SetPulser5Dly")
     field(LNK6, "$(P)$(R=)#SetPulser6Dly")
-    field(LNK7, "$(P)$(R=)RFSyncWdt-SP")
+    field(LNK8, "$(P)$(R=)#SetPulser8Dly")
+    field(LNK9, "$(P)$(R=)RFSyncWdt-SP")
 }
 
 record(fanout, "$(P)$(R=)#ReloadDelays") {
@@ -211,6 +235,7 @@ record(fanout, "$(P)$(R=)#ReloadDelays") {
     field(LNK4, "$(P)$(R=)#SetPulser4Dly")
     field(LNK5, "$(P)$(R=)#SetPulser5Dly")
     field(LNK6, "$(P)$(R=)#SetPulser6Dly")
+    field(LNK8, "$(P)$(R=)#SetPulser8Dly")
 }
 
 #########################################################
@@ -332,12 +357,15 @@ record(seq, "$(P)$(R=)#SeqChgFreqMix"){
     # FIM
     field(DOL7, "$(P)$(R=)#MixFreq-Evnt")
     field(LNK7, "$(EVRPREFIX)DlyGen-6-Evt-Trig0-SP PP")
+    # Piezo Start
+    field(DOL8, "$(P)$(R=)#MixFreq-Evnt")
+    field(LNK8, "$(EVRPREFIX)DlyGen-8-Evt-Trig0-SP PP")
     # Change the event monitor
-    field(DO8,  "1")
-    field(LNK8, "$(P)$(R=)#MixFreq-EvnMon.PROC" )
-    # Return to the right mode (Mixed/On Demand)
     field(DO9,  "1")
-    field(LNK9, "$(P)$(R=)ModeMix.PROC" )
+    field(LNK9, "$(P)$(R=)#MixFreq-EvnMon.PROC" )
+    # Return to the right mode (Mixed/On Demand)
+    field(DOA,  "1")
+    field(LNKA, "$(P)$(R=)ModeMix.PROC" )
 }
 
 ##############
@@ -426,15 +454,18 @@ record(seq, "$(P)$(R=)#SeqSetGlobal"){
     # FIM
     field(DOL7, "$(RFSt)")
     field(LNK7, "$(EVRPREFIX)DlyGen-6-Evt-Trig0-SP PP")
+    # Piezo Start 
+    field(DOL8, "22")
+    field(LNK8, "$(EVRPREFIX)DlyGen-8-Evt-Trig0-SP PP")
     # Change the event monitor
-    field(DOL8, "6")
-    field(LNK8, "$(P)$(R=)#SelEvnMon.SELN" )
-    field(DOL9, "1")
-    field(LNK9, "$(P)$(R=)#SelEvnMon.PROC" )
+    field(DOL9, "6")
+    field(LNK9, "$(P)$(R=)#SelEvnMon.SELN" )
     field(DOLA, "1")
-    field(LNKA, "$(P)$(R=)#ReloadDelays.PROC" )
+    field(LNKA, "$(P)$(R=)#SelEvnMon.PROC" )
     field(DOLB, "1")
-    field(LNKB, "$(P)$(R=)EnablePulses PP" )
+    field(LNKB, "$(P)$(R=)#ReloadDelays.PROC" )
+    field(DOLC, "1")
+    field(LNKC, "$(P)$(R=)EnablePulses PP" )
 }
 
 ########
@@ -554,7 +585,7 @@ record(bo, "$(P)$(R=)EnablePulses" ){
 # Depending on the mode enable/disable is different
 record(calc, "$(P)$(R=)#CalcEnable"){
     field(INPA, "$(P)$(R=)OpMode")
-    field(CALC, "A=0?255:127")
+    field(CALC, "A=0?511:255")
     field(FLNK, "$(P)$(R=)#SeqEnable")
 }
 
@@ -576,8 +607,10 @@ record(seq, "$(P)$(R=)#SeqEnable"){
     field(LNK5, "$(P)$(R=)DlyGen-5-Ena-Sel PP")
     field(DOL6, "$(P)$(R=)EnablePulses")
     field(LNK6, "$(P)$(R=)DlyGen-6-Ena-Sel PP")
-    field(DO7,  "1")
-    field(LNK7, "$(P)$(R=)#CalcMonEnable.PROC")
+    field(DOL8, "$(P)$(R=)EnablePulses")
+    field(LNK8, "$(P)$(R=)DlyGen-8-Ena-Sel PP")
+    field(DO9,  "1")
+    field(LNK9, "$(P)$(R=)#CalcMonEnable.PROC")
 }
 
 record(calc, "$(P)$(R=)#CalcMonEnable"){