summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@avtech.domain.avtechpulse.com>1970-01-01 09:23:38 +0900
committerroot <root@avtech.domain.avtechpulse.com>1970-01-01 09:23:38 +0900
commita33693b1048b5893868b470d93e70ee35c4ef3d9 (patch)
treec4e8117016774f301d7c1c02ce816287fadac6c8
parent2413787aaa3eda456d6ff2088457668d615ef4f5 (diff)
fixed setting of initial/rst burst separationINSTRUMENT_6_0_2b
-rw-r--r--flash.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/flash.c b/flash.c
index 3e93b64..b2bd2f8 100644
--- a/flash.c
+++ b/flash.c
@@ -942,19 +942,18 @@ void fixFlash(FlashStruct *mem)
{
int i, fix_initial_constants;
- float composite_min_burst_time[max_channels];
for (i=0; i<max_channels; i++) {
- composite_min_burst_time[i]=mem->min_burst_gap[i];
- if ((mem->min_burst_per[i] - mem->min_pw[i]) > composite_min_burst_time[i]) {
- composite_min_burst_time[i] = mem->min_burst_per[i] - mem->min_pw[i];
+ globals.Constraints.composite_min_burst_time[i]=mem->min_burst_gap[i];
+ if ((mem->min_burst_per[i] - mem->min_pw[i]) > globals.Constraints.composite_min_burst_time[i]) {
+ globals.Constraints.composite_min_burst_time[i] = mem->min_burst_per[i] - mem->min_pw[i];
}
int j;
for (j=0; j<max_stored_settings; j++) {
- if (mem->rcl_burst_time[i][j] < composite_min_burst_time[i]) {
- mem->rcl_burst_time[i][j]=composite_min_burst_time[i];
+ if (mem->rcl_burst_time[i][j] < globals.Constraints.composite_min_burst_time[i]) {
+ mem->rcl_burst_time[i][j]=globals.Constraints.composite_min_burst_time[i];
++fix_initial_constants;
}
if (mem->rcl_rise_time[i][j] < mem->min_rise_time[i]) {