diff options
| -rw-r--r-- | flash.c | 46 |
1 files changed, 23 insertions, 23 deletions
@@ -332,9 +332,6 @@ static void initFlashValues(FlashStruct *mem) { int i,j,k,m; float power_of_ten, power_of_two; - float base_number; - - base_number=11; mem->flash_start=1; mem->turn_on_dly=5; @@ -438,37 +435,40 @@ static void initFlashValues(FlashStruct *mem) /* these values have been determined by experiment */ temp_int_pw_dly=dac_max; temp_int_prf=dac_max; + temp_int_rise_time=dac_max; - mem->period_pwl_time[i][j][k][m]=(47e-9*power_of_ten)+41e-9; - mem->pw_pwl_time[i][j][k][m]=(base_number*0.7e-9*power_of_ten)+5e-9; - mem->delay_pwl_time[i][j][k][m]=(base_number*0.7e-9*power_of_ten)+7.6e-9; - mem->burst_pwl_time[i][j][k][m]=(2*base_number*1.0e-9*power_of_ten)+25e-9; + Flash.period_pwl_time[i][j][k][m]=(47e-9*power_of_ten)+41e-9; + Flash.pw_pwl_time[i][j][k][m]=(6e-9*power_of_ten)+5e-9; + Flash.delay_pwl_time[i][j][k][m]=(6e-9*power_of_ten)+7.6e-9; + Flash.burst_pwl_time[i][j][k][m]=(22e-9*power_of_ten)+25e-9; } else if (m==1) { - temp_int_pw_dly=dac_max/3; + temp_int_pw_dly=dac_max/2.15; + temp_int_rise_time=dac_max/2; temp_int_prf=dac_max/2.15; - mem->period_pwl_time[i][j][k][m]=(1e-7*power_of_ten)+50e-9; - - mem->pw_pwl_time[i][j][k][m]=(3*base_number*0.7e-9*power_of_ten)+10e-9; - mem->delay_pwl_time[i][j][k][m]=(3*base_number*0.7e-9*power_of_ten)+17e-9; - mem->burst_pwl_time[i][j][k][m]=(3*base_number*1.0e-9*power_of_ten)+10e-9; + Flash.period_pwl_time[i][j][k][m]=(100e-9*power_of_ten)+50e-9; + Flash.pw_pwl_time[i][j][k][m]=(14e-9*power_of_ten)+10e-9; + Flash.delay_pwl_time[i][j][k][m]=(14e-9*power_of_ten)+17e-9; + Flash.burst_pwl_time[i][j][k][m]=(33e-9*power_of_ten)+10e-9; } else if (m==2) { - temp_int_pw_dly=dac_min; + temp_int_pw_dly=dac_max/4.6; + temp_int_rise_time=1; /* not zero - confuses diag routines */; temp_int_prf=dac_max/4.6; - mem->period_pwl_time[i][j][k][m]=(2.3e-7*power_of_ten)+100e-9; - mem->pw_pwl_time[i][j][k][m]=(base_number*0.7e-8*power_of_ten)+40e-9; - mem->delay_pwl_time[i][j][k][m]=(base_number*0.7e-8*power_of_ten)+40e-9; - mem->burst_pwl_time[i][j][k][m]=(base_number*1.0e-8*power_of_ten)+10e-9; + Flash.period_pwl_time[i][j][k][m]=(230e-9*power_of_ten)+100e-9; + Flash.pw_pwl_time[i][j][k][m]=(28e-9*power_of_ten)+20e-9; + Flash.delay_pwl_time[i][j][k][m]=(28e-9*power_of_ten)+30e-9; + Flash.burst_pwl_time[i][j][k][m]=(50e-9*power_of_ten)+10e-9; } else if (m==3) { - temp_int_pw_dly=0; + temp_int_pw_dly=dac_min; + temp_int_rise_time=0; temp_int_prf=dac_min; - mem->period_pwl_time[i][j][k][m]=(4.7e-7*power_of_ten)+160e-9; - mem->pw_pwl_time[i][j][k][m]=0.0; - mem->delay_pwl_time[i][j][k][m]=0.0; - mem->burst_pwl_time[i][j][k][m]=0.0; + Flash.period_pwl_time[i][j][k][m]=(470e-9*power_of_ten)+160e-9; + Flash.pw_pwl_time[i][j][k][m]=(60e-9*power_of_ten)+40e-9; + Flash.delay_pwl_time[i][j][k][m]=(60e-9*power_of_ten)+40e-9; + Flash.burst_pwl_time[i][j][k][m]=(110e-9*power_of_ten)+10e-9; } else { temp_int_pw_dly=0; temp_int_prf=0; |