From 140dec8d2589d07a6068a52e10c66d53f0df86dc Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Tue, 30 Mar 2010 10:40:54 +0000 Subject: [PATCH] =?UTF-8?q?adc.c=20CTR=E5=81=B4=E3=81=AE=E9=9F=B3=E9=87=8F?= =?UTF-8?q?=E3=83=AC=E3=82=B8=E3=82=B9=E3=82=BF=E3=82=92=200-63=20?= =?UTF-8?q?=E3=81=AB=E3=81=AA=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89?= =?UTF-8?q?=E6=9B=B4=20=20=20=20=20=20=20=E3=82=B3=E3=83=BC=E3=83=89?= =?UTF-8?q?=E3=81=AE=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@107 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/adc.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/trunk/adc.c b/trunk/adc.c index 9b2bcdc..ffbe9f1 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -126,19 +126,17 @@ void tsk_adc( ) static u8 vol_old; static u8 force_update_vol; - temp = slider_to_codec[ adc_raw_vol / 4 ]; - if( abs( adc_raw_vol - vol_old ) >= 2 ) + if( abs( adc_raw_vol - vol_old ) >= 2 ) // 生値でこれくらいずれたら更新 { -// temp = slider_to_codec[ adc_raw_vol / 4 ]; - if( vreg_ctr[ VREG_C_SND_VOL ] != temp ) +// if( vreg_ctr[ VREG_C_SND_VOL ] != ( adc_raw_vol / 4 ) ) { vol_old = adc_raw_vol; // レジスタ更新 - vreg_ctr[ VREG_C_SND_VOL ] = temp; + vreg_ctr[ VREG_C_SND_VOL ] = ( adc_raw_vol / 4 ); vreg_twl[ REG_TWL_INT_ADRS_VOL ] = adc_raw_vol / ( 256 / 32 ); // ←adc値でよい // codecに伝える - iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, temp ); + iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, slider_to_codec[ adc_raw_vol / 4 ] ); #ifndef _MODEL_CTR_ iic_mcu_write_a_byte( IIC_SLA_DCP, 0, slider_to_codec[ ( 255 - adc_raw_vol ) / 4 ] ); // todo #endif @@ -153,12 +151,12 @@ void tsk_adc( ) { vol_old = adc_raw_vol; // レジスタ更新 - vreg_ctr[ VREG_C_SND_VOL ] = temp; - vreg_twl[ REG_TWL_INT_ADRS_VOL ] = adc_raw_vol / ( 256 / 32 ); // ←adc値でよい +// vreg_ctr[ VREG_C_SND_VOL ] = temp; +// vreg_twl[ REG_TWL_INT_ADRS_VOL ] = adc_raw_vol / ( 256 / 32 ); // ←adc値でよい + // codecに伝える + iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, slider_to_codec[ adc_raw_vol / 4 ] ); + force_update_vol = 100; } - // codecに伝える - iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, temp ); - force_update_vol = 100; } }