From 5cc27484c073df53b34f46c98de0f62df5191841 Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Mon, 1 Feb 2010 07:00:16 +0000 Subject: [PATCH] =?UTF-8?q?=E5=89=8A=E9=99=A4=EF=BC=9A=E3=82=B9=E3=83=A9?= =?UTF-8?q?=E3=82=A4=E3=83=89=E3=83=9C=E3=83=AA=E3=83=A5=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E3=81=A7=E3=81=AEVolChange=E5=89=B2=E3=82=8A=E8=BE=BC=E3=81=BF?= =?UTF-8?q?=20=20=20=20=20=20=20=E3=81=9D=E3=82=8C=E3=81=AB=E4=BC=B4?= =?UTF-8?q?=E3=81=84=20=E3=80=80=E3=80=80=E3=80=80=E3=80=80=E3=83=8E?= =?UTF-8?q?=E3=82=A4=E3=82=BA=E5=8F=96=E3=82=8A=E3=82=92=E3=81=A1=E3=82=87?= =?UTF-8?q?=E3=81=A3=E3=81=A8=E5=89=8A=E9=99=A4=20=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=EF=BC=9ATWL=E3=82=A2=E3=83=97=E3=83=AA=E3=81=8B=E3=82=89?= =?UTF-8?q?=E3=81=AEVol=E5=A4=89=E5=8C=96=E5=89=B2=E3=82=8A=E8=BE=BC?= =?UTF-8?q?=E3=81=BF=20IRQ2.6=20=E8=BF=BD=E5=8A=A0=EF=BC=9A8=E7=A4=BE?= =?UTF-8?q?=E5=88=86=E3=81=AE=E9=9B=BB=E6=B1=A0=E3=83=A1=E3=83=BC=E3=82=AB?= =?UTF-8?q?=E3=83=BC=E3=83=91=E3=83=A9=E3=83=A1=E3=83=BC=E3=82=BF=E3=81=AE?= =?UTF-8?q?=E9=A0=98=E5=9F=9F=20=E8=BF=BD=E5=8A=A0=EF=BC=9A=E5=85=85?= =?UTF-8?q?=E9=9B=BB=E3=82=BF=E3=82=A4=E3=83=9E=E3=81=AE=E5=88=B6=E5=BE=A1?= 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@89 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/adc.c | 81 +++++++++++++++++------------- trunk/config.h | 2 + trunk/pm.c | 38 +++----------- trunk/task_debug.c | 3 ++ trunk/task_misc.c | 4 +- trunk/task_sys.c | 2 + trunk/user_define.h | 11 +++- trunk/vreg_ctr.h | 3 +- trunk/vreg_twl.c | 2 +- trunk/yav_mcu_bsr.plg | 113 +++++++++++++++++++++++++++++++++++++++++- trunk/yav_mcu_bsr.pri | 12 ++--- trunk/yav_mcu_bsr.prj | 61 ++++++++++++----------- trunk/yav_mcu_bsr.prk | 4 +- trunk/yav_mcu_bsr.sdb | 19 ++++--- 14 files changed, 237 insertions(+), 118 deletions(-) diff --git a/trunk/adc.c b/trunk/adc.c index bbb4273..5591a56 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -63,9 +63,9 @@ void tsk_adc( ) { if( system_status.pwr_state == ON ) { - // Tune // + // Tune /////////////////////////////////////// #if 0 - tune ・ﾌ変化では割り込みを入れない + tune 変化では割り込みを入れない // tune if( abs( old_tune - vreg_ctr[VREG_TUNE] ) >= 4 ) { @@ -78,48 +78,44 @@ void tsk_adc( ) } #endif - // Volume // + // Volume ///////////////////////////////////// { static u8 vol_old; static u8 class_old; - u8 class; - static u8 tokidoki = 0; // todo ポーリングは不要になる予定 + static u8 hysterisis_vol; + u16 class; - if( abs( vol_old - vreg_ctr[VREG_C_SND_VOL] ) > 3 ) +// // ヒステリシスを付けておく。上に抜けた場合に閾値を少し下げることにする +// hysterisis_vol = ( vol_old <= vreg_ctr[VREG_C_SND_VOL] )? 2: 0; +// vol_old = vreg_ctr[VREG_C_SND_VOL]; + + // TWL用レジスタの更新 + vreg_twl[ REG_TWL_INT_ADRS_VOL ] = vreg_ctr[VREG_C_SND_VOL] / ( 256 / 32 ); // 8段の割り込み + // 割り込みはHorizonを通してコマンドを発行されるのを待てばよい + + /* + class = ( vreg_ctr[VREG_C_SND_VOL] + hysterisis_vol ) / ( 256 / 8 ); // 32段の割り込み + if( class != class_old ) { - vol_old = vreg_ctr[VREG_C_SND_VOL]; - - // TWLに通知してやる - vreg_twl[ REG_TWL_INT_ADRS_VOL ] = vol_old / ( 256 / 32 ); - // 割り込みはHorizonを通してコマンドを発行されるのを待てばよい - - class = vreg_ctr[VREG_C_SND_VOL] / ( 256 / 16 ); - if( class != class_old ) - { - class_old = class; - set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); - } + class_old = class; + set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); } - +*/ // デバイスに伝える - if(( sndvol_codec != vreg_ctr[VREG_C_SND_VOL] ) - || ( tokidoki == 0 )) + if( sndvol_codec != vreg_ctr[VREG_C_SND_VOL] ) { sndvol_codec = vreg_ctr[VREG_C_SND_VOL]; // DCPにも伝えておく iic_mcu_write_a_byte( IIC_SLA_DCP, 0, - sndvol_codec / 2 + sndvol_codec / 4 ); // 簡易スケーリング todo + slider_to_codec[ sndvol_codec/4 ] ); // codecに伝える iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, - slider_to_codec[ sndvol_codec/4 ] ); - -// 127 - (u8)( (u16)sndvol_codec*3 / 4 )/2 ); + slider_to_codec[ sndvol_codec/4 ] ); } - tokidoki += 1; } - // TUNE_LED // + // TUNE_LED /////////////////////////////////// // ここで？仕様？ { switch ( vreg_ctr[VREG_C_LED_TUNE] ) @@ -144,16 +140,23 @@ void tsk_adc( ) } - ADCEN = 1; - ADM = 0b00011011; // セレクトモード、章圧、fCLK/6 ///ここから ↓ + ADCEN = 1; + ADM = 0b00011011; // セレクトモード、章圧、fCLK/6 ///ここから ↓ - ADPC = 0x06; // ADCポートのセレクト - ADS = ADC_SEL_TUNE; -// NOP(); - ADCS = 1; // AD開始。 /// ここまで　↑　までに1us以上開ける + ADPC = 0x06; // ADCポートのセレクト + ADS = ADC_SEL_TUNE; + NOP(); + NOP(); + NOP(); + NOP(); + NOP(); + NOP(); + NOP(); + NOP(); + ADCS = 1; // AD開始。 /// ここまで　↑　までに1us=8clk以上開ける - ADIF = 0; - ADMK = 0; + ADIF = 0; + ADMK = 0; } @@ -271,6 +274,14 @@ u8 get_adc( u8 ch ) ADPC = 0x06; // ADCポートのセレクト ADS = ch; + NOP(); + NOP(); + NOP(); + NOP(); + NOP(); + NOP(); + NOP(); + NOP(); ADCS = 1; // AD開始。 /// ここまで↑　に、1us以上開ける ADMK = 0; diff --git a/trunk/config.h b/trunk/config.h index 17296de..7820703 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -10,6 +10,8 @@ #define _OVERCLOCK_ +#define PM_CCIC_TIM + // 古い(C)電源ボード //#define _PM_BUG_ diff --git a/trunk/pm.c b/trunk/pm.c index e5ffac8..9f18868 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -12,33 +12,10 @@ #include "pm.h" #include "renge.h" - +#include "batt_params.h" // ======================================================== - - -// ======================================================== -static const u8 BT_BT_PARAM_PANA[64] = { - 0xAD, 0x30, 0xAE, 0x70, 0xB0, 0x00, 0xB3, 0x00, - 0xB4, 0x70, 0xB5, 0xA0, 0xB7, 0x80, 0xBA, 0x00, - - 0xBB, 0x90, 0xBD, 0x00, 0xBE, 0x00, 0xBF, 0xF0, - 0xC3, 0x00, 0xC5, 0xC0, 0xC8, 0x00, 0xCA, 0xC0, - - 0x04, 0x00, 0x12, 0x00, 0x0C, 0x10, 0x24, 0x00, - 0x10, 0xD0, 0x1B, 0xF0, 0x0A, 0xF0, 0x08, 0xE0, - - 0x0C, 0xF0, 0x08, 0xC0, 0x08, 0xB0, 0x07, 0xF0, - 0x0B, 0x00, 0x05, 0xD0, 0x02, 0x00, 0x09, 0x00 -}; - - -static const unsigned char BT_PANA_RCOMP = 135; -static const float BT_PANA_TEMPCOUP = 0.3; -static const float BT_PANA_TEMPCODN = 0.5; - - // ======================================================== u8 raw_adc_temperature; u8 rcomp; @@ -113,7 +90,7 @@ void PM_init( ) { // case( BT_VENDER_PANA ): default: - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM, 64, BT_BT_PARAM_PANA ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM, 64, &BT_PARAM[0] ); rcomp = BT_PANA_RCOMP; temp_co_up = BT_PANA_TEMPCOUP; temp_co_dn = BT_PANA_TEMPCODN; @@ -685,15 +662,15 @@ void tsk_batt( ) && ( vreg_ctr[VREG_C_BT_TEMP] < 0x36 ) ) ) { #ifndef _MODEL_WM0_ - BT_CHG_EN_n = 0; // 温度範囲OKで充電再開 + BT_CHG_ENABLE(); // 温度範囲OKで充電再開 } else { - BT_CHG_EN_n = 1; // 温度危険！　充電停止 + BT_CHG_DISABLE(); // 温度危険！　充電停止 #endif } #ifdef _MODEL_WM0_ - BT_CHG_EN_n = 0; // /WL_RSTです... +// CHG_ENABLEピンは /WL_RST に配線されているので #endif // 充電 // @@ -767,6 +744,7 @@ task_status_immed ntr_pmic_comm( ) DI( ); + // バックライト 上 //////////////////////////////////// if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL_U ) != 0 ) { if( ( reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 ) // 消えた @@ -792,13 +770,13 @@ task_status_immed ntr_pmic_comm( ) } } -// offリクエスト + // offリクエスト ////////////////////////////////////// if( ( reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 ) { set_irq( VREG_C_IRQ2, REG_BIT_TWL_OFF_REQ ); } -// リセットリクエスト + // リセットリクエスト ///////////////////////////////// if( ( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 ) { // CODECバグ回避 diff --git a/trunk/task_debug.c b/trunk/task_debug.c index 63c9595..51b1b4d 100644 --- a/trunk/task_debug.c +++ b/trunk/task_debug.c @@ -20,6 +20,9 @@ void tsk_debug( ) if( system_status.pwr_state == ON_TRIG ){ +#ifdef _MODEL_WM0_ + PM_CHG_TIMEOUT_DISABLE(); // /WL_RST に配線されています +#endif iic_mcu_write_a_byte( IIC_SLA_DCP, 0x08, 0x80 ); // ACR←0x80 揮発モードへ /* diff --git a/trunk/task_misc.c b/trunk/task_misc.c index 8cae825..28aaaad 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -78,7 +78,7 @@ void tsk_misc_stat( ) } -#ifdef _MCU_KE3_ +//#ifdef _MCU_KE3_ // KE3では必須です。 /* ======================================================== 加速度センサ割り込みピンがオリジナルマイコンには無いので @@ -96,7 +96,7 @@ void tsk_misc_stat( ) } } } -#endif +//#endif // 割り込みの取りこぼし？ if( !PM_IRQ_n ){ diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 267c8cb..1ccca51 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -88,6 +88,7 @@ void tsk_sys( ) system_status.pwr_state = OFF_TRIG; return; } + PM_CHG_TIMEOUT_ENABLE(); // IRQ0_active; #else @@ -190,6 +191,7 @@ void tsk_sys( ) return; } + PM_CHG_TIMEOUT_ENABLE(); LED_stop( ); IIC_ctr_Stop( ); IIC_twl_Stop( ); diff --git a/trunk/user_define.h b/trunk/user_define.h index 30b862b..02eae01 100644 --- a/trunk/user_define.h +++ b/trunk/user_define.h @@ -108,9 +108,16 @@ // 充電せよ(out) #ifdef _PMIC_CTR_ -#define BT_CHG_EN_n P4.3 +#define BT_CHG_ENABLE() ( P4.3 = 0 ) +#define BT_CHG_DISABLE() ( P4.3 = 1 ) #else -#define BT_CHG_EN_n P4.2 +#define BT_CHG_ENABLE() ( P4.2 = 0 ) +#define BT_CHG_DISABLE() ( P4.2 = 1 ) +#endif + +#ifdef PM_CCIC_TIM +#define PM_CHG_TIMEOUT_ENABLE() ( P5.0 = 0 ) +#define PM_CHG_TIMEOUT_DISABLE() ( P5.0 = 1 ) #endif // 充電中(in) diff --git a/trunk/vreg_ctr.h b/trunk/vreg_ctr.h index f4bf498..b172810 100644 --- a/trunk/vreg_ctr.h +++ b/trunk/vreg_ctr.h @@ -33,7 +33,7 @@ // VREG_C_IRQ0 -#define REG_BIT_VR_SNDVOL_CHANGE ( 1 << 7 ) +//#define REG_BIT_VR_SNDVOL_CHANGE ( 1 << 7 ) #define REG_BIT_SHELL_OPEN ( 1 << 6 ) #define REG_BIT_SHELL_CLOSE ( 1 << 5 ) #define REG_BIT_SW_WIFI_CLICK ( 1 << 4 ) @@ -53,6 +53,7 @@ #define REG_BIT_BT_DC_DISC ( 1 << 0 ) // VREG_C_IRQ2 +#define REG_BIT_TWL_SNDVOL_CHANGE ( 1 << 6 ) #define REG_BIT_TWL_BL_U_ON ( 1 << 5 ) #define REG_BIT_TWL_BL_U_OFF ( 1 << 4 ) #define REG_BIT_TWL_BL_L_ON ( 1 << 3 ) diff --git a/trunk/vreg_twl.c b/trunk/vreg_twl.c index 1d05e73..bcb548b 100644 --- a/trunk/vreg_twl.c +++ b/trunk/vreg_twl.c @@ -38,7 +38,7 @@ void vreg_twl_write( u8 adrs, u8 data ) { case ( REG_TWL_INT_ADRS_VOL ): { - set_irq( VREG_C_IRQ0, REG_BIT_VR_SNDVOL_CHANGE ); + set_irq( VREG_C_IRQ2, REG_BIT_TWL_SNDVOL_CHANGE ); break; } diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index 10a3005..25a9d97 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,8 +1,119 @@ C:\WINDOWS\system32\cmd.exe /c touch magic.c +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no loader.c +loader.c(106) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no pm.c +pm.c(167) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(178) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(182) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(233) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(270) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(349) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(357) : CC78K0R warning W0401: Conversion may lose significant digits +pm.c(829) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 8 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no i2c_ctr.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no main.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\main.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no magic.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no WDT.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\WDT.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no i2c_mcu.c +i2c_mcu.c(119) : CC78K0R warning W0401: Conversion may lose significant digits +i2c_mcu.c(196) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no i2c_twl.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no led.c +led.c(457) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\led.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no rtc.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\rtc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no vreg_ctr.c +vreg_ctr.c(72) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(128) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(138) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(139) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(141) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(143) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(144) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(146) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_ctr.c(261) : CC78K0R warning W0510: Pointer mismatch in function 'FSL_Init' +Compilation complete, 0 error(s) and 10 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_ctr.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no vreg_twl.c +vreg_twl.c(46) : CC78K0R warning W0401: Conversion may lose significant digits +vreg_twl.c(50) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no adc.c +adc.c(93) : CC78K0R warning W0401: Conversion may lose significant digits +adc.c(255) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\adc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no accero.c +accero.c(110) : CC78K0R warning W0745: Expected function prototype +accero.c(119) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no self_flash.c +self_flash.c(189) : CC78K0R warning W0401: Conversion may lose significant digits +self_flash.c(325) : CC78K0R warning W0411: Illegal pointer combination +self_flash.c(367) : CC78K0R warning W0510: Pointer mismatch in function 'FSL_Init' +Compilation complete, 0 error(s) and 3 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no reboot.c +reboot.c(14) : CC78K0R warning W0915: Asm statement found. skip to jump optimize this function 'my_reboot' +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\reboot.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no sw.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\sw.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no task_debug.c +Compilation complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_debug.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no task_misc.c +task_misc.c(48) : CC78K0R warning W0401: Conversion may lose significant digits +task_misc.c(34) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 2 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_misc.asm +Assembly complete, 0 error(s) and 0 warning(s) found. +"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no task_sys.c +task_sys.c(324) : CC78K0R warning W0401: Conversion may lose significant digits +Compilation complete, 0 error(s) and 1 warning(s) found. +"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_sys.asm +Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -kp -gb6EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.rel Link complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf @@ -13,4 +124,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 0 +Build Total error(s) : 0 Total warning(s) : 35 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 28f8149..5c87e95 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -23,7 +23,7 @@ SubClock=None Count=0 [Main] Geometry=115, 23, 1467, 1110 -Window=Normal +Window=Icon MDI_MAX=OFF Button=ON Mode=Auto @@ -80,8 +80,8 @@ Kanji=SJIS [Source] Geometry=173, 154, 1012, 920 Window=Normal -DispStart=274 -CaretPos=275,0 +DispStart=41 +CaretPos=90,0 Mode=Normal DispFile= Address1= @@ -142,8 +142,8 @@ Accumulative=ON [Assemble] Geometry=605, 2, 600, 400 Window=Normal -DispStart=16374 -CaretPos=16374,27 +DispStart=650 +CaretPos=650,27 Address1= Address2= Address3= @@ -196,7 +196,7 @@ Idtag=OFF Address= DispStart=00007C20 CaretPosData=0, 1986 -CaretPosAscii=0, 1986 +CaretPosAscii=3, 1986 Address1= Address2= Address3= diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 95532a0..407108d 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -138,36 +138,6 @@ Source19=sw.c Source20=task_debug.c Source21=task_misc.c Source22=task_sys.c -[IncFile] -Include1=incs_loader.h -Include2=jhl_defs.h -Include3=user_define.h -Include4=config.h -Include5=bsr_system.h -Include6=renge\renge.h -Include7=renge\renge_defs.h -Include8=renge\renge_task_immediate.h -Include9=vreg_ctr.h -Include10=loader.h -Include11=i2c_mcu.h -Include12=WDT.h -Include13=fsl.h -Include14=fsl_user.h -Include15=i2c_ctr.h -Include16=pm.h -Include17=rtc.h -Include18=adc.h -Include19=led.h -Include20=incs.h -Include21=vreg_twl.h -Include22=accero.h -Include23=i2c_twl_defs.h -Include24=renge\renge_task_intval.h -Include25=i2c_twl.h -Include26=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h -Include27=reboot.h -Include28=sw.h -Include29=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -1034,6 +1004,37 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 +[IncFile] +Include1=incs_loader.h +Include2=jhl_defs.h +Include3=user_define.h +Include4=config.h +Include5=bsr_system.h +Include6=renge\renge.h +Include7=renge\renge_defs.h +Include8=renge\renge_task_immediate.h +Include9=vreg_ctr.h +Include10=loader.h +Include11=i2c_mcu.h +Include12=WDT.h +Include13=fsl.h +Include14=fsl_user.h +Include15=i2c_ctr.h +Include16=pm.h +Include17=rtc.h +Include18=adc.h +Include19=led.h +Include20=incs.h +Include21=vreg_twl.h +Include22=accero.h +Include23=i2c_twl_defs.h +Include24=renge\renge_task_intval.h +Include25=i2c_twl.h +Include26=..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h +Include27=reboot.h +Include28=sw.h +Include29=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h +Include30=batt_params.h [ToolSet] ToolSetName=(変更)78K0R Software Package V1.10 Tool1=CC78K0R|W2.10 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 8bdcbef..9f61e5f 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -7,9 +7,9 @@ FrameCY=1043 OpenFile1=task_sys.c,0,521,328,1765,1085,25,250,25,0 OpenFile2=renge\renge.h,0,502,637,1746,1394,29,16,29,0 OpenFile3=i2c_twl.c,0,31,261,1010,897,25,31,25,0 -OpenFile4=config.h,0,255,3,1234,639,8,17,20,0 -OpenFile5=ProjectWindow +OpenFile4=ProjectWindow PrjPos=0,2,754,3,253 +OpenFile5=config.h,0,255,3,1234,639,0,19,21,0 OpenFile6=OutputWindow OutputPos=0,421,829,388,1497 ActivePRJ=yav_mcu_bsr.prj diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 4577d6e..30d1ec9 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -11,12 +11,13 @@ T=4b445f00 7=rtc.h 8=reboot.h [pm.c] -T=4b60d9da +T=4b6638b8 1=incs.h 2=adc.h 3=led.h 4=pm.h 5=renge\renge.h +6=batt_params.h [i2c_ctr.c] T=4b60e64a 1=incs.h @@ -31,7 +32,7 @@ T=4b57fe0b 6=led.h 7=adc.h [magic.c] -T=4b60e7cc +T=4b663897 1=config.h [WDT.c] T=4afd21ca @@ -72,7 +73,7 @@ T=4b1c8d36 4=vreg_ctr.h 5=renge\renge_task_intval.h [adc.c] -T=4b502014 +T=4b62a102 1=incs.h 2=adc.h 3=pm.h @@ -109,19 +110,19 @@ T=4b4d6c9b 6=pm.h 7=rtc.h [task_debug.c] -T=4b60d9da +T=4b663267 1=incs.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4b595e25 +T=4b663267 1=incs.h 2=renge\renge.h 3=pm.h 4=accero.h [task_sys.c] -T=4b385483 +T=4b663267 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -145,9 +146,9 @@ T=4b25f1a9 T=4b023fdb 1=config.h [user_define.h] -T=4b442a95 +T=4b663267 [config.h] -T=4b60e553 +T=4b663267 [bsr_system.h] T=4b3064de [renge\renge.h] @@ -215,3 +216,5 @@ T=4afd21ca T=4afd21cb [..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h] T=45f12258 +[batt_params.h] +T=4b663897