diff options
| author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2016-12-12 10:28:17 -0500 |
|---|---|---|
| committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2016-12-12 10:28:17 -0500 |
| commit | 49739e9eae26a1dd871599f38d0e8b68d687ef4a (patch) | |
| tree | 39f4181c8f09362f764268c251f03dcad6643c00 | |
| parent | 73c84803c8f81253fe3e169b3757ae9978435245 (diff) | |
Revert force-output-on during timing cal option. Too complex, little reward.
| -rw-r--r-- | device-functions.c | 11 | ||||
| -rw-r--r-- | flash.c | 2 | ||||
| -rw-r--r-- | globals.h | 3 |
3 files changed, 4 insertions, 12 deletions
diff --git a/device-functions.c b/device-functions.c index 6bd7d48..ca03f0b 100644 --- a/device-functions.c +++ b/device-functions.c @@ -2065,14 +2065,9 @@ int Set_Cal_Nom(int channel,int calibration_point_number,int parameter, float *n if (reset_state) { Main_Rst(); - 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(); - } + 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 (disable_errors) { @@ -729,8 +729,6 @@ 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,8 +614,7 @@ 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 force_output_on_timing_cal[max_channels]; /* 8118 */ - char spare_char[278]; /* 8120 */ + char spare_char[280]; /* 8118 */ float current_limit_pulse_mode[max_channels]; /* 8398 */ float current_limit_dc_mode[max_channels]; /* 8406 */ |