remove AVRQ-3-B supportINSTRUMENT_6_0_4

1 files changed, 1 insertions, 106 deletions

diff --git a/menus.c b/menus.c
index c7e60bc..4781356 100644
--- a/menus.c
+++ b/menus.c
@@ -166,7 +166,6 @@
 #define Show_route_secondary 1600
 #define Show_load_type 1700
 #define Show_slew 1800
-#define Show_avrq_ampl 1900
 
 
 /* KEY MENU-JUGGLING VARIABLES - controlling what is actually shown on the display */
@@ -576,24 +575,6 @@ void Show_Main_Menu(void)
 	}
 
 
-	/*----- display AVRQ extra amplitudes -----*/
-
-	if (globals.Flash.enable_avrq_extra_ampls) {
-		for (chan=2; chan<5; ++chan) {
-			++LCD_entry;
-			Main_Menu_Structure[LCD_entry]=Submenu1_avrq+chan;
-			LCD_row=LCD_entry % LCD_rows;
-			LCD_col=((LCD_entry % LCD_max_entries_per_page) / LCD_rows) * LCD_col_width + 1;
-
-			show_item=Show_avrq_ampl+chan;
-			menu_string = g_string_append (menu_string, "AMP");
-			g_string_append_printf (menu_string, "%d", chan+1);
-			menu_string = g_string_append (menu_string, ":");
-			Display_Number_on_LCD(Menu_Is_Item_Visible(LCD_entry), LCD_row,LCD_col,menu_string->str,show_item,sig_dig,LCD_col_width-1);
-			g_string_erase (menu_string, 0, -1);
-		}
-	}
-
 	/*----- display soft_current_limit, as appropriate -----*/
 
 	for (chan=0; chan<(globals.Flash.ChanKey_current_limit?globals.Flash.channels:1); ++chan) {
@@ -1118,22 +1099,6 @@ static void Display_Number_on_LCD(int Is_Item_Visible,int LCD_row,int LCD_col,ch
 			}
 			break;
 
-		case Show_avrq_ampl:
-			switch (channel) {
-			case 2:
-				Submenu_Value=globals.ChannelState[0].vcc1;
-				break;
-			case 3:
-				Submenu_Value=globals.ChannelState[0].vcc2;
-				break;
-			case 4:
-				Submenu_Value=globals.ChannelState[0].vlogic;
-				break;
-			}
-			show_plus_sign=YES;
-			units = g_strdup("V");
-			break;
-
 		case Show_offset:
 			Submenu_Value=globals.ChannelState[channel].offset;
 			show_plus_sign=YES;
@@ -1351,15 +1316,7 @@ static void Submenu_Display(int change_selection)
 		break;
 
 	case Submenu1_amp:
-		if (globals.Flash.enable_avrq_extra_ampls) {
-			if (channel==0) {
-				title = g_strdup ("Amplitude1 (HV):");
-			} else {
-				title = g_strdup ("Amplitude2 (IBIAS):");
-			}
-		} else {
-			title = g_strdup ("Amplitude:");
-		}
+		title = g_strdup ("Amplitude:");
 
 		if (number_of_fixed_ampl_points(channel)>0) {
 			int fixed_count;
@@ -1384,23 +1341,6 @@ static void Submenu_Display(int change_selection)
 
 		break;
 
-	case Submenu1_avrq:
-
-		switch (channel) {
-		case 2:
-			title = g_strdup ("Amplitude3 (Vcc1):");
-			break;
-		case 3:
-			title = g_strdup ("Amplitude4 (Vcc2):");
-			break;
-		case 4:
-			title = g_strdup ("Amplitude5 (Vlogic):");
-			break;
-		}
-
-		Submenu_Numeric_Parameter=Show_avrq_ampl+channel;
-		break;
-
 	case Submenu1_burst_count:
 		title = g_strdup ("Pulses per burst:");
 		Submenu_Numeric_Parameter=Show_Burst_Count+channel;
@@ -2212,25 +2152,6 @@ static int Submenu_Mult_Value(float mult_by)
 		}
 		break;
 
-	case Show_avrq_ampl:
-		if (fabs(new_value)<AVRQ_ZERO_EQUIV && mult_by>1.0) {
-			new_value=AVRQ_ZERO_EQUIV;
-		} else if (fabs(new_value) < AVRQ_ZERO_EQUIV) {
-			new_value=smallest_allowed_number;
-		}
-
-		if (channel == 4) { /* vlogic */
-			if (mult_by > 1.0) {
-				new_value = globals.ChannelState[0].vcc1;
-			} else {
-				new_value = 0.0;
-			}
-		}
-		if (error_num=Set_Amplitude(0,0,0,0,0,0,channel,new_value,0)) {
-			Submenu_Value=new_value;
-		}
-		break;
-
 	case Show_Burst_Time:
 		if (error_num=Set_Burst_Time(0,0,0,channel,new_value)) {
 			Submenu_Value=new_value;
@@ -2480,21 +2401,6 @@ static void Submenu_Service_Encoder(int encoder_change)
 			}
 		}
 
-		else if (abs_Submenu_Value < AVRQ_ZERO_EQUIV && (Submenu_Numeric_Parameter-channel)==Show_avrq_ampl) {
-			abs_Submenu_Value=AVRQ_ZERO_EQUIV;
-
-			if (channel == 4) { /* vlogic */
-				if (encoder_change > 0) {
-					Submenu_Value = abs_Submenu_Value = globals.ChannelState[0].vcc1;
-					encoder_change = 0;
-				} else {
-					Submenu_Value = abs_Submenu_Value = 0.0;
-					encoder_change = 0;
-				}
-			}
-
-		}
-
 		else if ((channel<max_channels) && abs_Submenu_Value<globals.Flash.ampl_zero_equiv[channel] && (Submenu_Numeric_Parameter-channel)==Show_offset) {
 			abs_Submenu_Value=globals.Flash.ampl_zero_equiv[channel];
 			if (globals.Flash.max_offset[channel]<globals.Flash.ampl_zero_equiv[channel]) {
@@ -2721,17 +2627,6 @@ static void Submenu_Service_Encoder(int encoder_change)
 		}
 		break;
 
-	case Show_avrq_ampl:
-		if (new_value < AVRQ_ZERO_EQUIV) {
-			new_value=0.0;
-		}
-
-		if (error_num=Set_Amplitude(0,0,0,0,0,0,channel,new_value,0)) {
-			Submenu_Value=new_value;
-		}
-
-		break;
-
 	case Show_offset:
 		if (globals.Flash.min_offset[channel]==globals.Flash.max_offset[channel]) {
 			return;