Skip to content

Commit

Permalink
Merge pull request #1818 from AllenInstitute/bugfix/1818-better_TTL_L…
Browse files Browse the repository at this point in the history
…NB_write
  • Loading branch information
t-b authored Jul 14, 2023
2 parents 8fc9783 + 5a85302 commit 7877b8c
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions Packages/MIES/MIES_DataConfigurator.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -680,14 +680,12 @@ static Function DC_PlaceDataInDAQConfigWave(device, dataAcqOrTP)
variable hardwareType = GetHardwareType(device)
switch(hardwareType)
case HARDWARE_ITC_DAC:
WAVE sweepDataLNB = GetSweepSettingsWave(device)

if(DC_AreTTLsInRackChecked(device, RACK_ZERO))
DAQConfigWave[j][%ChannelType] = XOP_CHANNEL_TYPE_TTL

channel = HW_ITC_GetITCXOPChannelForRack(device, RACK_ZERO)
DAQConfigWave[j][%ChannelNumber] = channel
sweepDataLNB[0][10][INDEP_HEADSTAGE] = channel
DC_DocumentChannelProperty(device, "rack zero channel", INDEP_HEADSTAGE, NaN, XOP_CHANNEL_TYPE_TTL, var=channel)
DAQConfigWave[j][%DAQChannelType] = DAQ_CHANNEL_TYPE_DAQ

j += 1
Expand All @@ -698,7 +696,7 @@ static Function DC_PlaceDataInDAQConfigWave(device, dataAcqOrTP)

channel = HW_ITC_GetITCXOPChannelForRack(device, RACK_ONE)
DAQConfigWave[j][%ChannelNumber] = channel
sweepDataLNB[0][11][INDEP_HEADSTAGE] = channel
DC_DocumentChannelProperty(device, "rack one channel", INDEP_HEADSTAGE, NaN, XOP_CHANNEL_TYPE_TTL, var=channel)
DAQConfigWave[j][%DAQChannelType] = DAQ_CHANNEL_TYPE_DAQ
endif
break
Expand Down

0 comments on commit 7877b8c

Please sign in to comment.