Merge branch 'fix_modulator' into 'master'

Last fixes

See merge request !28

CHANGELOG.md

+# 2.1.1+0
+* Fix issue with Modulator being stopped when in On Demand (and 14Hz mode selected)
+* Block Start pulses when in Free Running
+
 # 2.1.0+0
 * Remove island mode (ICSHWI-13679)
 * Include On-Demand for Mixed Mode (ICSHWI-10130)

configure/CONFIG_MODULE

 EPICS_MODULE_NAME:=evrisland
-E3_MODULE_VERSION:=2.1.0+0
+E3_MODULE_VERSION:=2.1.1+0
 
 BUSY_DEP_VERSION:=1.7.3+2
 IOCMETADATA_DEP_VERSION:=0.1.0+1

evrisland/evrislandApp/Db/evrisland.template

@@ -575,10 +575,8 @@ 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(DOL7, "$(P)$(R=)EnablePulses")
-    field(LNK7, "$(P)$(R=)DlyGen-7-Ena-Sel PP")
-    field(DO8,  "1")
-    field(LNK8, "$(P)$(R=)#CalcMonEnable.PROC")
+    field(DO7,  "1")
+    field(LNK7, "$(P)$(R=)#CalcMonEnable.PROC")
 }
 
 record(calc, "$(P)$(R=)#CalcMonEnable"){
@@ -614,6 +612,8 @@ record(bo, "$(P)$(R=)ModeMix") {
 record(seq, "$(P)$(R=)#DisableModeMix") {
     field(DOL0, "$(P)$(R=)ModeMix")
     field(LNK0, "$(P)$(R=)EnablePulses PP")
+    field(DOL1, "$(P)$(R=)ModeMix")
+    field(LNK1, "$(P)$(R=)StartFixedCyclesMix.DISP")
 }
 
 record(bi, "$(P)$(R=)StartFixedCyclesMix"){