diff options
| -rw-r--r-- | flash.c | 4 | ||||
| -rw-r--r-- | globals.h | 6 |
2 files changed, 10 insertions, 0 deletions
@@ -639,6 +639,7 @@ static void initFlashValues(FlashStruct *mem) for (m=0; m<2; m++) { mem->ampl_dacval[i][k][m][j]=0; mem->ampl_pwl[i][k][m][j]=0.0; + mem->distort_pwl[i][k][m][j]=0.0; } mem->ampl_dacval[i][0][0][1]=dac_max; @@ -877,6 +878,9 @@ static void initFlashValues(FlashStruct *mem) mem->ext2_enabled[i] = 0; mem->toggle_trig_at_boot[i] = 1; mem->sequential_attenuators[i] = 0; + + mem->distort_dac[i] = 6; + mem->distort_enabled[i] = 0; } mem->relay_delay_in_sec=0.5; @@ -759,6 +759,12 @@ typedef struct { char sequential_attenuators[max_channels]; /* addr 10254, for AVRZ-5W-B-LVA style of 3 identical attenuators */ + + /* addr 10256, add ampl-dependent distort output, 10V full-scale */ + float distort_pwl[max_channels][ampl_ranges][ampl_polarities][points_in_range]; + char distort_dac[max_channels]; /* addr 11056 */ + char distort_enabled[max_channels]; /* addr 11058 */ + char flash_end; } FlashStruct; |