diff options
| author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-08-28 13:29:42 -0400 |
|---|---|---|
| committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2012-08-28 13:29:42 -0400 |
| commit | 288a506c0579ce69147ebbc7b84d513c63dce783 (patch) | |
| tree | 0fcf44e185cb19474d99456b32587403542dbd4a /monitor.c | |
| parent | 20cda0b9312dd5b8eec72373e17ff47fff7987b3 (diff) | |
astyle fixes
Diffstat (limited to 'monitor.c')
| -rw-r--r-- | monitor.c | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -177,7 +177,7 @@ int I2C_Check_Monitors(void) if (seconds_since_last > 0) { if ( (globals.ChannelState[channel].func_mode==dc_mode_on) - || (globals.ChannelState[channel].output_state==output_off)) { + || (globals.ChannelState[channel].output_state==output_off)) { /* force monitor measurement every second in DC mode (because no TTL trigger is present) and output-off mode */ force_monitor_cal(channel,NO); @@ -199,19 +199,19 @@ int I2C_Check_Monitors(void) /* 5.0V is the full-scale voltage of the 12bit ADC */ globals.ChannelState[channel].Curr_Mon_value=((((float) monitor_word)/4095.0) * 5.0) - / globals.Flash.mon_vi_ratio[channel][ampl_range][use_neg_data]; + / globals.Flash.mon_vi_ratio[channel][ampl_range][use_neg_data]; /* convert to even step size */ step_size=globals.Flash.monitor_step[channel]; globals.ChannelState[channel].Curr_Mon_value= - ((float) - ((long) (globals.ChannelState[channel].Curr_Mon_value/step_size)) - ) - * step_size; + ((float) + ((long) (globals.ChannelState[channel].Curr_Mon_value/step_size)) + ) + * step_size; /* AVO-8D2: check for duty cycle problems, as a function of measured amplitude */ if ( globals.Flash.hard_current_limit_enabled[channel] && - (globals.ChannelState[channel].output_state == output_on)) { + (globals.ChannelState[channel].output_state == output_on)) { for (i=0; i<max_channels; ++i) { TestState[i]=globals.ChannelState[i]; } @@ -223,11 +223,11 @@ int I2C_Check_Monitors(void) } if (globals.Flash.soft_current_limit_enabled[channel] && - (globals.Flash.fully_programmed != Being_Programmed) && - (globals.ChannelState[channel].Curr_Mon_value > globals.ChannelState[channel].soft_current_limit)) { + (globals.Flash.fully_programmed != Being_Programmed) && + (globals.ChannelState[channel].Curr_Mon_value > globals.ChannelState[channel].soft_current_limit)) { 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 |