diff options
Diffstat (limited to 'error_utils.c')
| -rw-r--r-- | error_utils.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/error_utils.c b/error_utils.c index 9dd45b0..f29341c 100644 --- a/error_utils.c +++ b/error_utils.c @@ -673,8 +673,8 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) if (!globals.Flash.ChanKey_func_mode) for (i=1; i<num_of_chan; ++i) { ChannelStateToTest[i].func_mode=ChannelStateToTest[0].func_mode; } - if (!globals.Flash.ChanKey_polarity) for (i=1; i<num_of_chan; ++i) { - ChannelStateToTest[i].polarity=ChannelStateToTest[0].polarity; + if (!globals.Flash.ChanKey_inverted) for (i=1; i<num_of_chan; ++i) { + ChannelStateToTest[i].inverted=ChannelStateToTest[0].inverted; } if (!globals.Flash.ChanKey_output_state) for (i=1; i<num_of_chan; ++i) { ChannelStateToTest[i].output_state=ChannelStateToTest[0].output_state; @@ -822,7 +822,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) report_error=freq_lower_limit; } - if ((ChannelStateToTest[i].polarity!=pol_norm) && (globals.Flash.min_pw[i]>0.0)) { + if ((ChannelStateToTest[i].inverted!=pol_norm) && (globals.Flash.min_pw[i]>0.0)) { temp=(1/ChannelStateToTest[i].pw)*( 1.0- ampl_fixed_max_duty/duty_scale ); if (temp>globals.Constraints.err_min_freq[i]) { globals.Constraints.err_min_freq[i]=temp; @@ -886,7 +886,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) } } - if (ChannelStateToTest[i].polarity==pol_norm) { + if (ChannelStateToTest[i].inverted==pol_norm) { temp=(1/ChannelStateToTest[i].pw)*(ampl_fixed_max_duty/duty_scale); if (temp<globals.Constraints.err_max_freq[i]) { globals.Constraints.err_max_freq[i]=temp; @@ -943,7 +943,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) /* negative-pw units are special, ignore PRF / duty cycle / PW conflicts */ if (globals.Constraints.err_min_pw[i]>=0.0) { if (ChannelStateToTest[i].trigger_source==source_internal) { - if (ChannelStateToTest[i].polarity!=pol_norm) { + if (ChannelStateToTest[i].inverted!=pol_norm) { temp=(1/ChannelStateToTest[i].frequency)*( 1.0 - ampl_fixed_max_duty/duty_scale ); if (temp>globals.Constraints.err_min_pw[i]) { globals.Constraints.err_min_pw[i]=temp; @@ -1012,7 +1012,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) } } - if (ChannelStateToTest[i].polarity==pol_norm) { + if (ChannelStateToTest[i].inverted==pol_norm) { temp=(1/ChannelStateToTest[i].frequency)*(ampl_fixed_max_duty/duty_scale); if (temp<globals.Constraints.err_max_pw[i]) { globals.Constraints.err_max_pw[i]=temp; @@ -1250,7 +1250,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) } duty_cycle=ChannelStateToTest[i].pw*ChannelStateToTest[i].frequency*100; /* calculate duty cycle */ - if (ChannelStateToTest[i].polarity!=pol_norm) { + if (ChannelStateToTest[i].inverted!=pol_norm) { duty_cycle=100-duty_cycle; /* account for inversion */ } |