Skip to content
Snippets Groups Projects
Commit 62863078 authored by Ezekiel Dohmen's avatar Ezekiel Dohmen
Browse files

Merge branch 'prefer_ltc' into 'branch-5.1'

Switch order so that IOP prefers Ligo Timing Card to old TDS system

See merge request !622
parents 7985e48c 2bb0e533
No related branches found
No related tags found
2 merge requests!637Merge branch 'branch-5.1' into master,!622Switch order so that IOP prefers Ligo Timing Card to old TDS system
......@@ -368,12 +368,12 @@ fe_start_controller( void )
pLocalEpics->epicsOutput.timeDiag = 0;
/// \> Determine code startup synchronization and timing source.
// if Contec 1616 BIO present, Gen1 TDS receiver will be used for timing.
if ( cdsPciModules.card_count[ CON_1616DIO ] )
syncSource = SYNC_SRC_TDS;
// If PCIe timing card found (IOC Gen2), use that for startup sync
else if ( cdsPciModules.card_count[ LPTC ] > 0 )
if ( cdsPciModules.card_count[ LPTC ] > 0 )
syncSource = SYNC_SRC_LTC;
// if Contec 1616 BIO present, Gen1 TDS receiver will be used for timing.
else if ( cdsPciModules.card_count[ CON_1616DIO ] )
syncSource = SYNC_SRC_TDS;
// If not on aligo timing system, will try to sync to 1PPS signal on ADC
// This is legacy support for non-LIGO sites that still use an eLIGO
// timing system.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment