diff options
Diffstat (limited to 'globals.h')
| -rw-r--r-- | globals.h | 44 |
1 files changed, 22 insertions, 22 deletions
@@ -480,8 +480,8 @@ typedef struct { /* so that per-channel section starts at 256 */ /* [chan][range 0-4][polarity][interpolation point 0-9] */ - short ampl_pwl_Vc_norm4095[max_channels][ampl_ranges][ampl_polarities][points_in_range]; - float ampl_pwl_amp[max_channels][ampl_ranges][ampl_polarities][points_in_range]; + short ampl_dacval[max_channels][ampl_ranges][ampl_polarities][points_in_range]; + float ampl_pwl[max_channels][ampl_ranges][ampl_polarities][points_in_range]; float rcl_frequency[max_channels][max_stored_settings]; float rcl_delay[max_channels][max_stored_settings]; @@ -534,8 +534,8 @@ typedef struct { Use fixed_ampl_points instead */ short zout_min[max_channels]; /* addr 1912 */ - short os_pwl_Vc_norm4095[max_channels][os_ranges][os_polarities][points_in_range]; /* addr 1916 */ - float os_pwl_amp[max_channels][os_ranges][os_polarities][points_in_range]; /* addr 2116 */ + short os_dacval[max_channels][os_ranges][os_polarities][points_in_range]; /* addr 1916 */ + float os_pwl[max_channels][os_ranges][os_polarities][points_in_range]; /* addr 2116 */ short ampl_DAC[max_channels]; /* addr 2516 */ short os_DAC[max_channels]; /* addr 2520 */ @@ -546,21 +546,21 @@ typedef struct { char ext_amplify_enabled[max_channels]; /* addr 2532 */ char volt_ctrl_delay[max_channels]; /* addr 2534 */ - float rise_time_pwl_time[max_channels][ampl_ranges][ampl_polarities][points_in_range]; /* addr 2536 */ + float rise_time_pwl[max_channels][ampl_ranges][ampl_polarities][points_in_range]; /* addr 2536 */ short ext_amplify_xtra_rly[max_channels]; /* addr 3336 */ short ea_xtra_rly[max_channels]; /* addr 3340 */ short rcl_misc2[max_channels][max_stored_settings]; /* addr 3344 */ - short pw_pwl_Vc_norm4095[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 3360 */ - float pw_pwl_time[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 3680 */ + short pw_dacval[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 3360 */ + float pw_pwl[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 3680 */ - short delay_pwl_Vc_norm4095[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 4320 */ - float delay_pwl_time[max_channels][timing_ranges][timing_polarities][points_in_range]; + short delay_dacval[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 4320 */ + float delay_pwl[max_channels][timing_ranges][timing_polarities][points_in_range]; - short period_pwl_Vc_norm4095[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 5280 */ - float period_pwl_time[max_channels][timing_ranges][timing_polarities][points_in_range]; + short period_dacval[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 5280 */ + float period_pwl[max_channels][timing_ranges][timing_polarities][points_in_range]; float distort_X[max_channels]; /* distortion = Z + X / (Ampl + Y). */ @@ -587,8 +587,8 @@ typedef struct { char is_monocycle[max_channels]; /* 6332 - generate control voltage for monocycle spacing, using CH2 PW calibration */ char monocycle_dac[max_channels]; /* 6334 */ - short burst_pwl_Vc_norm4095[max_channels][timing_ranges][timing_polarities][points_in_range]; /* 6336 */ - float burst_pwl_time[max_channels][timing_ranges][timing_polarities][points_in_range]; /* 6656 */ + short burst_dacval[max_channels][timing_ranges][timing_polarities][points_in_range]; /* 6336 */ + float burst_pwl[max_channels][timing_ranges][timing_polarities][points_in_range]; /* 6656 */ float pulse_width_pol_tweak[max_channels][ampl_polarities]; /* 7296 - allow for PW shift with polarity */ @@ -610,12 +610,12 @@ typedef struct { short pw_dac[max_channels]; /* 7402 - for voltage-controlled PW only */ float rcl_rise_time[max_channels][max_stored_settings]; /* 7406 - rcl/sav data for rise time */ - short rise_time_pwl_Vc_norm4095[max_channels][ampl_ranges][ampl_polarities][points_in_range]; /* 7438 */ + short rise_time_dacval[max_channels][ampl_ranges][ampl_polarities][points_in_range]; /* 7438 */ - short vcc1_pwl_Vc_norm4095[1][1][1][points_in_range]; /* no longer used */ - float vcc1_pwl_amp[1][1][1][points_in_range]; /* no longer used */ - short vcc2_pwl_Vc_norm4095[1][1][1][points_in_range]; /* no longer used */ - float vcc2_pwl_amp[1][1][1][points_in_range]; /* no longer used */ + short vcc1_dacval[1][1][1][points_in_range]; /* no longer used */ + float vcc1_pwl[1][1][1][points_in_range]; /* no longer used */ + short vcc2_dacval[1][1][1][points_in_range]; /* no longer used */ + float vcc2_pwl[1][1][1][points_in_range]; /* no longer used */ float rcl_vcc1[max_channels][max_stored_settings]; /* no longer used */ float rcl_vcc2[max_channels][max_stored_settings]; /* no longer used */ float rcl_vlogic[max_channels][max_stored_settings]; /* no longer used */ @@ -672,8 +672,8 @@ typedef struct { float sparex1[max_channels]; /* addr 8704 */ float sparex2[max_channels]; /* addr 8712 */ float rcl_sparex3[max_channels][max_stored_settings]; /* addr 8720 */ - short load_type_pwl_Vc_norm4095[max_channels][load_type_ranges][load_type_polarities][points_in_range]; /* 8752 */ - float load_type_pwl_time[max_channels][load_type_ranges][load_type_polarities][points_in_range]; /* 8792 */ + short load_type_dacval[max_channels][load_type_ranges][load_type_polarities][points_in_range]; /* 8752 */ + float load_type_pwl[max_channels][load_type_ranges][load_type_polarities][points_in_range]; /* 8792 */ char pcb_203a_rise_time[max_channels]; /* addr 8872 */ @@ -699,8 +699,8 @@ typedef struct { float max_slew[max_channels]; /* addr 8974 */ float rcl_slew[max_channels][max_stored_settings]; /* addr 8982 */ - short slew_pwl_Vc_norm4095[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 9014 */ - float slew_pwl_time[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 9334 */ + short slew_dacval[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 9014 */ + float slew_pwl[max_channels][timing_ranges][timing_polarities][points_in_range]; /* addr 9334 */ short fix_pw_dac_val[max_channels]; /* addr 9974 */ |