diff options
Diffstat (limited to 'device-functions.c')
| -rw-r--r-- | device-functions.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/device-functions.c b/device-functions.c index 56a6205..ef764b4 100644 --- a/device-functions.c +++ b/device-functions.c @@ -2423,18 +2423,15 @@ int Set_VI_Cal_Pnt(int parameter,int channel,int calibration_point_number,float case pwl_burst_values: case pwl_rise_time_values: case pwl_slew_values: - /* exclude relative changes of 45% or more unless < 15 ns */ - if ( (fabs(cal_point-nom_ampl)/nom_ampl > 0.45) && (fabs(cal_point-nom_ampl)>15e-9)) { - return CalibrationPercentError; - } if (cal_point<0.0) { return Negative_Not_Allowed; } - break; + // no break here, continue - delay can be negative case pwl_delay_values: /* exclude relative changes of 45% or more unless < 15 ns */ - if ( (fabs(cal_point-nom_ampl)/nom_ampl > 0.45) && (fabs(cal_point-nom_ampl)>15e-9)) { + if ( (fabs(cal_point-nom_ampl)/nom_ampl > 0.45) && (fabs(cal_point-nom_ampl)>15e-9) && !globals.Sys.disable_timing_cal_percent_check) { + // this check can be temporarily disabled for convenience return CalibrationPercentError; } break; |