Merge pull request #43 from lnls-dig/itlk-reg-improve

Improve interlock records and protocol
lnls-dig · Jun 17, 2024 · a05858a · a05858a
2 parents faa0d83 + 939d2cd
commit a05858a
Show file tree

Hide file tree

Showing 6 changed files with 281 additions and 459 deletions.
diff --git a/iocBoot/ioctiming/stEVG.cmd b/iocBoot/ioctiming/stEVG.cmd
@@ -29,6 +29,7 @@ dbLoadRecords "${TOP}/db/SeqRAM.db", "P=${P}, R=${R}"
 
 dbLoadRecords("${TOP}/db/fw_version.db", "P=${P}, R=${R}, PORT=${PORT}, ADDR=0, TIMEOUT=2")
 dbLoadRecords("${TOP}/db/event_log.db", "P=${P}, R=${R}, PORT=${PORT}, ADDR=0, TIMEOUT=2")
+dbLoadRecords("${TOP}/db/evg_interlock.db", "P=${P}, R=${R}, PORT=${PORT}, ADDR=0, TIMEOUT=2")
 
 dbLoadRecords("${TOP}/db/rx_locked.db", "P=${P}, R=${R}, PORT=${PORT}, ADDR=0, TIMEOUT=2, DEVICE=evg")
 

diff --git a/timingApp/Db/Makefile b/timingApp/Db/Makefile
@@ -26,6 +26,7 @@ DB += fw_version.db
 DB += event_log.db
 DB += rx_locked.db
 DB += digital_input.db
+DB += evg_interlock.db
 
 DB += $(AUTOSAVE)/asApp/Db/save_restoreStatus.db
 

diff --git a/timingApp/Db/autosave_evg.req b/timingApp/Db/autosave_evg.req
@@ -83,9 +83,10 @@ $(P)$(R)Evt61DelayType-Sel
 $(P)$(R)Evt62DelayType-Sel
 $(P)$(R)Evt63DelayType-Sel
 $(P)$(R)InjectionEvt-Sel
+$(P)$(R)IntlkLogEnbl-SP
 $(P)$(R)IntlkCtrlEnbl-Sel
 $(P)$(R)IntlkCtrlRepeat-Sel
-$(P)$(R)IntlkCtrlRst-Sel
+$(P)$(R)IntlkCtrlRepeatTime-SP
 $(P)$(R)SeqEnbl-Sel
 $(P)$(R)UTCRefSrc-Sel
 $(P)$(R)DevFun-Sel