mirror of
https://github.com/rvtr/ctr_mcu.git
synced 2025-10-31 13:51:10 -04:00
adc.c CTR側の音量レジスタを 0-63 になるように変更
コードの整理 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
This commit is contained in:
parent
cd8c1a1590
commit
140dec8d25
20
trunk/adc.c
20
trunk/adc.c
@ -126,19 +126,17 @@ void tsk_adc( )
|
|||||||
static u8 vol_old;
|
static u8 vol_old;
|
||||||
static u8 force_update_vol;
|
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 ] != ( adc_raw_vol / 4 ) )
|
||||||
if( vreg_ctr[ VREG_C_SND_VOL ] != temp )
|
|
||||||
{
|
{
|
||||||
vol_old = adc_raw_vol;
|
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値でよい
|
vreg_twl[ REG_TWL_INT_ADRS_VOL ] = adc_raw_vol / ( 256 / 32 ); // ←adc値でよい
|
||||||
|
|
||||||
// codecに伝える
|
// 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_
|
#ifndef _MODEL_CTR_
|
||||||
iic_mcu_write_a_byte( IIC_SLA_DCP, 0, slider_to_codec[ ( 255 - adc_raw_vol ) / 4 ] ); // todo
|
iic_mcu_write_a_byte( IIC_SLA_DCP, 0, slider_to_codec[ ( 255 - adc_raw_vol ) / 4 ] ); // todo
|
||||||
#endif
|
#endif
|
||||||
@ -153,12 +151,12 @@ void tsk_adc( )
|
|||||||
{
|
{
|
||||||
vol_old = adc_raw_vol;
|
vol_old = adc_raw_vol;
|
||||||
// レジスタ更新
|
// レジスタ更新
|
||||||
vreg_ctr[ VREG_C_SND_VOL ] = temp;
|
// vreg_ctr[ VREG_C_SND_VOL ] = temp;
|
||||||
vreg_twl[ REG_TWL_INT_ADRS_VOL ] = adc_raw_vol / ( 256 / 32 ); // <20>©adc’l‚ł悢
|
// 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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user