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; } }