diff options
Diffstat (limited to 'error_utils.c')
| -rw-r--r-- | error_utils.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/error_utils.c b/error_utils.c index d159e50..395da81 100644 --- a/error_utils.c +++ b/error_utils.c @@ -272,6 +272,7 @@ void get_error_text(gchar **response, int error_num) break; case IllegalParameter: + case rise_time_confined_values: case amplitude_confined_values: format_error_text(response,-224,"Not in list of allowed values."); break; @@ -702,12 +703,6 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) break; } - - // check for channel-specific obsolete configurations - but allow further checks - if ( globals.Flash.ampl_min_max_only[i] ) { - report_error = obsolete_feature; - } - if (fabs(globals.Flash.ampl_zero_equiv[i] > 200.0)) { report_error = zero_equiv_ampl_too_large; } @@ -1398,6 +1393,16 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) /* disable amplitude checks if calibration is in progress */ if (!globals.Flash.fixed_rise_time[i]) if (!globals.Flags.extended_ampl_min_max) { + + if (globals.Flash.rise_time_min_max_only[i]) { + if ( !(fabs(ChannelStateToTest[i].rise_time - globals.Flash.min_rise_time[i]) < smallest_allowed_number ) + && + !(fabs(ChannelStateToTest[i].rise_time - globals.Flash.max_rise_time[i]) < smallest_allowed_number ) + ) { + report_error=rise_time_confined_values; + } + } + globals.Constraints.err_min_rise_time[i]=globals.Flash.min_rise_time[i]; if (ChannelStateToTest[i].rise_time<(0.999*globals.Constraints.err_min_rise_time[i])) { report_error=min_rise_time_error; |