From bee40b77fc98991b4b6ef33b1e738915bc989ff0 Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 1 Jan 2000 00:17:35 +0900 Subject: rename "polarity" variables to "inverted" for clarity --- menus.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'menus.c') diff --git a/menus.c b/menus.c index 538819d..9ca3cd9 100644 --- a/menus.c +++ b/menus.c @@ -856,7 +856,7 @@ void Show_Main_Menu(void) /*----- display inverted state, if allowed -----*/ - for (chan=0; chan<(globals.Flash.ChanKey_polarity?globals.Flash.channels:1); ++chan) { + for (chan=0; chan<(globals.Flash.ChanKey_inverted?globals.Flash.channels:1); ++chan) { if (globals.Flash.invert_allowed[chan]) { ++LCD_entry; Main_Menu_Structure[LCD_entry]=Submenu1_invert+chan; @@ -864,12 +864,12 @@ void Show_Main_Menu(void) LCD_col=((LCD_entry % LCD_max_entries_per_page) / LCD_rows) * LCD_col_width + 1; menu_string = g_string_append (menu_string, "INVERT"); - if (globals.Flash.ChanKey_polarity) { + if (globals.Flash.ChanKey_inverted) { g_string_append_printf (menu_string, "%d", chan+1); } menu_string = g_string_append (menu_string, ":"); - if (globals.ChannelState[chan].polarity==pol_norm) { + if (globals.ChannelState[chan].inverted==pol_norm) { menu_string = g_string_append (menu_string, "NO"); } else { menu_string = g_string_append (menu_string, "YES"); @@ -1465,7 +1465,7 @@ static void Submenu_Display(int change_selection) break; case Submenu1_invert: - title = title_with_channel("Inverted Mode",globals.Flash.ChanKey_polarity,channel); + title = title_with_channel("Inverted Mode",globals.Flash.ChanKey_inverted,channel); Submenu_max_entry=1; Submenu_Structure[0]=mode_inv_no; @@ -1776,13 +1776,13 @@ static void Submenu_Display(int change_selection) break; case mode_inv_no: mode_name = g_strdup("NO (normal)"); - if (globals.ChannelState[channel].polarity==pol_norm) { + if (globals.ChannelState[channel].inverted==pol_norm) { current_operating_mode=i; } break; case mode_inv_yes: mode_name = g_strdup("YES (inverted)"); - if (globals.ChannelState[channel].polarity==pol_complement) { + if (globals.ChannelState[channel].inverted==pol_complement) { current_operating_mode=i; } break; @@ -3156,12 +3156,12 @@ static int Submenu_Implement_Changes(void) GPIB_go_to_local(); break; case mode_inv_no: - if (error_num=Set_Pol(channel,pol_norm)) { + if (error_num=Set_Inverted(channel,pol_norm)) { return error_num; } break; case mode_inv_yes: - if (error_num=Set_Pol(channel,pol_complement)) { + if (error_num=Set_Inverted(channel,pol_complement)) { return error_num; } break; -- cgit