first attempt at better AVRQ amplitude handling

1 files changed, 8 insertions, 3 deletions

diff --git a/globals.h b/globals.h
index 891aa2e..ec25b09 100644
--- a/globals.h
+++ b/globals.h
@@ -266,6 +266,10 @@
 #define Submenu1_avrq 3400
 
 
+// must be equal!
+#define Submenu_maximum_entries 10
+#define max_fixed_ampl_points 10
+
 long sec_timer (void);
 unsigned long long ms_timer (void);
 
@@ -514,10 +518,9 @@ typedef struct {
 	char switchable_load[max_channels];
 	char monitor_enabled[max_channels]; 		/* addr 1906 */
 	char use_pos_ampl_data_only[max_channels];
-	char ampl_min_max_only[max_channels];
-
-	short zout_min[max_channels]; 			/* addr 1912 */
+	char ampl_min_max_only[max_channels];		/* no longer used - use fixed_ampl_points instead */
 
+	short zout_min[max_channels];                   /* addr 1912 */
 	short os_pwl_Vc_norm4095[max_channels][os_ranges][os_polarities][points_in_range];	/* addr 1916 */
 	float os_pwl_amp[max_channels][os_ranges][os_polarities][points_in_range];		/* addr 2116 */
 
@@ -729,6 +732,8 @@ typedef struct {
         float max_freq_for_high_ot[max_channels];       /* addr 10154, for 1011-OT */
         float high_ot[max_channels];                    /* addr 10162, for 1011-OT */
 
+	float fixed_ampl_points[max_channels][max_fixed_ampl_points];	/* addr 10170, for AVR-D2, AVRQ-4 */
+
 	char flash_end;
 
 } FlashStruct;