diff options
| -rw-r--r-- | menus.c | 18 | ||||
| -rw-r--r-- | parser.c | 2 | ||||
| -rw-r--r-- | string_utils.c | 2 |
3 files changed, 11 insertions, 11 deletions
@@ -318,9 +318,9 @@ void Show_Main_Menu(void) menu_string = g_string_append (menu_string, "INT"); show_item=Show_frequency+chan; } else if (globals.ChannelState[chan].trigger_source==source_external) { - menu_string = g_string_append (menu_string, "EXT TRIG"); + menu_string = g_string_append (menu_string, "EXT TRIG"); } else if (globals.ChannelState[chan].trigger_source==source_manual) { - menu_string = g_string_append (menu_string, "MAN TRIG"); + menu_string = g_string_append (menu_string, "MAN TRIG"); } else if (globals.ChannelState[chan].trigger_source==source_hold) { menu_string = g_string_append (menu_string, "HOLD TRIG"); } else if (globals.ChannelState[chan].trigger_source==source_immediate) { @@ -367,7 +367,7 @@ void Show_Main_Menu(void) } 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); + g_string_erase (menu_string, 0, -1); } } @@ -1195,7 +1195,7 @@ static void Display_Number_on_LCD(int Is_Item_Visible,int LCD_row,int LCD_col,ch } LCD_write_padded_spaces(LCD_row, LCD_col, LCD_string, width_of_column); - + g_free (LCD_string); g_free (units); } @@ -1875,7 +1875,7 @@ static void Submenu_Display(int change_selection) } else { String_Parameter_To_Text(globals.Flash.min_ampl[channel],2,"","A",&tmp_str,YES,LCD_col_width); } - + strcpy (mode_name[i], tmp_str); // FIXME if (fabs(globals.ChannelState[channel].amplitude-globals.Flash.min_ampl[channel])<globals.Flash.ampl_zero_equiv[channel]) { @@ -1889,7 +1889,7 @@ static void Submenu_Display(int change_selection) String_Parameter_To_Text(globals.Flash.max_ampl[channel],2,"","A",&tmp_str,YES,LCD_col_width); } - strcpy (mode_name[i], tmp_str); // FIXME + strcpy (mode_name[i], tmp_str); // FIXME if (fabs(globals.ChannelState[channel].amplitude-globals.Flash.max_ampl[channel])<globals.Flash.ampl_zero_equiv[channel]) { current_operating_mode=i; @@ -1959,7 +1959,7 @@ static void Submenu_Display(int change_selection) } } - /* If change_selection==NO, the submenu is being drawn from scratch. + /* If change_selection==NO, the submenu is being drawn from scratch. this case, the arrow pointer points at the current operating mode. If change_selection=YES, the submenu is being redrawn to scroll the mode list. In this case, the arrow pointer points at the current @@ -1998,7 +1998,7 @@ static void Submenu_Display(int change_selection) if ((base_entry+3) < Submenu_max_entry) { LCD_write(3,39,"\x3"); } - + g_free (tmp_str); } } @@ -2055,7 +2055,7 @@ static int Submenu_Mult_Value(float mult_by) new_value=zero_equiv_timing; } } - + if (fabs(new_value) < zero_equiv_timing) { if (new_value<0.0) { new_value=-smallest_allowed_number; @@ -2212,7 +2212,7 @@ static int Go_trig_source46(gchar** response, int channel, char *parameter,char } else { return SyntaxError; } - return OK; + return OK; break; case query_simple: diff --git a/string_utils.c b/string_utils.c index 33e830e..7b60792 100644 --- a/string_utils.c +++ b/string_utils.c @@ -130,7 +130,7 @@ void String_Parameter_To_Text(float Float_To_Convert, int significant_digits, /* -- FINISH UP -- */ - + /* -- CHECK FOR TERMINATING DECIMAL POINT -- */ int len = strlen(out_gstr->str); if (out_gstr->str[len-1]=='.') { |