diff options
author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2018-05-03 09:20:22 -0400 |
---|---|---|
committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2018-05-03 09:20:22 -0400 |
commit | 0aa3b9ec80108e690c2ca5157cb6d83087a40788 (patch) | |
tree | 8e757e5e05ba49c502e283758f9b28572080d142 /device-functions.c | |
parent | 2bddfb1c8457b4b6dbaeeb881bde35239ba0e165 (diff) |
original number of points in each range was 10
Diffstat (limited to 'device-functions.c')
-rw-r--r-- | device-functions.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/device-functions.c b/device-functions.c index 5c2ed2c..8847d92 100644 --- a/device-functions.c +++ b/device-functions.c @@ -2311,7 +2311,7 @@ int Set_VI_Cal_Pnt(int parameter,int channel,int calibration_point_number,float pwl = 0; pwl_distort = 0; - max_points=points_in_range; + max_points=old_range_size_ten; switch (parameter) { case (pwl_ampl_values): max_polarity=ampl_polarities; @@ -2499,7 +2499,7 @@ int Set_VI_Del_Cal(int parameter,int channel,int calibration_point_number) true_channel=channel; - max_points=points_in_range; + max_points=old_range_size_ten; pointer_short2=0; switch (parameter) { @@ -2605,10 +2605,10 @@ int Set_VI_Del_Cal(int parameter,int channel,int calibration_point_number) } } - *(float *)(&pointer_float1[index+points_in_range-1])=0.0; - *(short *)(&pointer_short1[index+points_in_range-1])=0; + *(float *)(&pointer_float1[index+old_range_size_ten-1])=0.0; + *(short *)(&pointer_short1[index+old_range_size_ten-1])=0; if (pointer_short2) { - *(short *)(&pointer_short2[index+points_in_range-1])=0; + *(short *)(&pointer_short2[index+old_range_size_ten-1])=0; } /* see if new point prevents min/max from being obtained */ @@ -2710,7 +2710,7 @@ int Set_VI_Control(int parameter,int channel,float new_ampl,int *point_found,int top_range_only=0; starting_range=0; - max_points=points_in_range; + max_points=old_range_size_ten; reciprocal_relationship=NO; decreasing_values_allowed=NO; min_os_in_range=max_os_in_range=0.0; @@ -3006,7 +3006,7 @@ int Set_VI_Control(int parameter,int channel,float new_ampl,int *point_found,int *point_found=1; if ((parameter==pwl_ampl_values) && globals.Flash.ampl_os_ranges_related[channel]) { - for (i=0; i<points_in_range; i++) { + for (i=0; i<old_range_size_ten; i++) { if (max_os_in_range<globals.Flash.os_pwl[channel][range_i][0][i]) { max_os_in_range=globals.Flash.os_pwl[channel][range_i][0][i]; } @@ -3020,7 +3020,7 @@ int Set_VI_Control(int parameter,int channel,float new_ampl,int *point_found,int } if ((parameter==pwl_os_values) && globals.Flash.ampl_os_ranges_related[channel]) { - for (i=0; i<points_in_range; i++) { + for (i=0; i<old_range_size_ten; i++) { if (max_ampl_in_range<globals.Flash.ampl_pwl[channel][range_i][*UseNegData][i]) { max_ampl_in_range=globals.Flash.ampl_pwl[channel][range_i][*UseNegData][i]; } @@ -3141,10 +3141,10 @@ int Set_VI_Add_Cal(int parameter,int channel,float cal_point) float abs_cal_point; int max_points,max_polarity,max_ranges; - float temp_y_float1[points_in_range+1]; - float temp_x_float1[points_in_range+1]; /* float copy of short, for calculations */ - int temp_x_short1[points_in_range+1]; - int temp_x_short2[points_in_range+1]; + float temp_y_float1[old_range_size_ten+1]; + float temp_x_float1[old_range_size_ten+1]; /* float copy of short, for calculations */ + int temp_x_short1[old_range_size_ten+1]; + int temp_x_short2[old_range_size_ten+1]; int index,actual_pol; float *pointer_y_float1; @@ -3159,7 +3159,7 @@ int Set_VI_Add_Cal(int parameter,int channel,float cal_point) range=polarity=0; - max_points=points_in_range; + max_points=old_range_size_ten; pointer_x_short2=0; abs_cal_point=cal_point; @@ -3465,7 +3465,7 @@ int Get_VI_Rng_Info(int parameter, int channel, int calibration_point_number, in *num_in_range=0; /* determine array structure */ - max_points=points_in_range; + max_points=old_range_size_ten; switch (parameter) { case pwl_ampl_values: |