diff options
| -rw-r--r-- | flash.c | 6 | ||||
| -rw-r--r-- | globals.h | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -769,13 +769,15 @@ static void initFlashValues(FlashStruct *mem) mem->use_high_ampl_ranges_for_high_pw_ranges[i]=0; mem->couple_first_N_pw_ranges_to_ampl_ranges[i]=0; + + for (j=0;j<max_attens;j++) { + mem->attenuators[i][j] = 0.0; + } } mem->relay_delay_in_sec=0.5; mem->extended_relay_delay_in_sec=0.5; - mem->wait_states_after_sock_init=10000; - /*0123456789012345678901234567890123456789*/ strcpy(mem->aux_error_message,"PRF too high! Output disabled."); @@ -194,6 +194,7 @@ #define zero_equiv_timing 1e-10 #define max_v_dymanic_range 1e6 +#define max_attens 8 /* general formatting */ #define remote_digits_after_decimal 4 /* how many digits are returned after decimal by query commands */ @@ -616,7 +617,7 @@ typedef struct { char current_limit_dac[max_channels]; /* 8422 */ char hard_current_limit_enabled[max_channels]; /* 8424 */ - short wait_states_after_sock_init; /* 8426 */ + short wait_states_after_sock_init; /* 8426 - no longer used */ char aux_error_message[40]; /* 8428 */ @@ -698,6 +699,9 @@ typedef struct { // PG A = pw range 0, ampl range 0 // PG B = pw range 1, ampl range 1 // PG C = pw range 2+, ampl range 2 + + float attenuators[max_channels][max_attens]; // addr 10070 + char spare_end; char flash_end; |