summaryrefslogtreecommitdiff
path: root/device-functions.c
diff options
context:
space:
mode:
Diffstat (limited to 'device-functions.c')
-rw-r--r--device-functions.c4
1 files 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);