Skip to content

Commit

Permalink
Merge pull request #1223 from AllenInstitute/bugfix/1223-itc1600-ttls
Browse files Browse the repository at this point in the history
Bugfix/1223 itc1600 ttls
  • Loading branch information
t-b authored Dec 15, 2021
2 parents 8bb7721 + b279a36 commit a836146
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Packages/MIES/MIES_WaveDataFolderGetters.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -1754,7 +1754,7 @@ threadsafe Function/WAVE GetLBNidCache(numericalValues)
return wv
End

static Constant SWEEP_SETTINGS_WAVE_VERSION = 32
static Constant SWEEP_SETTINGS_WAVE_VERSION = 33

/// @brief Uses the parameter names from the `sourceKey` columns and
/// write them as dimension into the columns of dest.
Expand Down Expand Up @@ -2300,7 +2300,7 @@ Function/Wave GetSweepSettingsTextKeyWave(device)
wv[0][16] = HIGH_PREC_SWEEP_START_KEY
wv[0][17] = STIMSET_WAVE_NOTE_KEY
wv[0][18] = "TTL rack zero " + LABNOTEBOOK_TTL_SETSWEEPCOUNTS
wv[0][19] = "TTL rack one " + LABNOTEBOOK_TTL_SETSWEEPCOUNTS
wv[0][19] = "TTL rack one " + LABNOTEBOOK_TTL_SETSWEEPCOUNTS
wv[0][20] = "TTL " + LABNOTEBOOK_TTL_SETSWEEPCOUNTS
wv[0][21] = "TTL " + LABNOTEBOOK_TTL_STIMSETS
wv[0][22] = "TTL channels"
Expand Down
2 changes: 1 addition & 1 deletion Packages/Testing-MIES/UTF_BasicHardwareTests.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -3729,7 +3729,7 @@ Function TPDuringDAQWithTTL_REENTRY([str])
CHECK_EQUAL_VAR(TPSettingsCalculated[%totalLengthPointsDAQ], 1000)
CHECK_EQUAL_VAR(TPSettingsCalculated[%totalLengthPointsTP], 2000)
#elif defined(TESTS_WITH_ITC1600_HARDWARE)
CHECK_EQUAL_VAR(TPSettingsCalculated[%totalLengthPointsDAQ], 1000)
CHECK_EQUAL_VAR(TPSettingsCalculated[%totalLengthPointsDAQ], 2000)
CHECK_EQUAL_VAR(TPSettingsCalculated[%totalLengthPointsTP], 2000)
#elif defined(TESTS_WITH_NI_HARDWARE)
CHECK_EQUAL_VAR(TPSettingsCalculated[%totalLengthPointsDAQ], 5000)
Expand Down

0 comments on commit a836146

Please sign in to comment.