From f6c4baf7a1d013ac7e72b8488be05611a6d0fb1b Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 1 Jan 2000 00:05:12 +0900 Subject: tweak zout-based duty cycle error check to allow max duty cycle to actually be reached --- error_utils.c | 2 +- version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/error_utils.c b/error_utils.c index bf6168d..0db61fc 100644 --- a/error_utils.c +++ b/error_utils.c @@ -1410,7 +1410,7 @@ int Error_check(ChannelStruct ChannelStateToTest[max_channels]) if (globals.Flash.switchable_zout[i] && (ChannelStateToTest[i].zout==globals.Flash.zout_max[i]) && (globals.Flash.switchable_zout_max_duty[i] > 0.0) && - (duty_cycle > (globals.Flash.switchable_zout_max_duty[i] * 100.0 / duty_scale))) { + (duty_cycle > (1.001 * (globals.Flash.switchable_zout_max_duty[i] * 100.0 / duty_scale)))) { // can only operate at min Zout at high duty cycles, due to attenuator limits check_another_max_value_int (globals.Flash.zout_min[i], &globals.Constraints.err_max_zout[i], ChannelStateToTest[i].zout, max_zout_duty_error, &report_error); } diff --git a/version.h b/version.h index dae6500..b5084d6 100644 --- a/version.h +++ b/version.h @@ -1,2 +1,2 @@ -#define FW_VERSION "6.4.31" +#define FW_VERSION "6.4.32" #define SCPI_version "1996.0" -- cgit