diff options
| author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2014-08-13 15:43:49 -0400 |
|---|---|---|
| committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2014-08-13 15:43:49 -0400 |
| commit | 6959b9dadb91c32c2582afe0b4abaa040af53504 (patch) | |
| tree | b105c8016878b8fd7b3dfc86e1bcbb3e80d28d5b /error_utils.c | |
| parent | 2691b7441d1a8cad7ccb23b766180d9f5176b567 (diff) | |
first attempt at better AVRQ amplitude handling
Diffstat (limited to 'error_utils.c')
| -rw-r--r-- | error_utils.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/error_utils.c b/error_utils.c index 0a77019..603d072 100644 --- a/error_utils.c +++ b/error_utils.c @@ -20,6 +20,7 @@ END DESCRIPTION **********************************************************/ #include "error_utils.h" #include "menus.h" #include "gpib.h" +#include "device-functions.h" /*** EndHeader */ @@ -1095,16 +1096,11 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) /* --- check intermediate amplitude --- */ - if (globals.Flash.ampl_min_max_only[i]) - - if ( !(fabs(ChannelStateToTest[i].amplitude - globals.Flash.min_ampl[i] ) < globals.Flash.ampl_zero_equiv[i] ) - && - !(fabs(ChannelStateToTest[i].amplitude - globals.Flash.max_ampl[i]) < globals.Flash.ampl_zero_equiv[i] ) - ) - - { + if (number_of_fixed_ampl_points(i)>0) { + if (!fixed_ampl_ok (i, ChannelStateToTest[i].amplitude)) { report_error=amplitude_confined_values; } + } /* ------------------------------- */ |