diff options
| author | root <root@avtech.domain.avtechpulse.com> | 1970-01-01 09:47:18 +0900 |
|---|---|---|
| committer | root <root@avtech.domain.avtechpulse.com> | 1970-01-01 09:47:18 +0900 |
| commit | fb30cf57235f6de726760e88a5c7bb79f0767a9b (patch) | |
| tree | 66f1c94c1b92b8fc57022795a47a2058eb841761 | |
| parent | 795d7e6713049a39e17459877222249e70db72f8 (diff) | |
allow option to force output on during timing cal
| -rw-r--r-- | device-functions.c | 13 | ||||
| -rw-r--r-- | flash.c | 2 | ||||
| -rw-r--r-- | globals.h | 3 |
3 files changed, 13 insertions, 5 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); @@ -729,6 +729,8 @@ static void initFlashValues(FlashStruct *mem) mem->distort_fully_below_ampl[i]=0.0; + mem->force_output_on_timing_cal[i]=0; + mem->min_slew[i]=90e6; mem->max_slew[i]=210e6; mem->max_high_rl_duty[i]=80.0; @@ -614,7 +614,8 @@ typedef struct { float duty_ampl_mid2[max_channels]; /* addr 8102 */ float distort_fully_below_ampl[max_channels]; /* addr 8110 - used with pulse_width_pol_tweak, see S/N 13453 */ - char spare_char[280]; /* 8118 */ + char force_output_on_timing_cal[max_channels]; /* 8118 */ + char spare_char[278]; /* 8120 */ float current_limit_pulse_mode[max_channels]; /* 8398 */ float current_limit_dc_mode[max_channels]; /* 8406 */ |