diff options
| author | Mike <mjc@avtechpulse.com> | 2000-01-01 00:25:00 +0900 |
|---|---|---|
| committer | Mike <mjc@avtechpulse.com> | 2000-01-01 00:25:00 +0900 |
| commit | 4f94b723338bf6e30ad2a29d49ce5663f3ff8f5a (patch) | |
| tree | e600f45db14ed5ad8020d700382222b816884be4 /device-functions.c | |
| parent | c2d37512824f8014ac5ca981299a2d148c27b4d9 (diff) | |
fix min/max ampl/vout balancing when nulling delay shift calINSTRUMENT_6_4_10b
Diffstat (limited to 'device-functions.c')
| -rw-r--r-- | device-functions.c | 4 |
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); |