summaryrefslogtreecommitdiff
path: root/device-functions.c
diff options
context:
space:
mode:
Diffstat (limited to 'device-functions.c')
-rw-r--r--device-functions.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/device-functions.c b/device-functions.c
index 9cf36ab..adf4cc4 100644
--- a/device-functions.c
+++ b/device-functions.c
@@ -3059,8 +3059,9 @@ int Set_VI_Control(int parameter,int channel,float new_ampl)
tweaked_use_ampl += dist_frac * globals.Flash.pw_range_pol_tweaks[channel][range_i][pw_polarity];
- if ((range_i > 0) || (!globals.Flash.volt_ctrl_pw[channel]) ) {
- // not used in bot range if bot range is voltage controlled
+ if ((range_i > 0) || (!globals.Flash.volt_ctrl_pw[channel]) || (globals.Flash.min_pw[channel] > 50.0e-9) ) {
+ // Not used in bot range if bot range is voltage controlled, for AVPPs and AVMRs.
+ // Do use it for wide voltage-controlled PW units, like CH2 of 156E.
tweaked_use_ampl += globals.Flash.pulse_width_pol_tweak[channel][pw_polarity];
}
@@ -3170,8 +3171,9 @@ int Set_VI_Control(int parameter,int channel,float new_ampl)
if (parameter == pwl_pw_values) {
tweaked_use_ampl += dist_frac * globals.Flash.pw_range_pol_tweaks[channel][range_i][pw_polarity];
- if ((range_i > 0) || (!globals.Flash.volt_ctrl_pw[channel]) ) {
- // not used in bot range if bot range is voltage controlled
+ if ((range_i > 0) || (!globals.Flash.volt_ctrl_pw[channel]) || (globals.Flash.min_pw[channel] > 50.0e-9) ) {
+ // Not used in bot range if bot range is voltage controlled, for AVPPs and AVMRs.
+ // Do use it for wide voltage-controlled PW units, like CH2 of 156E.
tweaked_use_ampl += globals.Flash.pulse_width_pol_tweak[channel][pw_polarity];
}
}