From e6bffe69da802b7266920ac030ba1898996cd94f Mon Sep 17 00:00:00 2001 From: n2232 Date: Tue, 19 Oct 2010 07:48:21 +0000 Subject: [PATCH] =?UTF-8?q?1.0B=20=E3=83=90=E3=83=83=E3=83=86=E3=83=AA?= =?UTF-8?q?=E7=84=A1=E3=81=97=E3=81=A7=E9=9B=BB=E6=BA=90on=E3=81=A8?= =?UTF-8?q?=E3=81=8B=E3=81=97=E3=81=A6=E3=81=97=E3=81=BE=E3=81=A3=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=80=82=E3=80=80=E3=83=AA=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=AF=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0=E6=99=82=E3=81=AE?= =?UTF-8?q?=E3=83=9D=E3=82=AB=E3=83=9F=E3=82=B9=20off=E4=B8=AD=E3=81=AECCI?= =?UTF-8?q?C=E3=81=8B=E3=82=89=E3=81=AE=E3=83=AA=E3=83=BC=E3=82=AF?= =?UTF-8?q?=E5=AF=BE=E7=AD=96=E3=82=92=E5=89=8A=E9=99=A4=E3=80=80=E3=81=93?= =?UTF-8?q?=E3=82=8C=E3=82=92=E3=82=84=E3=82=8B=E3=81=A8=E3=81=84=E3=82=8D?= =?UTF-8?q?=E3=81=84=E3=82=8D=E6=82=AA=E5=BD=B1=E9=9F=BF=E3=81=8C=E3=81=82?= =?UTF-8?q?=E3=82=8B=E3=81=A8=E3=81=AE=E3=81=93=E3=81=A8?= 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@246 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/adc.c | 10 +-- trunk/config.h | 2 +- trunk/hoge.bin | Bin 16387 -> 16387 bytes trunk/pm.c | 17 ++--- trunk/task_misc.c | 48 ++++++++------ trunk/task_sys.c | 15 ++--- trunk/vreg_twl.c | 14 +--- trunk/vreg_twl.h | 10 +-- trunk/yav_mcu_bsr.pri | 80 +++++++++++------------ trunk/yav_mcu_bsr.prj | 146 +++++++++++++++++++++--------------------- trunk/yav_mcu_bsr.prk | 7 +- 11 files changed, 169 insertions(+), 180 deletions(-) diff --git a/trunk/adc.c b/trunk/adc.c index 43fa5c8..4acff1a 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -209,7 +209,7 @@ task_status_immed tski_vol_update() // レジスタの更新 // vreg_ctr[ VREG_C_SND_VOL ] = sent_index; - if( sent_index == 1 ) + if( sent_index == 1 ) // スケーリング { vreg_twl[ REG_TWL_INT_ADRS_VOL ] = 1; } @@ -291,16 +291,11 @@ case ( ADC_SEL_AMB_BRIT ): // case ( ADC_SEL_TUNE ): EI(); -#ifdef _MODEL_WM0_ - adc_raw_dep = 255 - adc_data; -#else adc_raw_dep = adc_data; -#endif break; case ( ADC_SEL_VOL ): EI(); -#ifdef _MODEL_CTR_ if( system_status.model == MODEL_TS_BOARD ) { adc_raw_vol = adc_data; @@ -309,9 +304,6 @@ case ( ADC_SEL_AMB_BRIT ): // { adc_raw_vol = 255 - adc_data; } -#else - adc_raw_vol = adc_data; -#endif break; diff --git a/trunk/config.h b/trunk/config.h index 86214b8..fa980c4 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -13,7 +13,7 @@ //#define _FORCE_TAIKENDAI_ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 10 +#define MCU_VER_MINOR 11 #define _firm_format_v3_ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index 8e08963388262f8fe8813bbd0481031c40d58b7c..7b29b7ae34d0813ec1655116ccf985900f991a3a 100644 GIT binary patch delta 4967 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 N+h|aay@e%`{|8k~2yXxY delta 5188 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