rename ab_mode vars to pw_ctrl_mode, and remove ab_mode chankey

1 files changed, 8 insertions, 8 deletions

diff --git a/menus.c b/menus.c
index d9acef3..c7a4195 100644
--- a/menus.c
+++ b/menus.c
@@ -408,7 +408,7 @@ void Show_Main_Menu(void)
 
 	for (chan=0; chan<(globals.Flash.ChanKey_delay?globals.Flash.channels:1); ++chan)
 		if (		(globals.ChannelState[chan].amp_mode!=amp_mode_amplify)
-		                && (globals.ChannelState[chan].ab_mode!=pw_in_out)
+		                && (globals.ChannelState[chan].pw_ctrl_mode!=pw_in_out)
 		                && ((globals.ChannelState[chan].func_mode==pulse_mode_on)
 		                    || (globals.ChannelState[chan].func_mode==dc_mode_on))
 		   ) {
@@ -449,7 +449,7 @@ void Show_Main_Menu(void)
 			show_item=Show_No_Number;
 
 			if (globals.ChannelState[chan].func_mode==pulse_mode_on) {
-				if (globals.ChannelState[chan].ab_mode==pw_normal) {
+				if (globals.ChannelState[chan].pw_ctrl_mode==pw_normal) {
 					if (globals.ChannelState[chan].hold_setting==hold_width) {
 						show_item=Show_pw+chan;
 						menu_string = g_string_append (menu_string, "PW");
@@ -1281,7 +1281,7 @@ static void Submenu_Display(int change_selection)
 		break;
 
 	case Submenu1_pw:
-		if (globals.ChannelState[channel].ab_mode==pw_normal) {
+		if (globals.ChannelState[channel].pw_ctrl_mode==pw_normal) {
 			if (globals.ChannelState[channel].hold_setting==hold_width) {
 				title = g_strdup ("Pulse Width:");
 				Submenu_Numeric_Parameter=Show_pw+channel;
@@ -1679,20 +1679,20 @@ static void Submenu_Display(int change_selection)
 			case mode_pw_norm:
 				mode_name = g_strdup("Normal");
 				if (globals.ChannelState[channel].func_mode==pulse_mode_on
-				                && globals.ChannelState[channel].hold_setting==hold_width && globals.ChannelState[channel].ab_mode==pw_normal) {
+				                && globals.ChannelState[channel].hold_setting==hold_width && globals.ChannelState[channel].pw_ctrl_mode==pw_normal) {
 					current_operating_mode=i;
 				}
 				break;
 			case mode_pw_duty:
 				mode_name = g_strdup("Duty Cycle");
 				if (globals.ChannelState[channel].func_mode==pulse_mode_on
-				                && globals.ChannelState[channel].hold_setting==hold_duty && globals.ChannelState[channel].ab_mode==pw_normal) {
+				                && globals.ChannelState[channel].hold_setting==hold_duty && globals.ChannelState[channel].pw_ctrl_mode==pw_normal) {
 					current_operating_mode=i;
 				}
 				break;
 			case mode_pw_inout:
 				mode_name = g_strdup("PWin=PWout");
-				if (globals.ChannelState[channel].func_mode==pulse_mode_on && globals.ChannelState[channel].ab_mode==pw_in_out) {
+				if (globals.ChannelState[channel].func_mode==pulse_mode_on && globals.ChannelState[channel].pw_ctrl_mode==pw_in_out) {
 					current_operating_mode=i;
 				}
 				break;
@@ -2981,7 +2981,7 @@ static int Submenu_Implement_Changes(void)
 		break;
 	case mode_pw_norm:
 		globals.ChannelState[channel].hold_setting=hold_width;
-		if ( (globals.ChannelState[channel].ab_mode!=pw_normal) || (globals.ChannelState[channel].func_mode!=pulse_mode_on)) {
+		if ( (globals.ChannelState[channel].pw_ctrl_mode!=pw_normal) || (globals.ChannelState[channel].func_mode!=pulse_mode_on)) {
 			if (error_num=Set_Func(channel,pulse_mode_on)) {
 				return error_num;
 			}
@@ -2995,7 +2995,7 @@ static int Submenu_Implement_Changes(void)
 		break;
 	case mode_pw_duty:
 		globals.ChannelState[channel].hold_setting=hold_duty;
-		if ( (globals.ChannelState[channel].ab_mode!=pw_normal) || (globals.ChannelState[channel].func_mode!=pulse_mode_on)) {
+		if ( (globals.ChannelState[channel].pw_ctrl_mode!=pw_normal) || (globals.ChannelState[channel].func_mode!=pulse_mode_on)) {
 			if (error_num=Set_Func(channel,pulse_mode_on)) {
 				return error_num;
 			}