summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael J. Chudobiak <mjc@avtechpulse.com>2015-04-29 12:42:57 -0400
committerMichael J. Chudobiak <mjc@avtechpulse.com>2015-04-29 12:42:57 -0400
commit98c708438199f5076998eefe8753f8a4b980d959 (patch)
tree54a5015e5d30f39aac5074e7f803dca088528493
parent8db3a7fc05c336ea33df80054bd526b1dfe03131 (diff)
fix possible ext dbl command conflict with CH2 suffixINSTRUMENT_6_0_18b
-rw-r--r--menus.c4
-rw-r--r--parser.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/menus.c b/menus.c
index e54db7b..c853ca5 100644
--- a/menus.c
+++ b/menus.c
@@ -366,7 +366,7 @@ void Show_Main_Menu(void)
} else if (globals.ChannelState[chan].trigger_source==source_external) {
menu_string = g_string_append (menu_string, "EXT TRIG");
} else if (globals.ChannelState[chan].trigger_source==source_external2) {
- menu_string = g_string_append (menu_string, "EXT2 TRIG");
+ menu_string = g_string_append (menu_string, "EXT DBL");
} else if (globals.ChannelState[chan].trigger_source==source_manual) {
menu_string = g_string_append (menu_string, "MAN TRIG");
} else if (globals.ChannelState[chan].trigger_source==source_hold) {
@@ -1643,7 +1643,7 @@ static void Submenu_Display(int change_selection)
}
break;
case mode_freq_ext2:
- mode_name = g_strdup("External2");
+ mode_name = g_strdup("Ext Dbl");
if (globals.ChannelState[channel].trigger_source==source_external2) {
current_operating_mode=i;
}
diff --git a/parser.c b/parser.c
index c978f3c..5fb26f8 100644
--- a/parser.c
+++ b/parser.c
@@ -2225,7 +2225,7 @@ static int Go_trig_source46(gchar** response, int channel, char *parameter,char
return Set_Trig_Source(channel,source_internal);
} else if (!strcmp(parameter,"ext") || !strcmp(parameter,"external")) {
return Set_Trig_Source(channel,source_external);
- } else if (!strcmp(parameter,"ext2") || !strcmp(parameter,"external2")) {
+ } else if (!strcmp(parameter,"externaldouble") || !strcmp(parameter,"extdbl")) {
return Set_Trig_Source(channel,source_external2);
} else if (!strcmp(parameter,"man") || !strcmp(parameter,"manual")) {
return Set_Trig_Source(channel,source_manual);
@@ -2244,7 +2244,7 @@ static int Go_trig_source46(gchar** response, int channel, char *parameter,char
} else if (globals.ChannelState[channel].trigger_source==source_external) {
return query_string(response, "EXT");
} else if (globals.ChannelState[channel].trigger_source==source_external2) {
- return query_string(response, "EXT2");
+ return query_string(response, "EXTDBL");
} else if (globals.ChannelState[channel].trigger_source==source_manual) {
return query_string(response, "MAN");
} else if (globals.ChannelState[channel].trigger_source==source_hold) {