From 5825c1d8982bb7ac65c0c43f34d1de07fda0aa38 Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 1 Jan 2000 00:54:22 +0900 Subject: store distortion dac values, not floats --- flash.c | 2 +- globals.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flash.c b/flash.c index 53198ea..a350125 100644 --- a/flash.c +++ b/flash.c @@ -639,7 +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->distort_dacval[i][k][m][j]=0; } mem->ampl_dacval[i][0][0][1]=dac_max; diff --git a/globals.h b/globals.h index 5f3055e..8e278f0 100644 --- a/globals.h +++ b/globals.h @@ -761,9 +761,9 @@ typedef struct { /* 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 */ + short distort_dacval[max_channels][ampl_ranges][ampl_polarities][points_in_range]; + char distort_dac[max_channels]; /* addr 10656 */ + char distort_enabled[max_channels]; /* addr 10658 */ char flash_end; -- cgit