From 4f94b723338bf6e30ad2a29d49ce5663f3ff8f5a Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 1 Jan 2000 00:25:00 +0900 Subject: fix min/max ampl/vout balancing when nulling delay shift cal --- device-functions.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/device-functions.c b/device-functions.c index c66357e..0026539 100644 --- a/device-functions.c +++ b/device-functions.c @@ -1976,9 +1976,9 @@ int Set_Dly_Shr_Nom(int channel,int calibration_point_number) Set_frequency(0,0,0,globals.Flash.ChanKey_frequency?channel:0,5.0e0); if (globals.Flash.max_ampl[channel] > 0.0) { - ampl = globals.Flash.max_ampl[channel]; + ampl = MIN(globals.Flash.max_ampl[channel],globals.Flash.max_vout[channel]); } else { - ampl = globals.Flash.min_ampl[channel]; + ampl = MAX(globals.Flash.min_ampl[channel],globals.Flash.min_vout[channel]); } Set_Amplitude(0,0,0,0,0,0,0,channel,ampl,0); -- cgit