diff options
| -rw-r--r-- | error_utils.c | 18 | ||||
| -rw-r--r-- | globals.h | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/error_utils.c b/error_utils.c index 5985442..3e2e4fd 100644 --- a/error_utils.c +++ b/error_utils.c @@ -42,8 +42,8 @@ void set_gpib_error_flags (int error_num) case InvalidChannel: case ThisShouldntHappen: case obsolete_feature: - case zero_equiv_ampl_too_large: - case zero_equiv_ampl_negative: + case config_too_large: + case config_cant_be_negative: GPIB_Set_Command_Error(); break; case query_error_interrupted: @@ -612,12 +612,12 @@ void get_error_text(gchar **response, int error_num) format_error_text(response,-200,"Obsolete feature enabled. Re-program."); break; - case zero_equiv_ampl_too_large: - format_error_text(response,-200,"Ampl zero equivalent is too high. Reprogram it."); + case config_too_large: + format_error_text(response,-200,"This constant is too large. Reprogram it."); break; - case zero_equiv_ampl_negative: - format_error_text(response,-200,"This constant can't be negative."); + case config_cant_be_negative: + format_error_text(response,-200,"This constant can't be negative. Reprogram it."); break; default: @@ -776,18 +776,18 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) } if (fabs(globals.Flash.ampl_zero_equiv[i] > 2000.0)) { - report_error = zero_equiv_ampl_too_large; + report_error = config_too_large; } if (fabs(globals.Flash.os_zero_equiv[i] > 2000.0)) { - report_error = zero_equiv_ampl_too_large; + report_error = config_too_large; } if ( (globals.Flash.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) ) { - report_error = zero_equiv_ampl_negative; + report_error = config_cant_be_negative; } /* calculate maximum duty cycle based on amplitude and load, for later use */ @@ -92,10 +92,10 @@ #define ExternalModeDelayError 78 #define PRF_limited_by_offset 79 #define obsolete_feature 80 -#define zero_equiv_ampl_too_large 81 +#define config_too_large 81 #define GPIB_missing 82 #define rise_time_confined_values 83 -#define zero_equiv_ampl_negative 84 +#define config_cant_be_negative 84 #define amplitude_gap 85 #define CalibrationMinMaxError_ampl 86 #define CalibrationMinMaxError_pw 87 |