diff options
| -rw-r--r-- | flash.c | 20 | ||||
| -rw-r--r-- | globals.h | 1 |
2 files changed, 10 insertions, 11 deletions
@@ -540,25 +540,25 @@ static void initFlashValues(FlashStruct *mem) mem->slew_pwl_time[i][j][k][m]=0.0; mem->slew_pwl_Vc_norm4095[i][j][k][m]=0; - int temp_int, temp_int_burst; + int temp_int, temp_int_burst_period; if (m==0) { /* these values have been determined by experiment */ - temp_int = temp_int_burst = dac_max; + temp_int = temp_int_burst_period = 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]=(6e-9*power_of_ten)+20e-9; mem->delay_pwl_time[i][j][k][m]=(6e-9*power_of_ten)+10e-9; mem->burst_pwl_time[i][j][k][m]=(22e-9*power_of_ten)+25e-9; } else if (m==1) { - temp_int = temp_int_burst = dac_max/2.15; + temp_int = temp_int_burst_period = dac_max/2.15; mem->period_pwl_time[i][j][k][m]=(100e-9*power_of_ten)+50e-9; mem->pw_pwl_time[i][j][k][m]=(14e-9*power_of_ten)+25e-9; mem->delay_pwl_time[i][j][k][m]=(14e-9*power_of_ten)+30e-9; mem->burst_pwl_time[i][j][k][m]=(33e-9*power_of_ten)+10e-9; } else if (m==2) { - temp_int = temp_int_burst = dac_max/4.6; + temp_int = temp_int_burst_period = dac_max/4.6; mem->period_pwl_time[i][j][k][m]=(230e-9*power_of_ten)+100e-9; mem->pw_pwl_time[i][j][k][m]=(28e-9*power_of_ten)+50e-9; @@ -566,7 +566,7 @@ static void initFlashValues(FlashStruct *mem) mem->burst_pwl_time[i][j][k][m]=(50e-9*power_of_ten)+10e-9; } else if (m==3) { - temp_int = temp_int_burst = dac_min; + temp_int = temp_int_burst_period = dac_max / 10; mem->period_pwl_time[i][j][k][m]=(470e-9*power_of_ten)+160e-9; mem->pw_pwl_time[i][j][k][m]=(70e-9*power_of_ten)+80e-9; @@ -574,15 +574,15 @@ static void initFlashValues(FlashStruct *mem) mem->burst_pwl_time[i][j][k][m]=(110e-9*power_of_ten)+10e-9; } else if (m==4) { temp_int = 0; - temp_int_burst = dac_min / 2 ; + temp_int_burst_period = dac_max / 20 ; - mem->period_pwl_time[i][j][k][m]=0.0; + mem->period_pwl_time[i][j][k][m]=(900e-9*power_of_ten)+200e-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]=(220e-9*power_of_ten)+10e-9; } else { temp_int = 0; - temp_int_burst = 0; + temp_int_burst_period = 0; mem->pw_pwl_time[i][j][k][m]=0.0; mem->delay_pwl_time[i][j][k][m]=0.0; mem->period_pwl_time[i][j][k][m]=0.0; @@ -591,8 +591,8 @@ static void initFlashValues(FlashStruct *mem) mem->pw_pwl_Vc_norm4095[i][j][k][m]=temp_int; mem->delay_pwl_Vc_norm4095[i][j][k][m]=temp_int; - mem->period_pwl_Vc_norm4095[i][j][k][m]=temp_int; - mem->burst_pwl_Vc_norm4095[i][j][k][m]=temp_int_burst; + mem->period_pwl_Vc_norm4095[i][j][k][m]=temp_int_burst_period; + mem->burst_pwl_Vc_norm4095[i][j][k][m]=temp_int_burst_period; } } power_of_ten*=10.0; @@ -132,7 +132,6 @@ #define pwl_slew_values 9 #define dac_max 8191 -#define dac_min 819 #define All_Programmed 2 #define Being_Programmed 1 |