summaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorMichael J. Chudobiak <mjc@avtechpulse.com>2013-04-02 15:07:27 -0400
committerMichael J. Chudobiak <mjc@avtechpulse.com>2013-04-02 15:07:27 -0400
commit5e5d1b450bd584c84b85b8c204a09fa899416ec3 (patch)
treef31525b577e872e38e717b562e00de9f7faa3d8f /monitor.c
parent1a9a1de2b2635e67998ad5a07ed0e4dbb5cbe474 (diff)
implemented basic attenuator range function (but not in cal funcs)
Diffstat (limited to 'monitor.c')
-rw-r--r--monitor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c
index 7c50922..44751e2 100644
--- a/monitor.c
+++ b/monitor.c
@@ -157,7 +157,7 @@ int I2C_Check_Monitors(void)
int monitor_word;
float step_size;
int channel;
- int ampl_range,point_found,UseNegData,entry,word_out;
+ int ampl_range,point_found,UseNegData,entry,word_out,atten_range;
int update_display;
int use_neg_data;
@@ -195,7 +195,7 @@ int I2C_Check_Monitors(void)
/* determine current ampl_range */
Set_VI_Control(pwl_ampl_values,channel,globals.ChannelState[channel].amplitude,&point_found,
- &ampl_range,&UseNegData,&entry,&word_out,&actual_pol);
+ &ampl_range,&atten_range,&UseNegData,&entry,&word_out,&actual_pol);
/* 5.0V is the full-scale voltage of the 12bit ADC */
globals.ChannelState[channel].Curr_Mon_value=((((float) monitor_word)/4095.0) * 5.0)