diff options
Diffstat (limited to 'device-functions.c')
| -rw-r--r-- | device-functions.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/device-functions.c b/device-functions.c index fd6d5af..6bd7d48 100644 --- a/device-functions.c +++ b/device-functions.c @@ -2065,9 +2065,14 @@ int Set_Cal_Nom(int channel,int calibration_point_number,int parameter, float *n if (reset_state) { Main_Rst(); - Set_Output_State(true_channel,output_off); - Main_update_shift_registers(); - bus_setpin(PW_ENABLE, 1); /* enable PW circuit (but output relay still off) */ + if (!globals.Flash.force_output_on_timing_cal[channel]) { + Set_Output_State(true_channel,output_off); + Main_update_shift_registers(); + bus_setpin(PW_ENABLE, 1); /* enable PW circuit (but output relay still off) */ + } else { + Set_Output_State(true_channel,output_on); + Main_update_shift_registers(); + } } if (disable_errors) { @@ -2116,7 +2121,7 @@ int Set_Cal_Nom(int channel,int calibration_point_number,int parameter, float *n globals.Flash.propagation_delay[channel]=0.0; globals.Flash.delay_shrink[channel]=0.0; - if (reset_state) { + if (!globals.Flash.volt_ctrl_delay[channel]) { // skipped for voltage-controlled delay (2CHPP) globals.ChannelState[channel].test_delay_mode=YES; status=Set_frequency(0,0,0,globals.Flash.ChanKey_frequency?channel:0,other_setting); |