Skip to content

LVDS trigger modes added #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huw-dls wants to merge 1 commit into
base: master
Choose a base branch
from
Open

LVDS trigger modes added #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions merlinApp/Db/merlin.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,15 @@ record(mbbo,"$(P)$(R)TriggerMode") {
field(FRVL,"4")
field(FRST,"Trigger both rising")
field(FVVL,"5")
field(FVST,"Software")
field(FVST,"LVDS Trig Enable")
field(SXVL,"6")
field(SXST,"LVDS Trig start rising")
field(SVVL,"7")
field(SVST,"LVDS Trig start falling")
field(EIVL,"8")
field(EIST,"LVDS Trig both rising")
field(NIVL,"9")
field(NIST,"Software")
}

record(mbbi,"$(P)$(R)TriggerMode_RBV") {
Expand All @@ -48,7 +56,15 @@ record(mbbi,"$(P)$(R)TriggerMode_RBV") {
field(FRVL,"4")
field(FRST,"Trigger both rising ")
field(FVVL,"5")
field(FVST,"Software")
field(FVST,"LVDS Trig Enable")
field(SXVL,"6")
field(SXST,"LVDS Trig start rising")
field(SVVL,"7")
field(SVST,"LVDS Trig start falling")
field(EIVL,"8")
field(EIST,"LVDS Trig both rising")
field(NIVL,"9")
field(NIST,"Software")
}

# We redefine the states for the FileFormat records defined in NDFile.template
Expand Down
26 changes: 26 additions & 0 deletions merlinApp/src/merlinDetector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,6 +769,32 @@ asynStatus merlinDetector::setAcquireParams()
cmdConnection->mpxSet(MPXVAR_TRIGGERSTOP, TMTrigRising,
Labview_DEFAULT_TIMEOUT);
break;

case TMLVDSExternalEnable:
cmdConnection->mpxSet(MPXVAR_TRIGGERSTART, TMLVDSTrigRising,
Labview_DEFAULT_TIMEOUT);
cmdConnection->mpxSet(MPXVAR_TRIGGERSTOP, TMLVDSTrigFalling,
Labview_DEFAULT_TIMEOUT);
break;
case TMLVDSExternalTriggerLow:
cmdConnection->mpxSet(MPXVAR_TRIGGERSTART, TMLVDSTrigFalling,
Labview_DEFAULT_TIMEOUT);
cmdConnection->mpxSet(MPXVAR_TRIGGERSTOP, TMTrigInternal,
Labview_DEFAULT_TIMEOUT);
break;
case TMLVDSExternalTriggerHigh:
cmdConnection->mpxSet(MPXVAR_TRIGGERSTART, TMLVDSTrigRising,
Labview_DEFAULT_TIMEOUT);
cmdConnection->mpxSet(MPXVAR_TRIGGERSTOP, TMTrigInternal,
Labview_DEFAULT_TIMEOUT);
break;
case TMLVDSExternalTriggerRising:
cmdConnection->mpxSet(MPXVAR_TRIGGERSTART, TMLVDSTrigRising,
Labview_DEFAULT_TIMEOUT);
cmdConnection->mpxSet(MPXVAR_TRIGGERSTOP, TMLVDSTrigRising,
Labview_DEFAULT_TIMEOUT);
break;

case TMSoftwareTrigger:
cmdConnection->mpxSet(MPXVAR_TRIGGERSTART, TMTrigSoftware,
Labview_DEFAULT_TIMEOUT);
Expand Down
8 changes: 7 additions & 1 deletion merlinApp/src/merlinDetector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ typedef enum
TMExternalTriggerHigh,
TMExternalTriggerLow,
TMExternalTriggerRising,
TMLVDSExternalEnable,
TMLVDSExternalTriggerHigh,
TMLVDSExternalTriggerLow,
TMLVDSExternalTriggerRising,
TMSoftwareTrigger
} merlinTriggerMode;/** Trigger modes */

Expand Down Expand Up @@ -64,7 +68,9 @@ typedef enum
#define TMTrigInternal (char*)"0"
#define TMTrigRising (char*)"1"
#define TMTrigFalling (char*)"2"
#define TMTrigSoftware (char*)"3"
#define TMLVDSTrigRising (char*)"3"
#define TMLVDSTrigFalling (char*)"4"
#define TMTrigSoftware (char*)"5"

/** ASYN PARAMETER NAMES **/

Expand Down