diff options
author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-08-29 10:55:34 -0400 |
---|---|---|
committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-08-29 10:55:34 -0400 |
commit | facf818bfa54d1fc553cf06a0f22012ea033ace0 (patch) | |
tree | 254143d4d025f5b2d37af59e95470b48ba9421c4 /monitor.c | |
parent | b127640ef5f09b10a648701c52f950f3fe569ce6 (diff) |
add some menu variables as globals, to remove FIXMEs
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 26 |
1 files changed, 14 insertions, 12 deletions
@@ -4,6 +4,8 @@ #include "lcd.h" #include "monitor.h" #include "error_utils.h" +#include "dummy_functions.h" + #include <glib.h> #include <math.h> @@ -228,21 +230,21 @@ int I2C_Check_Monitors(void) Set_Output_State(channel,output_off); queue_and_broadcast_sensor_alarm(Soft_Limit_Exceeded); } - // FIXME - menus -// else if (Type_Of_Menu==Main_Menu_On && Error_Screen==NO && Nonstd_Display==NO -// && globals.ChannelState[channel].Curr_Mon_value!=globals.ChannelState[channel].displayed_mon_val -// && (seconds_since_last > 0)) -// /* only update display once a second */ -// { -// ++update_display; -// } + else if (globals.MenuStatus.Type_Of_Menu==Main_Menu_On && + !globals.MenuStatus.Error_Screen && + !globals.MenuStatus.Nonstd_Display && + globals.ChannelState[channel].Curr_Mon_value!=globals.ChannelState[channel].displayed_mon_val && + (seconds_since_last > 0)) + /* only update display once a second */ + { + ++update_display; + } } -// FIXME - menus -// if (update_display) { -// Menu_Update_Display(); -// } + if (update_display) { + Menu_Update_Display(); + } return OK; } |