summaryrefslogtreecommitdiff
path: root/error_utils.c
diff options
context:
space:
mode:
authorMike <mjc@avtechpulse.com>2000-01-01 00:20:47 +0900
committerMike <mjc@avtechpulse.com>2000-01-01 00:20:47 +0900
commitb5cf0aed3eda14af3fa7268ae5715da81e3a3682 (patch)
tree73e740ae4ea7f36c14a33a5db37fb6bfd17c9e39 /error_utils.c
parent1fe9cd085b8e2c476434b80bbb8a6004dc42e14a (diff)
rename some error messages that flag inappropriate config values
Diffstat (limited to 'error_utils.c')
-rw-r--r--error_utils.c18
1 files changed, 9 insertions, 9 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 */