Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelHuth committed Oct 24, 2023
1 parent 64e0a6e commit 4941501
Show file tree
Hide file tree
Showing 18 changed files with 1,665 additions and 3,706 deletions.
33 changes: 31 additions & 2 deletions Packages/MIES/MIES_Constants.ipf
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
/// @anchor VersioningConstants
/// @{

Constant DAQ_CONFIG_WAVE_VERSION = 2
Constant DAQ_CONFIG_WAVE_VERSION = 3

/// Used to upgrade the GuiStateWave as well as the DA Ephys panel
Constant DA_EPHYS_PANEL_VERSION = 64
Expand Down Expand Up @@ -85,6 +85,12 @@ StrConstant ITC_DEVICE_REGEXP = "^ITC.*"
StrConstant DEVICE_TYPES_ITC = "ITC16;ITC18;ITC1600;ITC00;ITC16USB;ITC18USB"
StrConstant DEVICE_NUMBERS = "0;1;2;3;4;5;6;7;8;9;10"

StrConstant DEVICE_NAME_NICE_SUTTER = "Sutter Instrument Integrated Patch Amplifier"
StrConstant DEVICE_SUTTER_NAME_START_CLEAN = "IPA_E_"
Constant SUTTER_AI_PER_AMP = 4
Constant SUTTER_AO_PER_AMP = 2
Constant SUTTER_DIO_PER_AMP = 8

StrConstant BASE_WINDOW_NAME = "DA_Ephys"
StrConstant DATABROWSER_WINDOW_NAME = "DataBrowser"
StrConstant SWEEPBROWSER_WINDOW_NAME = "SweepBrowser"
Expand Down Expand Up @@ -172,6 +178,7 @@ Constant MAXIMUM_WAVE_SIZE = 16384 // 2^14
/// Convenience definition to nicify expressions like DimSize(wv, ROWS)
/// easier to read than DimSize(wv, 0).
/// @{
Constant DATADIMENSION = -1
Constant ROWS = 0
Constant COLS = 1
Constant LAYERS = 2
Expand Down Expand Up @@ -776,13 +783,14 @@ Constant HARDWARE_PREVENT_ERROR_MESSAGE = 0x04
/// @}

/// List of different DAC hardware types
StrConstant HARDWARE_DAC_TYPES = "ITC;NI"
StrConstant HARDWARE_DAC_TYPES = "ITC;NI;SUTTER;"

/// @name Indizes into HARDWARE_DAC_TYPES
/// @anchor HardwareDACTypeConstants
/// @{
Constant HARDWARE_ITC_DAC = 0
Constant HARDWARE_NI_DAC = 1
Constant HARDWARE_SUTTER_DAC = 2
Constant HARDWARE_UNSUPPORTED_DAC = 1000
/// @}

Expand All @@ -806,6 +814,8 @@ Constant HARDWARE_NI_DAC_MIN_SAMPINT = 0.002 ///< NI 6343 and other devices, so
#endif
Constant HARDWARE_ITC_MIN_SAMPINT = 0.005 ///< ITC DACs
Constant HARDWARE_NI_6001_MIN_SAMPINT = 0.2 ///< NI 6001 USB
Constant HARDWARE_SU_MIN_SAMPINT_DAC = 0.1 /// Sutter output -> 10 kHz
Constant HARDWARE_SU_MIN_SAMPINT_ADC = 0.02 /// Sutter input -> 50 kHz
/// @}

Constant WAVEBUILDER_MIN_SAMPINT = 0.005 ///< [ms]
Expand Down Expand Up @@ -1013,6 +1023,22 @@ Constant NI_ADC_MIN = -10
Constant NI_ADC_MAX = 10
/// @}

/// @name Ranges for Sutter DAQ analog output in volts
///
/// @anchor SUDAQ_WaveRanges
/// @{
Constant SU_HS_IN_V_MIN = -1 // V
Constant SU_HS_IN_V_MAX = 1 // V
Constant SU_HS_IN_I_MIN = -20E-9 // A
Constant SU_HS_IN_I_MAX = 20E-9 // A
Constant SU_DAC_MIN = -10 // V
Constant SU_DAC_MAX = 10 // V
Constant SU_ADC_MIN = -10 // V
Constant SU_ADC_MAX = 10 // V
Constant SU_HS_OUT_MIN = -1 // V
Constant SU_HS_OUT_MAX = 1 // V
/// @}

/// Maximum length of a valid object name in bytes in Igor Pro >= 8
Constant MAX_OBJECT_NAME_LENGTH_IN_BYTES = 255

Expand Down Expand Up @@ -2197,3 +2223,6 @@ Constant PSX_HORIZ_OFFSET_PEAK = 1
Constant PSX_DECONV_FILTER_DEF_LOW = 0.002
Constant PSX_DECONV_FILTER_DEF_HIGH = 0.004
Constant PSX_DECONV_FILTER_DEF_ORDER = 101

// @todo test with low pulse number, e.g. 100 and non-integer ratio of DAC/ADC sampling rate
Constant SUTTER_MAX_MAX_TP_PULSES = 10000
Loading

0 comments on commit 4941501

Please sign in to comment.