Major reworking. Set_VI_Control now stores its calculation results for later reference.INSTRUMENT_6_4_23d

This fixes the problem of adding cal points to parameters with large adjustments.
The x values are now correct, but the user must still manually compensate for y changes.

1 files changed, 25 insertions, 8 deletions

diff --git a/globals.h b/globals.h
index ca46c20..d78584a 100644
--- a/globals.h
+++ b/globals.h
@@ -145,13 +145,14 @@
 
 #define pwl_ampl_values 0
 #define pwl_os_values 1
-#define pwl_pw_values 3
-#define pwl_delay_values 4
-#define pwl_period_values 5
-#define pwl_burst_values 6
-#define pwl_rise_time_values 7
-#define pwl_slew_values 9
-#define pwl_distort_values 10
+#define pwl_pw_values 2
+#define pwl_delay_values 3
+#define pwl_period_values 4
+#define pwl_burst_values 5
+#define pwl_rise_time_values 6
+#define pwl_slew_values 7
+#define pwl_distort_values 8
+#define pwl_max_types 9
 
 #define dac_max 8191
 
@@ -293,12 +294,13 @@
 #define Submenu1_avrq 3400
 
 
-// must be equal!
+// must be equal!;
 #define Submenu_maximum_entries 10
 #define max_fixed_ampl_points 10
 
 long sec_timer (void);
 unsigned long long ms_timer (void);
+void debug_new_parameter (int channel, int parameter, float requested);
 
 
 #define max_gpib_input_length 512
@@ -341,6 +343,19 @@ typedef struct {
 
 
 typedef struct {
+	int point_found;
+	int range;
+	int atten_range;
+	int entry;
+	int word_out;
+	int actual_pol;
+	int use_neg_data;
+	int word_out_aux;
+	float actual_value;
+} PwlStruct;
+
+
+typedef struct {
 	int channel;
 	int cal_type;
 	int count;
@@ -958,5 +973,7 @@ typedef struct {
 
 extern GlobalStruct globals;
 
+extern PwlStruct pwl_struct[pwl_max_types][max_channels]; 
+
 #endif