lin-epics-modules/sinqDAQ
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

WIP: presets all managed on epics side, separates presets from starting #8

Draft
wall_e wants to merge 3 commits from moving_more_logic_to_epics into master
pull from: moving_more_logic_to_epics
merge into: :master
Conversation 4 Commits 3 Files Changed 5
+476 -18
wall_e commented 2026-05-11 13:54:21 +02:00
Owner
Copy Link
Copy Source
No description provided.
wall_e added 3 commits 2026-05-11 13:54:21 +02:00
presets all managed on epics side, separates presets from starting
Example Action / Lint (push) Successful in 2s
Details
Example Action / BuildAndTest (push) Failing after 9s
Details
30bd8c66dc
make status of channels busy for nicos...
Example Action / Lint (push) Successful in 2s
Details
Example Action / BuildAndTest (push) Failing after 9s
Details
6ecc3e8e86
adds software time preset, improves preset monitor switching logic
Example Action / Lint (push) Successful in 9s
Details
Example Action / BuildAndTest (push) Failing after 14s
Details
a413fecc43
wall_e reviewed 2026-05-11 14:00:25 +02:00
db/channels.db
@@ -30,3 +40,2 @@
# Current Status of Channel, i.e. is it ready to count?
record(bi, "$(INSTR)$(NAME):S$(CHANNEL)")
record(bi, "$(INSTR)$(NAME):M$(CHANNEL)_CLEARED")
wall_e commented 2026-05-11 14:00:25 +02:00
Author
Owner
Copy Link
Copy Source

rethink naming as possible

rethink naming as possible
wall_e commented 2026-05-11 14:00:41 +02:00
Author
Owner
Copy Link
Copy Source

clearing

and

no
yes

clearing and no yes
wall_e reviewed 2026-05-11 14:01:11 +02:00
db/channels.db
@@ -40,0 +103,4 @@
field(OUT, "$(INSTR)$(NAME):M$(CHANNEL)_PRESET PP")
}
record(bi, "$(INSTR)$(NAME):M$(CHANNEL)_PRESET")
wall_e commented 2026-05-11 14:01:11 +02:00
Author
Owner
Copy Link
Copy Source

maybe preset_status and clearing_status instead

maybe preset_status and clearing_status instead
wall_e reviewed 2026-05-11 14:08:15 +02:00
db/daq_common.db
@@ -185,0 +308,4 @@
{
field(DESC, "Zero channels")
field(SELM, "All")
field(OMSL, "supervisory")
wall_e commented 2026-05-11 14:08:15 +02:00
Author
Owner
Copy Link
Copy Source

closed_loop

closed_loop
wall_e reviewed 2026-05-11 14:09:01 +02:00
db/daq_common.db
@@ -185,0 +304,4 @@
field(FLNK, "$(INSTR)$(NAME):PREPARE")
}
record(dfanout,"$(INSTR)$(NAME):PREPARE")
wall_e commented 2026-05-11 14:09:01 +02:00
Author
Owner
Copy Link
Copy Source

should probably just be start

should probably just be start
Some required checks failed
Example Action / Lint (push) Successful in 9s
Details
Example Action / BuildAndTest (push) Failing after 14s
Details
You are not authorized to merge this pull request.
This pull request can be merged automatically.
This pull request is marked as a work in progress.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin moving_more_logic_to_epics:moving_more_logic_to_epics
git checkout moving_more_logic_to_epics
Sign in to join this conversation.
Reviewers
No Reviewers
wall_e
Labels
No items
No labels
Milestone
No items
No Milestone
Projects
Clear projects
No projects
Assignees
Clear assignees
mathis_s (mathis_s) mueller_r4 (mueller_r4) plank_a (plank_a) ponsin_h (ponsin_h) schlienger_s (schlienger_s) soederqvist_a (soederqvist_a) wall_e (wall_e)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: lin-epics-modules/sinqDAQ#8
Delete Branch "moving_more_logic_to_epics"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?