more specific errors during cal min/max check, and more initial cal points

1 files changed, 40 insertions, 3 deletions

diff --git a/error_utils.c b/error_utils.c
index 9965b23..38a83ff 100644
--- a/error_utils.c
+++ b/error_utils.c
@@ -57,7 +57,14 @@ void set_gpib_error_flags (int error_num)
 	case queue_overflow:
 	case CalibrationPercentError:
 	case CalibrationZeroError:
-	case CalibrationMinMaxError:
+	case CalibrationMinMaxError_ampl:
+        case CalibrationMinMaxError_pw:
+        case CalibrationMinMaxError_os:
+        case CalibrationMinMaxError_freq:
+        case CalibrationMinMaxError_delay:
+        case CalibrationMinMaxError_burst:
+        case CalibrationMinMaxError_rise:
+        case CalibrationMinMaxError_slew:
 	case CalibrationClosenessError:
 	case CalibrationRangeError:
 	case CalibrationPolarityError:
@@ -462,10 +469,40 @@ void get_error_text(gchar **response, int error_num)
 		format_error_text(response,-340,"Zero point can not be changed.");
 		break;
 
-	case CalibrationMinMaxError:
-		format_error_text(response,-340,"Would prevent operation at the minimum or maximum settings.");
+	case CalibrationMinMaxError_ampl:
+		format_error_text(response,-340,"Would prevent operation at the minimum or maximum amplitude.");
 		break;
 
+	case CalibrationMinMaxError_pw:
+		format_error_text(response,-340,"Would prevent operation at the minimum or maximum pulse width.");
+		break;
+
+	case CalibrationMinMaxError_os:
+		format_error_text(response,-340,"Would prevent operation at the minimum or maximum offset.");
+		break;
+
+	case CalibrationMinMaxError_freq:
+		format_error_text(response,-340,"Would prevent operation at the minimum or maximum frequency.");
+		break;
+
+	case CalibrationMinMaxError_delay:
+		format_error_text(response,-340,"Would prevent operation at the minimum or maximum delay.");
+		break;
+
+	case CalibrationMinMaxError_burst:
+		format_error_text(response,-340,"Would prevent operation at the minimum or maximum burst separation.");
+		break;
+
+	case CalibrationMinMaxError_rise:
+		format_error_text(response,-340,"Would prevent operation at the minimum or maximum rise time.");
+		break;
+
+	case CalibrationMinMaxError_slew:
+		format_error_text(response,-340,"Would prevent operation at the minimum or maximum slew rate.");
+		break;
+
+
+
 	case CalibrationClosenessError:
 		format_error_text(response,-340,"Too few calibration points, or they are too closely spaced.");
 		break;