diff options
Diffstat (limited to 'error_utils.c')
| -rw-r--r-- | error_utils.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/error_utils.c b/error_utils.c index ccd9837..bf6168d 100644 --- a/error_utils.c +++ b/error_utils.c @@ -845,7 +845,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) break; } - if (fabs(globals.Flash.ampl_zero_equiv[i] > 2000.0)) { + if (fabs(get_ampl_zero_equiv(i) > 2000.0)) { report_error = config_too_large; } @@ -853,7 +853,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) report_error = config_too_large; } - if ( (globals.Flash.ampl_zero_equiv[i] < 0.0) || + if ( (get_ampl_zero_equiv(i) < 0.0) || (globals.Flash.os_zero_equiv[i] < 0.0) || (globals.Flash.hvps_avg_curr_limit[i] < 0.0) || (globals.Flash.max_avg_power[i] < 0.0) ) { @@ -1098,7 +1098,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) /* --- check gaps in ampl range, AVRQ -AHV/-XHV ---- */ if (non_zero_first_ampl_point(i)) { - if (fabs(ChannelStateToTest[i].amplitude) < globals.Flash.ampl_zero_equiv[i]) { + if (fabs(ChannelStateToTest[i].amplitude) < get_ampl_zero_equiv(i)) { report_error=amplitude_gap; } } @@ -1212,7 +1212,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) /* 1011 models: high level of PG-P output must remain positive */ // FIXME use new check_ functions? if (globals.Flash.ampl_coupled_to_os[i]) { - if (ChannelStateToTest[i].amplitude>globals.Flash.ampl_zero_equiv[i]) { + if (ChannelStateToTest[i].amplitude>get_ampl_zero_equiv(i)) { temp=-ChannelStateToTest[i].amplitude; if (temp>globals.Constraints.err_min_offset[i]) { globals.Constraints.err_min_offset[i]=temp; @@ -1247,7 +1247,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) /* 1011 models: low level of PG-N output must remain negative */ if (globals.Flash.ampl_coupled_to_os[i]) { - if (ChannelStateToTest[i].amplitude<-globals.Flash.ampl_zero_equiv[i]) { + if (ChannelStateToTest[i].amplitude<-get_ampl_zero_equiv(i)) { temp=-ChannelStateToTest[i].amplitude; if (temp<globals.Constraints.err_max_offset[i]) { globals.Constraints.err_max_offset[i]=temp; |