diff options
| -rw-r--r-- | device-functions.c | 2 | ||||
| -rw-r--r-- | globals.h | 10 | ||||
| -rw-r--r-- | instr-daemon.c | 2 | ||||
| -rw-r--r-- | lcd.h | 3 | ||||
| -rw-r--r-- | menus.c | 6 |
5 files changed, 2 insertions, 21 deletions
diff --git a/device-functions.c b/device-functions.c index 30fac09..d2f8341 100644 --- a/device-functions.c +++ b/device-functions.c @@ -4626,12 +4626,10 @@ int change_password(gchar *old_password, gchar *new_password) { // Skip password check if the supplied old_password is NULL. This // only happens when resetting the password to the default. if (old_password != NULL ) { - printf("verifying old password: %s\n", old_password); //FIXME with real function old_valid = checkpassword(user,old_password); } if (old_valid == TRUE) { - printf("setting new password: %s\n", new_password); //FIXME with real function struct lu_context *ctx; struct lu_error *error = NULL; struct lu_ent *ent; @@ -91,16 +91,6 @@ #define YES 1 #define NO 0 - -#define LOCS_ctrl 0 -#define LWLS_ctrl 1 -#define REMS_ctrl 2 -#define RWLS_ctrl 3 -#define RS232_ctrl 4 -#define TELNET_ctrl 5 -#define WEB_ctrl 6 // FIXME - - #define max_commands_in_input 12 #define max_output_length 512 #define max_channels 2 diff --git a/instr-daemon.c b/instr-daemon.c index 4c56ceb..6bcf5d5 100644 --- a/instr-daemon.c +++ b/instr-daemon.c @@ -340,8 +340,6 @@ static gboolean periodic_poll (void) Menu_Check_Buttons (); - // FIXME - gpib input - should have it's own thread? - // GPIB_check_for_device_clear_signal(); if (GPIB_check_for_messages(globals.Registers.gpib_buffer)) { if (GPIB_handle_new_input(globals.Registers.gpib_buffer)) { @@ -5,9 +5,6 @@ #define LCD_cols 40 #define LCD_rows 4 /* 4x40 LCD */ #define LCD_chars_total 160 - -/* LCD menu hardware definitions - FIXME */ - #define LCD_col_width 13 /* characters per LCD column */ #define LCD_max_entries_per_page 12 /* how many items fit on one LCD screen at a time */ #define LCD_max_entries 24 /* upper limit for menu arrays */ @@ -157,9 +157,6 @@ #define Show_avrq_ampl 1900 -// FIXME - eliminate fixed width variables -// FIXME - tidy up menu global vars - /* KEY MENU-JUGGLING VARIABLES - controlling what is actually shown on the display */ int menu_cursor_pos; @@ -1218,7 +1215,6 @@ static void Submenu_Display(int change_selection) int i; int channel; - // FIXME - check for redundant clearing if ( (globals.MenuStatus.Type_Of_Menu != Submenu_On) || (globals.MenuStatus.Error_Screen == YES) || (globals.MenuStatus.Nonstd_Display == YES) || @@ -2734,6 +2730,8 @@ static void Read_Keypad(int *button_port_val, int *upper_encoder_val, int *lower #define Over_Volt 0x20 /* over-voltage */ #define Over_Other 0x40 /* over-other */ +// FIXME - alarm detection not working? + int new_button_state; /* read the button data */ |