From 201bfbfb5a6242b3cfc534c6b7015eb0be623c5e Mon Sep 17 00:00:00 2001 From: "Michael J. Chudobiak" Date: Thu, 3 May 2018 09:59:22 -0400 Subject: use new variables and range sizes (but not initialized correctly yet) --- globals.h | 86 ++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 44 insertions(+), 42 deletions(-) (limited to 'globals.h') diff --git a/globals.h b/globals.h index f62555f..26b67b6 100644 --- a/globals.h +++ b/globals.h @@ -484,8 +484,8 @@ typedef struct { /* so that per-channel section starts at 256 */ /* [chan][range 0-4][polarity][interpolation point 0-9] */ - short ampl_dacval[max_channels][ampl_ranges][ampl_polarities][old_range_size_ten]; - float ampl_pwl[max_channels][ampl_ranges][ampl_polarities][old_range_size_ten]; + short obs_ampl_dacval[max_channels][ampl_ranges][ampl_polarities][old_range_size_ten]; + float obs_ampl_pwl[max_channels][ampl_ranges][ampl_polarities][old_range_size_ten]; float rcl_frequency[max_channels][max_stored_settings]; float rcl_delay[max_channels][max_stored_settings]; @@ -538,8 +538,8 @@ typedef struct { Use fixed_ampl_points instead */ short zout_min[max_channels]; /* addr 1912 */ - short os_dacval[max_channels][os_ranges][os_polarities][old_range_size_ten]; /* addr 1916 */ - float os_pwl[max_channels][os_ranges][os_polarities][old_range_size_ten]; /* addr 2116 */ + short obs_os_dacval[max_channels][os_ranges][os_polarities][old_range_size_ten]; /* addr 1916 */ + float obs_os_pwl[max_channels][os_ranges][os_polarities][old_range_size_ten]; /* addr 2116 */ short ampl_DAC[max_channels]; /* addr 2516 */ short os_DAC[max_channels]; /* addr 2520 */ @@ -550,21 +550,21 @@ typedef struct { char ext_amplify_enabled[max_channels]; /* addr 2532 */ char volt_ctrl_delay[max_channels]; /* addr 2534 */ - float rise_time_pwl[max_channels][ampl_ranges][ampl_polarities][old_range_size_ten]; /* addr 2536 */ + float obs_rise_time_pwl[max_channels][ampl_ranges][ampl_polarities][old_range_size_ten]; /* 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_dacval[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 3360 */ - float pw_pwl[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 3680 */ + short obs_pw_dacval[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 3360 */ + float obs_pw_pwl[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 3680 */ - short delay_dacval[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 4320 */ - float delay_pwl[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; + short obs_delay_dacval[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 4320 */ + float obs_delay_pwl[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; - short period_dacval[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 5280 */ - float period_pwl[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; + short obs_period_dacval[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 5280 */ + float obs_period_pwl[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; float distort_X[max_channels]; /* distortion = Z + X / (Ampl + Y). */ @@ -591,8 +591,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_dacval[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* 6336 */ - float burst_pwl[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* 6656 */ + short obs_burst_dacval[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* 6336 */ + float obs_burst_pwl[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* 6656 */ float pulse_width_pol_tweak[max_channels][ampl_polarities]; /* 7296 - allow for PW shift with polarity */ @@ -614,12 +614,13 @@ 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_dacval[max_channels][ampl_ranges][ampl_polarities][old_range_size_ten]; /* 7438 */ + short obs_rise_time_dacval[max_channels][ampl_ranges][ampl_polarities][old_range_size_ten]; /* 7438 */ + + short obs_vcc1_dacval[1][1][1][old_range_size_ten]; /* no longer used */ + float obs_vcc1_pwl[1][1][1][old_range_size_ten]; /* no longer used */ + short obs_vcc2_dacval[1][1][1][old_range_size_ten]; /* no longer used */ + float obs_vcc2_pwl[1][1][1][old_range_size_ten]; /* no longer used */ - short vcc1_dacval[1][1][1][old_range_size_ten]; /* no longer used */ - float vcc1_pwl[1][1][1][old_range_size_ten]; /* no longer used */ - short vcc2_dacval[1][1][1][old_range_size_ten]; /* no longer used */ - float vcc2_pwl[1][1][1][old_range_size_ten]; /* 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 */ @@ -676,8 +677,9 @@ 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_dacval[max_channels][load_type_ranges][load_type_polarities][old_range_size_ten]; /* 8752 */ - float load_type_pwl[max_channels][load_type_ranges][load_type_polarities][old_range_size_ten]; /* 8792 */ + + short obs_load_type_dacval[max_channels][load_type_ranges][load_type_polarities][old_range_size_ten]; /* 8752 */ + float obs_load_type_pwl[max_channels][load_type_ranges][load_type_polarities][old_range_size_ten]; /* 8792 */ char pcb_203a_rise_time[max_channels]; /* addr 8872 */ @@ -703,8 +705,8 @@ typedef struct { float max_slew[max_channels]; /* addr 8974 */ float rcl_slew[max_channels][max_stored_settings]; /* addr 8982 */ - short slew_dacval[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 9014 */ - float slew_pwl[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 9334 */ + short obs_slew_dacval[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 9014 */ + float obs_slew_pwl[max_channels][timing_ranges][timing_polarities][old_range_size_ten]; /* addr 9334 */ short fix_pw_dac_val[max_channels]; /* addr 9974 */ @@ -765,7 +767,7 @@ typedef struct { /* addr 10256, add ampl-dependent distort output, 10V full-scale */ - short distort_dacval[max_channels][ampl_ranges][ampl_polarities][old_range_size_ten]; + short obs_distort_dacval[max_channels][ampl_ranges][ampl_polarities][old_range_size_ten]; char distort_dac[max_channels]; /* addr 10656 */ char distort_enabled[max_channels]; /* addr 10658 */ @@ -779,33 +781,33 @@ typedef struct { char ov_error_message[40]; /* addr 10732 */ - short xyz_ampl_dacval[max_channels][ampl_ranges][ampl_polarities][std_range_size]; // size 1280, addr 10772 - float xyz_ampl_pwl[max_channels][ampl_ranges][ampl_polarities][std_range_size]; // size 2560, addr 12052 - short xyz_distort_dacval[max_channels][ampl_ranges][ampl_polarities][std_range_size]; // size 1280, addr 14612 + short ampl_dacval[max_channels][ampl_ranges][ampl_polarities][std_range_size]; // size 1280, addr 10772 + float ampl_pwl[max_channels][ampl_ranges][ampl_polarities][std_range_size]; // size 2560, addr 12052 + short distort_dacval[max_channels][ampl_ranges][ampl_polarities][std_range_size]; // size 1280, addr 14612 - short xyz_os_dacval[max_channels][os_ranges][os_polarities][std_range_size]; // size 640, addr 15892 - float xyz_os_pwl[max_channels][os_ranges][os_polarities][std_range_size]; // size 1280, addr 16532 + short os_dacval[max_channels][os_ranges][os_polarities][std_range_size]; // size 640, addr 15892 + float os_pwl[max_channels][os_ranges][os_polarities][std_range_size]; // size 1280, addr 16532 - short xyz_rise_time_dacval[max_channels][ampl_ranges][ampl_polarities][std_range_size]; // size 1280, addr 17812 - float xyz_rise_time_pwl[max_channels][ampl_ranges][ampl_polarities][std_range_size]; // size 2560, addr 19092 + short rise_time_dacval[max_channels][ampl_ranges][ampl_polarities][std_range_size]; // size 1280, addr 17812 + float rise_time_pwl[max_channels][ampl_ranges][ampl_polarities][std_range_size]; // size 2560, addr 19092 - short xyz_pw_dacval[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 1024, addr 21652 - float xyz_pw_pwl[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 2048, addr 22676 + short pw_dacval[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 1024, addr 21652 + float pw_pwl[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 2048, addr 22676 - short xyz_delay_dacval[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 1024, addr 24724 - float xyz_delay_pwl[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 2048, addr 25748 + short delay_dacval[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 1024, addr 24724 + float delay_pwl[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 2048, addr 25748 - short xyz_period_dacval[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 1024, addr 27796 - float xyz_period_pwl[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 2048, addr 28820 + short period_dacval[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 1024, addr 27796 + float period_pwl[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 2048, addr 28820 - short xyz_burst_dacval[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 1024, addr 30868 - float xyz_burst_pwl[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 2048, addr 31892 + short burst_dacval[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 1024, addr 30868 + float burst_pwl[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 2048, addr 31892 - short xyz_load_type_dacval[max_channels][load_type_ranges][load_type_polarities][std_range_size]; // size 128, addr 33940 - float xyz_load_type_pwl[max_channels][load_type_ranges][load_type_polarities][std_range_size]; // size 256, addr 34068 + short load_type_dacval[max_channels][load_type_ranges][load_type_polarities][std_range_size]; // size 128, addr 33940 + float load_type_pwl[max_channels][load_type_ranges][load_type_polarities][std_range_size]; // size 256, addr 34068 - short xyz_slew_dacval[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 1024, addr 34324 - float xyz_slew_pwl[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 2048, addr 35348 + short slew_dacval[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 1024, addr 34324 + float slew_pwl[max_channels][timing_ranges][timing_polarities][std_range_size]; // size 2048, addr 35348 char flash_end; // addr 37396 -- cgit