MIES_AmplifierInteraction.ipf: Rework amplifier getting and setting

The current approach uses AI_SendToAmp with separate getter and setter constants. For setting people should
also prefer AI_UpdateAmpModel but as both functions are non-static it can happen that the wrong function is
called.

We have now reworked the interfaces with the following outcome:
  - One public function to read/write amplifier settings (AI_WriteToAmplifier, AI_ReadFromAmplifier). These functions
  also do the right thing out of the box.
  - Deduplicated getter/setter constants to only denote the type of setting. The access type, read or write,
  is now passed in separately.
  - Public accessible functions now only accept mcc function constants
  - Introduce low level AI_ReadFromMCC/AI_WriteToMCC functions which make AI_SendToAmp remarkable shorter
  - Introduce various helper functions which translate between control names, function constants and human
    readable names.

Author: t-b

Packages/MIES/MIES_AmplifierInteraction.ipf

@@ -6276,15 +6276,15 @@ Function PSQ_Chirp(string device, STRUCT AnalysisFunction_V3 &s)
 				endif
 
 				WAVE result = LBN_GetNumericWave()
-				initLPF = AI_SendToAmp(device, s.headstage, I_CLAMP_MODE, MCC_GETPRIMARYSIGNALLPF_FUNC, NaN)
+				initLPF = AI_ReadFromAmplifier(device, s.headstage, I_CLAMP_MODE, MCC_PRIMARYSIGNALLPF_FUNC)
 				ASSERT(IsFinite(initLPF), "Queried LPF value from MCC amp is non-finite")
 				result[INDEP_HEADSTAGE] = initLPF
 				key                     = CreateAnaFuncLBNKey(PSQ_CHIRP, PSQ_FMT_LBN_CR_INIT_LPF)
 				ED_AddEntryToLabnotebook(device, key, result, overrideSweepNo = s.sweepNo, unit = "Hz")
 
 				ampBesselFilter = AFH_GetAnalysisParamNumerical("AmpBesselFilter", s.params, defValue = PSQ_CR_DEFAULT_LPF)
 
-				ret = AI_SendToAmp(device, s.headstage, I_CLAMP_MODE, MCC_SETPRIMARYSIGNALLPF_FUNC, ampBesselFilter, selectAmp = 0)
+				ret = AI_WriteToAmplifier(device, s.headstage, I_CLAMP_MODE, MCC_PRIMARYSIGNALLPF_FUNC, ampBesselFilter, selectAmp = 0)
 				ASSERT(!ret, "Could not set LPF in MCC")
 			endif
 			break
@@ -6410,7 +6410,7 @@ Function PSQ_Chirp(string device, STRUCT AnalysisFunction_V3 &s)
 				key             = CreateAnaFuncLBNKey(PSQ_CHIRP, PSQ_FMT_LBN_CR_INIT_LPF, query = 1)
 				ampBesselFilter = GetLastSettingIndepSCI(numericalValues, s.sweepNo, key, s.headstage, UNKNOWN_MODE)
 				ASSERT(IsFinite(ampBesselFilter), "Expected finite value for the amplifier bessel filter")
-				ret = AI_SendToAmp(device, s.headstage, I_CLAMP_MODE, MCC_SETPRIMARYSIGNALLPF_FUNC, ampBesselFilter)
+				ret = AI_WriteToAmplifier(device, s.headstage, I_CLAMP_MODE, MCC_PRIMARYSIGNALLPF_FUNC, ampBesselFilter)
 				ASSERT(IsFinite(ret), "Can not set LPF value in MCC amp")
 			endif
 

Packages/MIES/MIES_AnalysisFunctions_PatchSeq.ipf

@@ -2208,8 +2208,8 @@ static Function CONF_GetAmplifierSettings(string device)
 			JSON_AddBoolean(jsonID, jsonPath + EXPCONFIG_JSON_AMP_COMP_CHAIN, DAG_GetNumericalValue(device, "check_DataAcq_Amp_Chain"))
 
 			// MCC settings without GUI control
-			JSON_AddVariable(jsonID, jsonPath + EXPCONFIG_JSON_AMP_LPF, AI_SendToAmp(device, i, V_CLAMP_MODE, MCC_GETPRIMARYSIGNALLPF_FUNC, NaN))
-			JSON_AddVariable(jsonID, jsonPath + EXPCONFIG_JSON_AMP_GAIN, AI_SendToAmp(device, i, V_CLAMP_MODE, MCC_GETPRIMARYSIGNALGAIN_FUNC, NaN))
+			JSON_AddVariable(jsonID, jsonPath + EXPCONFIG_JSON_AMP_LPF, AI_ReadFromAmplifier(device, i, V_CLAMP_MODE, MCC_PRIMARYSIGNALLPF_FUNC))
+			JSON_AddVariable(jsonID, jsonPath + EXPCONFIG_JSON_AMP_GAIN, AI_ReadFromAmplifier(device, i, V_CLAMP_MODE, MCC_PRIMARYSIGNALGAIN_FUNC))
 
 			jsonPath = basePath + "/" + EXPCONFIG_JSON_AMPBLOCK + "/" + EXPCONFIG_JSON_ICBLOCK + "/"
 
@@ -2233,8 +2233,8 @@ static Function CONF_GetAmplifierSettings(string device)
 			JSON_AddVariable(jsonID, jsonPath + EXPCONFIG_JSON_AMP_PIPETTE_OFFSET_IC, DAG_GetNumericalValue(device, "setvar_DataAcq_PipetteOffset_IC"))
 
 			// MCC settings without GUI control
-			JSON_AddVariable(jsonID, jsonPath + EXPCONFIG_JSON_AMP_LPF, AI_SendToAmp(device, i, I_CLAMP_MODE, MCC_GETPRIMARYSIGNALLPF_FUNC, NaN))
-			JSON_AddVariable(jsonID, jsonPath + EXPCONFIG_JSON_AMP_GAIN, AI_SendToAmp(device, i, I_CLAMP_MODE, MCC_GETPRIMARYSIGNALGAIN_FUNC, NaN))
+			JSON_AddVariable(jsonID, jsonPath + EXPCONFIG_JSON_AMP_LPF, AI_ReadFromAmplifier(device, i, I_CLAMP_MODE, MCC_PRIMARYSIGNALLPF_FUNC))
+			JSON_AddVariable(jsonID, jsonPath + EXPCONFIG_JSON_AMP_GAIN, AI_ReadFromAmplifier(device, i, I_CLAMP_MODE, MCC_PRIMARYSIGNALGAIN_FUNC))
 
 			if(clampMode != I_CLAMP_MODE)
 				DAP_ChangeHeadStageMode(device, clampMode, i, DO_MCC_MIES_SYNCING)
@@ -2307,13 +2307,13 @@ static Function CONF_RestoreAmplifierSettings(string device, variable headStage,
 	// MCC settings without GUI control
 	val = JSON_GetVariable(jsonID, path + EXPCONFIG_JSON_AMP_LPF, ignoreErr = 1)
 	if(!IsNaN(val))
-		ret = AI_SendToAmp(device, headstage, V_CLAMP_MODE, MCC_SETPRIMARYSIGNALLPF_FUNC, val)
+		ret = AI_WriteToAmplifier(device, headstage, V_CLAMP_MODE, MCC_PRIMARYSIGNALLPF_FUNC, val)
 		ASSERT(ret == 0, "Could not set LPF primary output")
 	endif
 
 	val = JSON_GetVariable(jsonID, path + EXPCONFIG_JSON_AMP_GAIN, ignoreErr = 1)
 	if(!IsNaN(val))
-		ret = AI_SendToAmp(device, headstage, V_CLAMP_MODE, MCC_SETPRIMARYSIGNALGAIN_FUNC, val)
+		ret = AI_WriteToAmplifier(device, headstage, V_CLAMP_MODE, MCC_PRIMARYSIGNALGAIN_FUNC, val)
 		ASSERT(ret == 0, "Could not set primary output gain")
 	endif
 
@@ -2341,13 +2341,13 @@ static Function CONF_RestoreAmplifierSettings(string device, variable headStage,
 	// MCC settings without GUI control
 	val = JSON_GetVariable(jsonID, path + EXPCONFIG_JSON_AMP_LPF, ignoreErr = 1)
 	if(!IsNaN(val))
-		ret = AI_SendToAmp(device, headstage, I_CLAMP_MODE, MCC_SETPRIMARYSIGNALLPF_FUNC, val)
+		ret = AI_WriteToAmplifier(device, headstage, I_CLAMP_MODE, MCC_PRIMARYSIGNALLPF_FUNC, val)
 		ASSERT(ret == 0, "Could not set LPF primary output")
 	endif
 
 	val = JSON_GetVariable(jsonID, path + EXPCONFIG_JSON_AMP_GAIN, ignoreErr = 1)
 	if(!IsNaN(val))
-		ret = AI_SendToAmp(device, headstage, I_CLAMP_MODE, MCC_SETPRIMARYSIGNALGAIN_FUNC, val)
+		ret = AI_WriteToAmplifier(device, headstage, I_CLAMP_MODE, MCC_PRIMARYSIGNALGAIN_FUNC, val)
 		ASSERT(ret == 0, "Could not set LPF primary output")
 	endif
 
@@ -2389,30 +2389,30 @@ static Function CONF_MCC_MidExp(string device, variable headStage, variable json
 
 	if(clampMode == V_CLAMP_MODE)
 
-		settingValue = AI_SendToAmp(device, headStage, V_CLAMP_MODE, MCC_GETPIPETTEOFFSET_FUNC, NaN, checkBeforeWrite = 1)
+		settingValue = AI_ReadFromAmplifier(device, headStage, V_CLAMP_MODE, MCC_PIPETTEOFFSET_FUNC)
 		PGC_SetAndActivateControl(device, "setvar_DataAcq_PipetteOffset_VC", val = settingValue)
 		PGC_SetAndActivateControl(device, "setvar_DataAcq_PipetteOffset_IC", val = settingValue)
-		settingValue = AI_SendToAmp(device, headStage, V_CLAMP_MODE, MCC_GETHOLDING_FUNC, NaN, checkBeforeWrite = 1)
+		settingValue = AI_ReadFromAmplifier(device, headStage, V_CLAMP_MODE, MCC_HOLDING_FUNC)
 		PGC_SetAndActivateControl(device, "setvar_DataAcq_Hold_VC", val = settingValue)
-		settingValue = AI_SendToAmp(device, headStage, V_CLAMP_MODE, MCC_GETHOLDINGENABLE_FUNC, NaN, checkBeforeWrite = 1)
+		settingValue = AI_ReadFromAmplifier(device, headStage, V_CLAMP_MODE, MCC_HOLDINGENABLE_FUNC)
 		PGC_SetAndActivateControl(device, "check_DatAcq_HoldEnableVC", val = settingValue)
 		PGC_SetAndActivateControl(device, "check_DataAcq_AutoBias", val = CHECKBOX_SELECTED)
 		printf "HeadStage %d is in V-Clamp mode and has been configured from the MCC. I-Clamp settings were reset to initial values, check before switching!\r", headStage
 	elseif(clampMode == I_CLAMP_MODE)
-		settingValue = AI_SendToAmp(device, headStage, I_CLAMP_MODE, MCC_GETPIPETTEOFFSET_FUNC, NaN, checkBeforeWrite = 1)
+		settingValue = AI_ReadFromAmplifier(device, headStage, I_CLAMP_MODE, MCC_PIPETTEOFFSET_FUNC)
 		PGC_SetAndActivateControl(device, "setvar_DataAcq_PipetteOffset_VC", val = settingValue)
 		PGC_SetAndActivateControl(device, "setvar_DataAcq_PipetteOffset_IC", val = settingValue)
-		settingValue = AI_SendToAmp(device, headStage, I_CLAMP_MODE, MCC_GETHOLDING_FUNC, NaN, checkBeforeWrite = 1)
+		settingValue = AI_ReadFromAmplifier(device, headStage, I_CLAMP_MODE, MCC_HOLDING_FUNC)
 		PGC_SetAndActivateControl(device, "setvar_DataAcq_Hold_IC", val = settingValue)
-		settingValue = AI_SendToAmp(device, headStage, I_CLAMP_MODE, MCC_GETHOLDINGENABLE_FUNC, NaN, checkBeforeWrite = 1)
+		settingValue = AI_ReadFromAmplifier(device, headStage, I_CLAMP_MODE, MCC_HOLDINGENABLE_FUNC)
 		PGC_SetAndActivateControl(device, "check_DatAcq_HoldEnable", val = settingValue)
-		settingValue = AI_SendToAmp(device, headStage, I_CLAMP_MODE, MCC_GETBRIDGEBALRESIST_FUNC, NaN, checkBeforeWrite = 1)
+		settingValue = AI_ReadFromAmplifier(device, headStage, I_CLAMP_MODE, MCC_BRIDGEBALRESIST_FUNC)
 		PGC_SetAndActivateControl(device, "setvar_DataAcq_BB", val = settingValue)
-		settingValue = AI_SendToAmp(device, headStage, I_CLAMP_MODE, MCC_GETBRIDGEBALENABLE_FUNC, NaN, checkBeforeWrite = 1)
+		settingValue = AI_ReadFromAmplifier(device, headStage, I_CLAMP_MODE, MCC_BRIDGEBALENABLE_FUNC)
 		PGC_SetAndActivateControl(device, "check_DatAcq_BBEnable", val = settingValue)
-		settingValue = AI_SendToAmp(device, headStage, I_CLAMP_MODE, MCC_GETNEUTRALIZATIONCAP_FUNC, NaN, checkBeforeWrite = 1)
+		settingValue = AI_ReadFromAmplifier(device, headStage, I_CLAMP_MODE, MCC_NEUTRALIZATIONCAP_FUNC)
 		PGC_SetAndActivateControl(device, "setvar_DataAcq_CN", val = settingValue)
-		settingValue = AI_SendToAmp(device, headStage, I_CLAMP_MODE, MCC_GETNEUTRALIZATIONENABL_FUNC, NaN, checkBeforeWrite = 1)
+		settingValue = AI_ReadFromAmplifier(device, headStage, I_CLAMP_MODE, MCC_NEUTRALIZATIONENABL_FUNC)
 		PGC_SetAndActivateControl(device, "check_DatAcq_CNEnable", val = settingValue)
 		PGC_SetAndActivateControl(device, "check_DataAcq_AutoBias", val = CHECKBOX_UNSELECTED)
 		PGC_SetAndActivateControl(device, "check_DatAcq_HoldEnableVC", val = CHECKBOX_UNSELECTED)

Packages/MIES/MIES_Configuration.ipf

@@ -404,69 +404,61 @@ Constant NUM_CLAMP_MODES = 3
 /// @name Possible values for the function parameter of AI_SendToAmp
 /// @anchor AI_SendToAmpConstants
 ///@{
-Constant MCC_BEGIN_INVALID_FUNC          = 10000
-Constant MCC_SETHOLDING_FUNC             = 10001
-Constant MCC_GETHOLDING_FUNC             = 10002
-Constant MCC_SETHOLDINGENABLE_FUNC       = 10003
-Constant MCC_GETHOLDINGENABLE_FUNC       = 10004
-Constant MCC_SETBRIDGEBALENABLE_FUNC     = 10005
-Constant MCC_GETBRIDGEBALENABLE_FUNC     = 10006
-Constant MCC_SETBRIDGEBALRESIST_FUNC     = 10007
-Constant MCC_GETBRIDGEBALRESIST_FUNC     = 10008
-Constant MCC_AUTOBRIDGEBALANCE_FUNC      = 10009
-Constant MCC_SETNEUTRALIZATIONENABL_FUNC = 10010
-Constant MCC_GETNEUTRALIZATIONENABL_FUNC = 10011
-Constant MCC_SETNEUTRALIZATIONCAP_FUNC   = 10012
-Constant MCC_GETNEUTRALIZATIONCAP_FUNC   = 10013
-Constant MCC_SETWHOLECELLCOMPENABLE_FUNC = 10014
-Constant MCC_GETWHOLECELLCOMPENABLE_FUNC = 10015
-Constant MCC_SETWHOLECELLCOMPCAP_FUNC    = 10016
-Constant MCC_GETWHOLECELLCOMPCAP_FUNC    = 10017
-Constant MCC_SETWHOLECELLCOMPRESIST_FUNC = 10018
-Constant MCC_GETWHOLECELLCOMPRESIST_FUNC = 10019
-Constant MCC_AUTOWHOLECELLCOMP_FUNC      = 10020
-Constant MCC_SETRSCOMPENABLE_FUNC        = 10021
-Constant MCC_GETRSCOMPENABLE_FUNC        = 10022
-Constant MCC_SETRSCOMPBANDWIDTH_FUNC     = 10023
-Constant MCC_GETRSCOMPBANDWIDTH_FUNC     = 10024
-Constant MCC_SETRSCOMPCORRECTION_FUNC    = 10025
-Constant MCC_GETRSCOMPCORRECTION_FUNC    = 10026
-Constant MCC_SETRSCOMPPREDICTION_FUNC    = 10027
-Constant MCC_GETRSCOMPPREDICTION_FUNC    = 10028
-Constant MCC_SETOSCKILLERENABLE_FUNC     = 10029
-Constant MCC_GETOSCKILLERENABLE_FUNC     = 10030
-Constant MCC_AUTOPIPETTEOFFSET_FUNC      = 10031
-Constant MCC_SETPIPETTEOFFSET_FUNC       = 10032
-Constant MCC_GETPIPETTEOFFSET_FUNC       = 10033
-Constant MCC_SETFASTCOMPCAP_FUNC         = 10034
-Constant MCC_GETFASTCOMPCAP_FUNC         = 10035
-Constant MCC_SETSLOWCOMPCAP_FUNC         = 10036
-Constant MCC_GETSLOWCOMPCAP_FUNC         = 10037
-Constant MCC_SETFASTCOMPTAU_FUNC         = 10038
-Constant MCC_GETFASTCOMPTAU_FUNC         = 10039
-Constant MCC_SETSLOWCOMPTAU_FUNC         = 10040
-Constant MCC_GETSLOWCOMPTAU_FUNC         = 10041
-Constant MCC_SETSLOWCOMPTAUX20ENAB_FUNC  = 10042
-Constant MCC_GETSLOWCOMPTAUX20ENAB_FUNC  = 10043
-Constant MCC_AUTOFASTCOMP_FUNC           = 10044
-Constant MCC_AUTOSLOWCOMP_FUNC           = 10045
-Constant MCC_SETSLOWCURRENTINJENABL_FUNC = 10046
-Constant MCC_GETSLOWCURRENTINJENABL_FUNC = 10047
-Constant MCC_SETSLOWCURRENTINJLEVEL_FUNC = 10048
-Constant MCC_GETSLOWCURRENTINJLEVEL_FUNC = 10049
-Constant MCC_SETSLOWCURRENTINJSETLT_FUNC = 10050
-Constant MCC_GETSLOWCURRENTINJSETLT_FUNC = 10051
-Constant MCC_SETPRIMARYSIGNALGAIN_FUNC   = 10052
-Constant MCC_GETPRIMARYSIGNALGAIN_FUNC   = 10053
-Constant MCC_SETSECONDARYSIGNALGAIN_FUNC = 10054
-Constant MCC_GETSECONDARYSIGNALGAIN_FUNC = 10055
-Constant MCC_SETPRIMARYSIGNALHPF_FUNC    = 10056
-Constant MCC_GETPRIMARYSIGNALHPF_FUNC    = 10057
-Constant MCC_SETPRIMARYSIGNALLPF_FUNC    = 10058
-Constant MCC_GETPRIMARYSIGNALLPF_FUNC    = 10059
-Constant MCC_SETSECONDARYSIGNALLPF_FUNC  = 10060
-Constant MCC_GETSECONDARYSIGNALLPF_FUNC  = 10061
-Constant MCC_END_INVALID_FUNC            = 10062
+Constant MCC_BEGIN_INVALID_FUNC       = 10000
+Constant MCC_HOLDING_FUNC             = 10001
+Constant MCC_HOLDINGENABLE_FUNC       = 10002
+Constant MCC_BRIDGEBALENABLE_FUNC     = 10003
+Constant MCC_BRIDGEBALRESIST_FUNC     = 10004
+Constant MCC_AUTOBRIDGEBALANCE_FUNC   = 10005
+Constant MCC_NEUTRALIZATIONENABL_FUNC = 10006
+Constant MCC_NEUTRALIZATIONCAP_FUNC   = 10007
+Constant MCC_WHOLECELLCOMPENABLE_FUNC = 10008
+Constant MCC_WHOLECELLCOMPCAP_FUNC    = 10009
+Constant MCC_WHOLECELLCOMPRESIST_FUNC = 10010
+Constant MCC_AUTOWHOLECELLCOMP_FUNC   = 10011
+Constant MCC_RSCOMPENABLE_FUNC        = 10012
+Constant MCC_RSCOMPBANDWIDTH_FUNC     = 10013
+Constant MCC_RSCOMPCORRECTION_FUNC    = 10014
+Constant MCC_RSCOMPPREDICTION_FUNC    = 10015
+Constant MCC_OSCKILLERENABLE_FUNC     = 10016
+Constant MCC_AUTOPIPETTEOFFSET_FUNC   = 10017
+Constant MCC_PIPETTEOFFSET_FUNC       = 10018
+Constant MCC_FASTCOMPCAP_FUNC         = 10019
+Constant MCC_SLOWCOMPCAP_FUNC         = 10020
+Constant MCC_FASTCOMPTAU_FUNC         = 10021
+Constant MCC_SLOWCOMPTAU_FUNC         = 10022
+Constant MCC_SLOWCOMPTAUX20ENAB_FUNC  = 10023
+Constant MCC_AUTOFASTCOMP_FUNC        = 10024
+Constant MCC_AUTOSLOWCOMP_FUNC        = 10025
+Constant MCC_SLOWCURRENTINJENABL_FUNC = 10026
+Constant MCC_SLOWCURRENTINJLEVEL_FUNC = 10027
+Constant MCC_SLOWCURRENTINJSETLT_FUNC = 10028
+Constant MCC_PRIMARYSIGNALGAIN_FUNC   = 10029
+Constant MCC_SECONDARYSIGNALGAIN_FUNC = 10030
+Constant MCC_PRIMARYSIGNALHPF_FUNC    = 10031
+Constant MCC_PRIMARYSIGNALLPF_FUNC    = 10032
+Constant MCC_SECONDARYSIGNALLPF_FUNC  = 10033
+
+Constant MCC_LAST_HARDWARE_FUNC = 10033 // needs updating if the above list changes
+
+///@name Constants which don't represent MCC amplifier settings on the front panel/hardware
+///@{
+Constant MCC_NO_AMPCHAIN_FUNC          = 10034
+Constant MCC_NO_AUTOBIAS_V_FUNC        = 10035
+Constant MCC_NO_AUTOBIAS_VRANGE_FUNC   = 10036
+Constant MCC_NO_AUTOBIAS_IBIASMAX_FUNC = 10037
+Constant MCC_NO_AUTOBIAS_ENABLE_FUNC   = 10038
+///@}
+
+Constant MCC_END_INVALID_FUNC = 10039
+///@}
+
+/// @name Access type for amplifier read/write functions
+///
+/// @anchor MCCAccessType
+///@{
+Constant MCC_READ  = 0x1
+Constant MCC_WRITE = 0x2
 ///@}
 
 /// Magic value for selecting "Bypass" in the bessel filter for the primary output

Packages/MIES/MIES_Constants.ipf

@@ -3596,16 +3596,17 @@ End
 Function DAP_SetVarProc_AmpCntrls(STRUCT WMSetVariableAction &sva) : SetVariableControl
 
 	string device, ctrl
-	variable headStage
+	variable headStage, func, clampMode
 
 	switch(sva.eventCode)
 		case 1: // mouse up
 		case 2: // Enter key
 			device = sva.win
 			ctrl   = sva.ctrlName
 			DAG_Update(sva.win, sva.ctrlName, val = sva.dval)
-			headStage = DAG_GetNumericalValue(device, "slider_DataAcq_ActiveHeadstage")
-			AI_UpdateAmpModel(device, ctrl, headStage)
+			headStage         = DAG_GetNumericalValue(device, "slider_DataAcq_ActiveHeadstage")
+			[func, clampMode] = AI_mapcontrolNameToFunctionConstant(ctrl)
+			AI_WriteToAmplifier(device, headStage, clampMode, func, sva.dval, GUIWrite = 0)
 			break
 		default:
 			break
@@ -3617,15 +3618,16 @@ End
 Function DAP_ButtonProc_AmpCntrls(STRUCT WMButtonAction &ba) : ButtonControl
 
 	string device, ctrl
-	variable headStage
+	variable headStage, func, clampMode
 
 	switch(ba.eventCode)
 		case 2: // mouse up
 			device = ba.win
 			ctrl   = ba.ctrlName
 
-			headStage = DAG_GetNumericalValue(device, "slider_DataAcq_ActiveHeadstage")
-			AI_UpdateAmpModel(device, ctrl, headstage)
+			headStage         = DAG_GetNumericalValue(device, "slider_DataAcq_ActiveHeadstage")
+			[func, clampMode] = AI_mapcontrolNameToFunctionConstant(ctrl)
+			AI_WriteToAmplifier(device, headstage, clampMode, func, 1, GUIWrite = 0)
 			break
 		default:
 			break
@@ -3637,16 +3639,17 @@ End
 Function DAP_CheckProc_AmpCntrls(STRUCT WMCheckboxAction &cba) : CheckBoxControl
 
 	string device, ctrl
-	variable headStage
+	variable headStage, func, clampMode
 
 	switch(cba.eventCode)
 		case 2: // mouse up
 			device = cba.win
 			ctrl   = cba.ctrlName
 
 			DAG_Update(cba.win, cba.ctrlName, val = cba.checked)
-			headStage = DAG_GetNumericalValue(device, "slider_DataAcq_ActiveHeadstage")
-			AI_UpdateAmpModel(device, ctrl, headStage)
+			headStage         = DAG_GetNumericalValue(device, "slider_DataAcq_ActiveHeadstage")
+			[func, clampMode] = AI_mapcontrolNameToFunctionConstant(ctrl)
+			AI_WriteToAmplifier(device, headStage, clampMode, func, cba.checked, GUIWrite = 0)
 			break
 		default:
 			break

Packages/MIES/MIES_DAEphys.ipf

@@ -294,8 +294,8 @@ Function DQ_ApplyAutoBias(string device, WAVE TPResults)
 		current *= DAG_GetNumericalValue(device, "setvar_Settings_AutoBiasPerc") * PERCENT_TO_ONE
 
 		// check if holding is enabled. If it is not, ignore holding current value.
-		if(AI_SendToAmp(device, headStage, I_CLAMP_MODE, MCC_GETHOLDINGENABLE_FUNC, NaN))
-			actualCurrent = AI_SendToAmp(device, headStage, I_CLAMP_MODE, MCC_GETHOLDING_FUNC, NaN, usePrefixes = 0)
+		if(AI_ReadFromAmplifier(device, headStage, I_CLAMP_MODE, MCC_HOLDINGENABLE_FUNC))
+			actualCurrent = AI_ReadFromAmplifier(device, headStage, I_CLAMP_MODE, MCC_HOLDING_FUNC, usePrefixes = 0)
 		else
 			actualCurrent = 0
 		endif
@@ -316,8 +316,8 @@ Function DQ_ApplyAutoBias(string device, WAVE TPResults)
 		endif
 
 		DEBUGPRINT("current[A] to send=", var = current)
-		AI_UpdateAmpModel(device, "check_DatAcq_HoldEnable", headStage, value = 1, sendToAll = 0)
-		AI_UpdateAmpModel(device, "setvar_DataAcq_Hold_IC", headstage, value = current * ONE_TO_PICO, sendToAll = 0)
+		AI_WriteToAmplifier(device, headStage, I_CLAMP_MODE, MCC_HOLDINGENABLE_FUNC, 1, sendToAll = 0)
+		AI_WriteToAmplifier(device, headStage, I_CLAMP_MODE, MCC_HOLDING_FUNC, current * ONE_TO_PICO, sendToAll = 0)
 	endfor
 End
 

Packages/MIES/MIES_DataAcquisition.ipf

@@ -868,10 +868,10 @@ Function ED_TPDocumentation(string device)
 			continue
 		endif
 
-		TPSettingsWave[0][4][i] = AI_SendToAmp(device, i, V_CLAMP_MODE, MCC_GETFASTCOMPCAP_FUNC, NaN, selectAmp = 0)
-		TPSettingsWave[0][5][i] = AI_SendToAmp(device, i, V_CLAMP_MODE, MCC_GETSLOWCOMPCAP_FUNC, NaN, selectAmp = 0)
-		TPSettingsWave[0][6][i] = AI_SendToAmp(device, i, V_CLAMP_MODE, MCC_GETFASTCOMPTAU_FUNC, NaN, selectAmp = 0)
-		TPSettingsWave[0][7][i] = AI_SendToAmp(device, i, V_CLAMP_MODE, MCC_GETSLOWCOMPTAU_FUNC, NaN, selectAmp = 0)
+		TPSettingsWave[0][4][i] = AI_ReadFromAmplifier(device, i, V_CLAMP_MODE, MCC_FASTCOMPCAP_FUNC, selectAmp = 0)
+		TPSettingsWave[0][5][i] = AI_ReadFromAmplifier(device, i, V_CLAMP_MODE, MCC_SLOWCOMPCAP_FUNC, selectAmp = 0)
+		TPSettingsWave[0][6][i] = AI_ReadFromAmplifier(device, i, V_CLAMP_MODE, MCC_FASTCOMPTAU_FUNC, selectAmp = 0)
+		TPSettingsWave[0][7][i] = AI_ReadFromAmplifier(device, i, V_CLAMP_MODE, MCC_SLOWCOMPTAU_FUNC, selectAmp = 0)
 	endfor
 
 	TPSettingsWave[0][1][0, NUM_HEADSTAGES - 1] = (hsProp[r][%ClampMode] == V_CLAMP_MODE) ? TPResults[%BaselineSteadyState][r] : NaN