more specific errors during cal min/max check, and more initial cal points

1 files changed, 18 insertions, 17 deletions

diff --git a/flash.c b/flash.c
index ba89401..bbf1f63 100644
--- a/flash.c
+++ b/flash.c
@@ -545,49 +545,50 @@ 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_period;
+					int temp_int;
 
 					if (m==0) {
-						/* these values have been determined by experiment */
-						temp_int = temp_int_burst_period = dac_max;
+						/* These values have been determined by experiment. */
+						/* Double CH2 delays for -KMPF */
+
+						temp_int = 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->delay_pwl_time[i][j][k][m]=((6e-9*power_of_ten)+10e-9) * (i+1.0);
 						mem->burst_pwl_time[i][j][k][m]=(22e-9*power_of_ten)+25e-9;
 					} else if (m==1) {
-						temp_int = temp_int_burst_period = dac_max/2.15;
+						temp_int = 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->delay_pwl_time[i][j][k][m]=((14e-9*power_of_ten)+30e-9) * (i+1.0);
 						mem->burst_pwl_time[i][j][k][m]=(33e-9*power_of_ten)+10e-9;
 					} else if (m==2) {
-						temp_int = temp_int_burst_period = dac_max/4.6;
+						temp_int = 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;
-						mem->delay_pwl_time[i][j][k][m]=(28e-9*power_of_ten)+60e-9;
+						mem->delay_pwl_time[i][j][k][m]=((28e-9*power_of_ten)+60e-9) * (i+1.0);
 						mem->burst_pwl_time[i][j][k][m]=(50e-9*power_of_ten)+10e-9;
 
 					} else if (m==3) {
-						temp_int = temp_int_burst_period = dac_max / 10;
+						temp_int = 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;
-						mem->delay_pwl_time[i][j][k][m]=(70e-9*power_of_ten)+90e-9;
+						mem->delay_pwl_time[i][j][k][m]=((70e-9*power_of_ten))+90e-9 * (i+1.0);
 						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_period = dac_max / 20 ;
+						temp_int = dac_max / 20 ;
 
 						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->pw_pwl_time[i][j][k][m]=(140e-9*power_of_ten)+80e-9;
+						mem->delay_pwl_time[i][j][k][m]=((140e-9*power_of_ten)+90e-9) * (i+1.0);
 						mem->burst_pwl_time[i][j][k][m]=(220e-9*power_of_ten)+10e-9;
 					} else {
 						temp_int = 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;
@@ -596,8 +597,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_burst_period;
-					mem->burst_pwl_Vc_norm4095[i][j][k][m]=temp_int_burst_period;
+					mem->period_pwl_Vc_norm4095[i][j][k][m]=temp_int;
+					mem->burst_pwl_Vc_norm4095[i][j][k][m]=temp_int;
 				}
 			}
 			power_of_ten*=10.0;