remove AVRQ-3-B supportINSTRUMENT_6_0_4

1 files changed, 11 insertions, 26 deletions

diff --git a/globals.h b/globals.h
index a39fe3b..3617762 100644
--- a/globals.h
+++ b/globals.h
@@ -91,7 +91,7 @@
 #define DelayRangeError 77
 #define ExternalModeDelayError 78
 #define PRF_limited_by_offset 79
-#define ampl_min_max_obsolete 80
+#define obsolete_feature 80
 #define zero_equiv_ampl_too_large 81
 
 
@@ -126,11 +126,7 @@
 #define pwl_period_values 5
 #define pwl_burst_values 6
 #define pwl_rise_time_values 7
-#define pwl_load_type_values 8
 #define pwl_slew_values 9
-#define pwl_vcc1_values 10
-#define pwl_vcc2_values 11
-#define pwl_vlogic_values 12
 
 #define dac_max 8191
 #define dac_min 819
@@ -358,10 +354,6 @@ typedef struct {
 	float soft_current_limit;       /* adjustable protection trip-point */
 	float slew;                     /* slew rate */
 
-	float vcc1;                     /* AVRQ control voltages */
-	float vcc2;
-	float vlogic;
-
 } ChannelStruct;
 
 
@@ -602,17 +594,16 @@ typedef struct {
 	float rcl_rise_time[max_channels][max_stored_settings];		/* 7406 - rcl/sav data for rise time */
 	short rise_time_pwl_Vc_norm4095[max_channels][ampl_ranges][ampl_polarities][points_in_range];	/* 7438 */
 
-#define AVRQ_ZERO_EQUIV 3.0
-	short vcc1_pwl_Vc_norm4095[1][1][1][points_in_range];
-	float vcc1_pwl_amp[1][1][1][points_in_range];
-	short vcc2_pwl_Vc_norm4095[1][1][1][points_in_range];
-	float vcc2_pwl_amp[1][1][1][points_in_range];
-	float rcl_vcc1[max_channels][max_stored_settings];
-	float rcl_vcc2[max_channels][max_stored_settings];
-	float rcl_vlogic[max_channels][max_stored_settings];
-	float vcc1_max[max_channels];
-	float vcc2_min[max_channels];
-	float vcc2_max[max_channels];
+	short vcc1_pwl_Vc_norm4095[1][1][1][points_in_range];	/* no longer used */
+	float vcc1_pwl_amp[1][1][1][points_in_range];		/* no longer used */
+	short vcc2_pwl_Vc_norm4095[1][1][1][points_in_range];   /* no longer used */
+	float vcc2_pwl_amp[1][1][1][points_in_range];		/* no longer used */
+	float rcl_vcc1[max_channels][max_stored_settings];	/* no longer used */
+	float rcl_vcc2[max_channels][max_stored_settings];	/* no longer used */
+	float rcl_vlogic[max_channels][max_stored_settings];	/* no longer used */
+	float vcc1_max[max_channels];				/* no longer used */
+	float vcc2_min[max_channels];				/* no longer used */
+	float vcc2_max[max_channels];				/* no longer used */
 
 	float max_duty_mid1[max_channels];		/* addr 8078 - for AVO-8D3-B, etc */
 	float duty_ampl_mid1[max_channels];          	/* addr 8086 */
@@ -765,12 +756,6 @@ typedef struct {
 	float err_max_slew[max_channels];
 	float err_min_load_type[max_channels];
 	float err_max_load_type[max_channels];
-	float err_min_vcc1[max_channels];
-	float err_max_vcc1[max_channels];
-	float err_min_vcc2[max_channels];
-	float err_max_vcc2[max_channels];
-	float err_min_vlogic[max_channels];
-	float err_max_vlogic[max_channels];
 	float composite_min_burst_time[max_channels];   /* minimum ever possible gap, taking into account all constraints */
 } ConstraintsStruct;