Merge pull request #1223 from AllenInstitute/bugfix/1223-itc1600-ttls

Bugfix/1223 itc1600 ttls

Author: t-b

Packages/MIES/MIES_WaveDataFolderGetters.ipf

@@ -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.
@@ -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"

Packages/Testing-MIES/UTF_BasicHardwareTests.ipf

@@ -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)