mirror of
https://github.com/rvtr/ctr_mcu.git
synced 2025-10-31 13:51:10 -04:00
1.0.1B (TWL-PMIC版は全く検証してません)
adc.c 音量が瞬間的に大きくなる対策で割り込み禁止の区間を変更。余り期間を延ばすとTWLが動かなくなるので慎重に batt_params.h 未定義バッテリメーカーのダミー値をそれっぽいものに差し替え pm.c アダプタ接続時、満充電でも充電禁止温度でも強制的に1秒くらい充電ランプを点ける。その状態で抜かれたときローコストにできるだけ速く消灯させる。(アダプタ接続のチェック:修理品&UIのため pm.c 電池少ない割り込み 評価結果がきたので割り込みを入れるのを10%,5%,0%に。それと電圧で残量%の上書き task_sys.c 電池が空っぽの時にアダプタをつないでいても電源が入らなかった。さすがに不親切なので電源は入れさせる。(変えるかも) すぐに電池切れ割り込みが入る。 vreg_ctr.c TWLのステータスレジスタ、CTR側のミラーからかけるようにした。 AGBで困るとのこと git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@190 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
parent
611a0cbf84
commit
e7f6124f7a
16
trunk/adc.c
16
trunk/adc.c
@ -84,7 +84,8 @@ void tsk_adc( )
|
|||||||
static u8 sndvol_codec;
|
static u8 sndvol_codec;
|
||||||
static u8 bt_temp_old;
|
static u8 bt_temp_old;
|
||||||
|
|
||||||
if( task_interval-- != 0 )
|
|
||||||
|
if( task_interval-- != 0 )
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -162,7 +163,7 @@ void tsk_adc( )
|
|||||||
// レジスタから強制セット
|
// レジスタから強制セット
|
||||||
adc_raw_vol = ( vreg_ctr[ VREG_C_VOL_DIGITAL ] * 4 );
|
adc_raw_vol = ( vreg_ctr[ VREG_C_VOL_DIGITAL ] * 4 );
|
||||||
}
|
}
|
||||||
|
// todo debug
|
||||||
if( ( abs( adc_raw_vol - vol_old ) >= 2 ) // 生値でこれくらいずれたら更新(似非ヒステリシス)
|
if( ( abs( adc_raw_vol - vol_old ) >= 2 ) // 生値でこれくらいずれたら更新(似非ヒステリシス)
|
||||||
|| ( --force_update_vol == 0 ) ) // ポーリング
|
|| ( --force_update_vol == 0 ) ) // ポーリング
|
||||||
{
|
{
|
||||||
@ -172,7 +173,7 @@ void tsk_adc( )
|
|||||||
vreg_ctr[ VREG_C_SND_VOL ] = ( vol_old / 4 ); // 64段
|
vreg_ctr[ VREG_C_SND_VOL ] = ( vol_old / 4 ); // 64段
|
||||||
|
|
||||||
// codecに伝える
|
// codecに伝える
|
||||||
iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, slider_to_codec[ vol_old / 4 ] );
|
iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_VOL, slider_to_codec[ ( vol_old / 4 ) & 0x3F ] );
|
||||||
#ifndef _MODEL_CTR_
|
#ifndef _MODEL_CTR_
|
||||||
iic_mcu_write_a_byte( IIC_SLA_DCP, 0, slider_to_codec[ ( 255 - vol_old ) / 4 ] );
|
iic_mcu_write_a_byte( IIC_SLA_DCP, 0, slider_to_codec[ ( 255 - vol_old ) / 4 ] );
|
||||||
#endif
|
#endif
|
||||||
@ -184,8 +185,7 @@ void tsk_adc( )
|
|||||||
// バッテリ識別 ///////////////////////////
|
// バッテリ識別 ///////////////////////////
|
||||||
/* 呼ばれません */
|
/* 呼ばれません */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
ADCEN = 1;
|
ADCEN = 1;
|
||||||
ADM = 0b00001011; // セレクトモード、昇圧、fCLK/6 ///ここから ↓
|
ADM = 0b00001011; // セレクトモード、昇圧、fCLK/6 ///ここから ↓
|
||||||
@ -197,7 +197,6 @@ void tsk_adc( )
|
|||||||
|
|
||||||
ADIF = 0;
|
ADIF = 0;
|
||||||
ADMK = 0;
|
ADMK = 0;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -247,8 +246,6 @@ __interrupt void int_adc( )
|
|||||||
|
|
||||||
adc_data = ADCRH;
|
adc_data = ADCRH;
|
||||||
|
|
||||||
EI();
|
|
||||||
|
|
||||||
switch ( ADS )
|
switch ( ADS )
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@ -259,6 +256,7 @@ case ( ADC_SEL_AMB_BRIT ): //
|
|||||||
|
|
||||||
case ( ADC_SEL_TUNE ):
|
case ( ADC_SEL_TUNE ):
|
||||||
hist_tune[index] = adc_data;
|
hist_tune[index] = adc_data;
|
||||||
|
EI();
|
||||||
#ifdef _MODEL_WM0_
|
#ifdef _MODEL_WM0_
|
||||||
adc_raw_dep = 255 - getmean3( hist_tune );
|
adc_raw_dep = 255 - getmean3( hist_tune );
|
||||||
#else
|
#else
|
||||||
@ -268,6 +266,7 @@ case ( ADC_SEL_AMB_BRIT ): //
|
|||||||
|
|
||||||
case ( ADC_SEL_VOL ):
|
case ( ADC_SEL_VOL ):
|
||||||
hist_snd_vol[index] = adc_data;
|
hist_snd_vol[index] = adc_data;
|
||||||
|
EI();
|
||||||
#ifdef _MODEL_CTR_
|
#ifdef _MODEL_CTR_
|
||||||
if( system_status.model == MODEL_TS_BOARD )
|
if( system_status.model == MODEL_TS_BOARD )
|
||||||
{
|
{
|
||||||
@ -284,6 +283,7 @@ case ( ADC_SEL_AMB_BRIT ): //
|
|||||||
|
|
||||||
case ( ADC_SEL_BATT_TEMP ):
|
case ( ADC_SEL_BATT_TEMP ):
|
||||||
hist_bt_temp[index] = adc_data;
|
hist_bt_temp[index] = adc_data;
|
||||||
|
EI();
|
||||||
raw_adc_temperature = getmean3( hist_bt_temp );
|
raw_adc_temperature = getmean3( hist_bt_temp );
|
||||||
if( (( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_GASGAUGE_ERR ) == 0 ) &&
|
if( (( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_GASGAUGE_ERR ) == 0 ) &&
|
||||||
(( system_status.pwr_state == ON ) ||
|
(( system_status.pwr_state == ON ) ||
|
||||||
|
|||||||
@ -116,12 +116,12 @@ typedef struct _st_bt_comp
|
|||||||
const st_bt_comp BT_COMP[] = {
|
const st_bt_comp BT_COMP[] = {
|
||||||
// rcomp R_co_up R_co_down
|
// rcomp R_co_up R_co_down
|
||||||
{ 135, -256* 0.15, -256* 2.15 }, // maxell
|
{ 135, -256* 0.15, -256* 2.15 }, // maxell
|
||||||
{ 180, 0, 0 }, // dummy
|
{ 135, -256* 0.15, -256* 2.15 }, // dummy
|
||||||
{ 180, 0, 0 }, // dummy
|
{ 135, -256* 0.15, -256* 2.15 }, // dummy
|
||||||
{ 180, 0, 0 }, // dummy
|
{ 135, -256* 0.15, -256* 2.15 }, // dummy
|
||||||
{ 180, 0, 0 }, // dummy
|
{ 171, -256* 0.00, -256* 2.30 }, // dummy
|
||||||
{ 171, -256* 0.00, -256* 2.30 }, // panasonic
|
{ 171, -256* 0.00, -256* 2.30 }, // panasonic
|
||||||
{ 180, 0, 0 } // dummy
|
{ 171, -256* 0.00, -256* 2.30 } // dummy
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -5,9 +5,10 @@
|
|||||||
//#define _FORCE_OFF_1SEC_
|
//#define _FORCE_OFF_1SEC_
|
||||||
//#define _ALLOW_NOBATT_
|
//#define _ALLOW_NOBATT_
|
||||||
//#define _FORCE_INFO_LED_FULLCOLOR_
|
//#define _FORCE_INFO_LED_FULLCOLOR_
|
||||||
|
//#define _debug_bt_irq_
|
||||||
|
|
||||||
#define MCU_VER_MAJOR 0x00
|
#define MCU_VER_MAJOR 0x00
|
||||||
#define MCU_VER_MINOR 0x1A
|
#define MCU_VER_MINOR 0x1B
|
||||||
|
|
||||||
//#define PM_CCIC_TIM
|
//#define PM_CCIC_TIM
|
||||||
|
|
||||||
|
|||||||
37
trunk/pm.c
37
trunk/pm.c
@ -237,9 +237,8 @@ task_status_immed tski_vcom_set( )
|
|||||||
======================================================== */
|
======================================================== */
|
||||||
err PM_sys_pow_on( )
|
err PM_sys_pow_on( )
|
||||||
{
|
{
|
||||||
#ifdef _PMIC_CTR_
|
|
||||||
|
|
||||||
// 電源順次立ち上げ
|
// 電源順次立ち上げ
|
||||||
|
#ifdef _PMIC_CTR_
|
||||||
// PM_reset_ast( ); 不要 PM_LDSW_onまかせ
|
// PM_reset_ast( ); 不要 PM_LDSW_onまかせ
|
||||||
RESET2_ast;
|
RESET2_ast;
|
||||||
FCRAM_RST_ast;
|
FCRAM_RST_ast;
|
||||||
@ -282,7 +281,7 @@ err PM_sys_pow_on( )
|
|||||||
|
|
||||||
wait_ms( 100 );
|
wait_ms( 100 );
|
||||||
#else
|
#else
|
||||||
// TWL PMIC
|
// TWL PMIC //
|
||||||
u8 temp;
|
u8 temp;
|
||||||
|
|
||||||
// 電源投入
|
// 電源投入
|
||||||
@ -620,6 +619,7 @@ void tsk_batt( )
|
|||||||
{
|
{
|
||||||
set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
|
set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
|
||||||
set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_DISC );
|
set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_DISC );
|
||||||
|
chg_led_override = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -985,21 +985,29 @@ void BT_get_left(){
|
|||||||
vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_GASGAUGE_ERR;
|
vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_GASGAUGE_ERR;
|
||||||
bt_chg_ready = 0;
|
bt_chg_ready = 0;
|
||||||
vreg_ctr[ VREG_C_BT_REMAIN ] = 0;
|
vreg_ctr[ VREG_C_BT_REMAIN ] = 0;
|
||||||
|
system_status.cnt_force_off = 1; // 強制電源断フラグ
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if( temp[0] < ( 3100 / 16 / 1.25 ) )
|
vreg_ctr[ VREG_C_BT_VOLTAGE ] = temp[0];
|
||||||
|
|
||||||
|
iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC, 2, temp );
|
||||||
|
vreg_ctr[ VREG_C_BT_REMAIN ] = temp[0];
|
||||||
|
vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = temp[1];
|
||||||
|
|
||||||
|
// モデルゲージと実際との乖離が大きい/電圧がPMICの限界を超えそう
|
||||||
|
if( vreg_ctr[ VREG_C_BT_VOLTAGE ] < V_TH_ZERO )
|
||||||
{
|
{
|
||||||
// 電圧が規定値になってしまったので強制off
|
// 電圧が規定値になってしまったので強制off
|
||||||
vreg_ctr[ VREG_C_BT_REMAIN ] = 0;
|
vreg_ctr[ VREG_C_BT_REMAIN ] = 0;
|
||||||
}
|
}
|
||||||
else
|
else if(( vreg_ctr[ VREG_C_BT_VOLTAGE ] < V_TH_EMPTY ) && ( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_EMPTY ))
|
||||||
{
|
{
|
||||||
// 電圧はまだ大丈夫、電池残量ICとの通信もOK
|
vreg_ctr[ VREG_C_BT_REMAIN ] = BATT_TH_EMPTY;
|
||||||
vreg_ctr[ VREG_C_BT_VOLTAGE ] = temp[0];
|
}
|
||||||
iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC, 2, temp );
|
else if(( vreg_ctr[ VREG_C_BT_VOLTAGE ] < V_TH_LO ) && ( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_LO ))
|
||||||
vreg_ctr[ VREG_C_BT_REMAIN ] = temp[0];
|
{
|
||||||
vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = temp[1];
|
vreg_ctr[ VREG_C_BT_REMAIN ] = BATT_TH_LO;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1021,12 +1029,17 @@ void BT_get_left(){
|
|||||||
}
|
}
|
||||||
if(( vreg_ctr[ VREG_C_BT_REMAIN ] == 0 ) && ( bt_remain_old != 0 ))
|
if(( vreg_ctr[ VREG_C_BT_REMAIN ] == 0 ) && ( bt_remain_old != 0 ))
|
||||||
{
|
{
|
||||||
system_status.cnt_force_off = 1; // 強制電源断フラグ
|
// system_status.cnt_force_off = 1; // 強制電源断フラグ
|
||||||
}
|
}
|
||||||
bt_remain_old = vreg_ctr[ VREG_C_BT_REMAIN ];
|
bt_remain_old = vreg_ctr[ VREG_C_BT_REMAIN ];
|
||||||
|
|
||||||
|
if( system_status.pwr_state == OFF_TRIG )
|
||||||
|
{
|
||||||
|
bt_remain_old = 100;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// PMIC-NTRに電池残量を教えてあげる
|
// PMIC-NTRに電池残量を教えてあげる
|
||||||
iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_BT,
|
iic_mcu_write_a_byte( IIC_SLA_CODEC, CODEC_REG_BT,
|
||||||
( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? 1 : 0 ); // 1で電池切れ
|
( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? 1 : 0 ); // 1で電池切れ
|
||||||
}
|
}
|
||||||
|
|||||||
17
trunk/pm.h
17
trunk/pm.h
@ -6,16 +6,22 @@
|
|||||||
#define IIC_SLA_PMIC 0x84
|
#define IIC_SLA_PMIC 0x84
|
||||||
#define IIC_SLA_BT_GAUGE 0x6C
|
#define IIC_SLA_BT_GAUGE 0x6C
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define BATT_TH_LO 8
|
|
||||||
#define BATT_TH_EMPTY 3
|
|
||||||
|
|
||||||
#define VCOM_DEFAULT_T 92
|
#define VCOM_DEFAULT_T 92
|
||||||
#define VCOM_DEFAULT_B 95
|
#define VCOM_DEFAULT_B 95
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#define BATT_TH_LO 10
|
||||||
|
#define BATT_TH_EMPTY 5
|
||||||
|
|
||||||
|
|
||||||
|
#define V_K 16 / 1.25
|
||||||
|
#define V_TH_LO (u8)( 3200 / V_K )
|
||||||
|
#define V_TH_EMPTY (u8)( 3150 / V_K )
|
||||||
|
#define V_TH_ZERO (u8)( 3100 / V_K )
|
||||||
|
|
||||||
|
|
||||||
//=========================================================
|
//=========================================================
|
||||||
#define LED_CHARGE P2.4
|
#define LED_CHARGE P2.4
|
||||||
|
|
||||||
@ -63,6 +69,7 @@ typedef enum BT_VENDER
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//=========================================================
|
//=========================================================
|
||||||
// CODEC上のPMIC互換レジスタ
|
// CODEC上のPMIC互換レジスタ
|
||||||
#define CODEC_REG_PM 0x10
|
#define CODEC_REG_PM 0x10
|
||||||
|
|||||||
@ -176,7 +176,5 @@ void rtc_unlock( )
|
|||||||
======================================================== */
|
======================================================== */
|
||||||
__interrupt void int_rtc_int( )
|
__interrupt void int_rtc_int( )
|
||||||
{
|
{
|
||||||
DBG_LED_on;
|
|
||||||
renge_flg_interval += 1; // インクリメント/デクリメント命令を使うので DI()不要
|
renge_flg_interval += 1; // インクリメント/デクリメント命令を使うので DI()不要
|
||||||
DBG_LED_off;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -97,8 +97,10 @@ void tsk_sys( )
|
|||||||
|
|
||||||
// 残量チェック
|
// 残量チェック
|
||||||
BT_get_left(); // 先に、BT_init()が実行されている必要があります。
|
BT_get_left(); // 先に、BT_init()が実行されている必要があります。
|
||||||
if( vreg_ctr[VREG_C_BT_REMAIN] < 1 )
|
if(( vreg_ctr[VREG_C_BT_REMAIN] < 1 ) &&
|
||||||
|
( vreg_ctr[VREG_C_BT_VOLTAGE] < ( 3300 / 16 / 1.25 ) ))
|
||||||
{
|
{
|
||||||
|
// 電池が少ないので起動させない(電圧チェックもされてる)
|
||||||
renge_task_interval_run_force = 1;
|
renge_task_interval_run_force = 1;
|
||||||
system_status.pwr_state = OFF_TRIG;
|
system_status.pwr_state = OFF_TRIG;
|
||||||
return;
|
return;
|
||||||
|
|||||||
@ -92,7 +92,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
|
|||||||
{
|
{
|
||||||
|
|
||||||
case ( VREG_C_MCU_STATUS ):
|
case ( VREG_C_MCU_STATUS ):
|
||||||
// vreg_twl[ REG_TWL_INT_ADRS_MODE ] = (u8)( ( data >> 6 ) & 0x03 );
|
vreg_twl[ REG_TWL_INT_ADRS_MODE ] = (u8)( ( data >> 6 ) & 0x03 );
|
||||||
vreg_ctr[ VREG_C_MCU_STATUS ] = data;
|
vreg_ctr[ VREG_C_MCU_STATUS ] = data;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|||||||
@ -3,16 +3,6 @@ C:\WINDOWS\system32\cmd.exe /c touch magic.c
|
|||||||
Compilation complete, 0 error(s) and 0 warning(s) found.
|
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
|
"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.
|
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 -qvjl2w -sainter_asm -zpb -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 -qvjl2w -sainter_asm -zpb -no renge\renge.c
|
|
||||||
renge\renge.c(149) : CC78K0R warning W0411: Illegal pointer combination
|
|
||||||
renge\renge.c(157) : CC78K0R warning W0412: Illegal pointer combination in conditional expression
|
|
||||||
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\renge.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 -gb7EFBFFh -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 led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel
|
"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 -gb7EFBFFh -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 led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel
|
||||||
Link complete, 0 error(s) and 0 warning(s) found.
|
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
|
"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
|
||||||
@ -23,4 +13,4 @@ intel-HEX to bsr bin converter
|
|||||||
file converted!
|
file converted!
|
||||||
|
|
||||||
|
|
||||||
Build Total error(s) : 0 Total warning(s) : 2
|
Build Total error(s) : 0 Total warning(s) : 0
|
||||||
|
|||||||
@ -78,9 +78,9 @@ Symbol Type=OFF
|
|||||||
Language=C
|
Language=C
|
||||||
Kanji=SJIS
|
Kanji=SJIS
|
||||||
[Source]
|
[Source]
|
||||||
Geometry=71, 28, 844, 790
|
Geometry=81, 63, 844, 790
|
||||||
Window=Normal
|
Window=Normal
|
||||||
DispStart=269
|
DispStart=267
|
||||||
CaretPos=319,0
|
CaretPos=319,0
|
||||||
Mode=Normal
|
Mode=Normal
|
||||||
DispFile=
|
DispFile=
|
||||||
@ -139,6 +139,30 @@ SaveRange=Screen
|
|||||||
SaveStart=
|
SaveStart=
|
||||||
SaveEnd=
|
SaveEnd=
|
||||||
Accumulative=ON
|
Accumulative=ON
|
||||||
|
[Source1]
|
||||||
|
Geometry=0, 0, 844, 790
|
||||||
|
Window=Normal
|
||||||
|
DispStart=945
|
||||||
|
CaretPos=946,0
|
||||||
|
Mode=Normal
|
||||||
|
DispFile=pm.c
|
||||||
|
Accumulative=ON
|
||||||
|
[Source2]
|
||||||
|
Geometry=25, 25, 844, 790
|
||||||
|
Window=Normal
|
||||||
|
DispStart=1
|
||||||
|
CaretPos=1,0
|
||||||
|
Mode=Normal
|
||||||
|
DispFile=task_misc.c
|
||||||
|
Accumulative=ON
|
||||||
|
[Source3]
|
||||||
|
Geometry=50, 50, 844, 790
|
||||||
|
Window=Normal
|
||||||
|
DispStart=351
|
||||||
|
CaretPos=352,0
|
||||||
|
Mode=Normal
|
||||||
|
DispFile=task_sys.c
|
||||||
|
Accumulative=ON
|
||||||
[Assemble]
|
[Assemble]
|
||||||
Geometry=282, 92, 968, 626
|
Geometry=282, 92, 968, 626
|
||||||
Window=Normal
|
Window=Normal
|
||||||
@ -968,44 +992,55 @@ Boundary=18088086
|
|||||||
5=.pmk4,P,S,A,+,1
|
5=.pmk4,P,S,A,+,1
|
||||||
6=.chg_led_override,P,N,A,+,1
|
6=.chg_led_override,P,N,A,+,1
|
||||||
7=.p4.3,P,S,A,+,1
|
7=.p4.3,P,S,A,+,1
|
||||||
8=.system_status,.,N,A,+,1
|
8=.PM0.0,P,S,A,+,1
|
||||||
9=.battery_manufacturer,P,N,A,+,1
|
9=.P0.0,P,S,A,+,1
|
||||||
10=.bt_comp,.,N,A,+,1
|
10=.system_status,.,N,A,+,1
|
||||||
11=.raw_adc_temperature,P,N,A,+,1
|
11=.battery_manufacturer,P,N,A,+,1
|
||||||
12=.PM1.7,P,S,A,+,1
|
12=.bt_comp,.,N,A,+,1
|
||||||
13=.P1.7,P,S,A,+,1
|
13=.raw_adc_temperature,P,N,A,+,1
|
||||||
14=.bt_comp,.,N,A,+,1
|
14=.PM1.7,P,S,A,+,1
|
||||||
15=.tasks_immed,P,N,A,+,1
|
15=.P1.7,P,S,A,+,1
|
||||||
16=.vreg_ctr[2],P,N,A,+,1
|
16=.bt_comp,.,N,A,+,1
|
||||||
17=.vreg_twl[3],P,N,A,+,1
|
17=.tasks_immed,P,N,A,+,1
|
||||||
18=.cnt_force_off,P,N,A,+,1
|
18=.vreg_ctr[2],P,N,A,+,1
|
||||||
19=.pool.vreg_c_ext,.,N,A,+,1
|
19=.vreg_twl[3],P,N,A,+,1
|
||||||
20=.p_record,P,N,A,+,1
|
20=.cnt_force_off,P,N,A,+,1
|
||||||
21=.temp_hours,P,N,A,+,1
|
21=.pool.vreg_c_ext,.,N,A,+,1
|
||||||
22=.temp,D,N,A,+,1
|
22=.p_record,P,N,A,+,1
|
||||||
Line=23
|
23=.temp_hours,P,N,A,+,1
|
||||||
|
24=.temp,P,N,A,+,1
|
||||||
|
25=.bt_remain_old,P,N,A,+,1
|
||||||
|
Line=26
|
||||||
[Quick Watch]
|
[Quick Watch]
|
||||||
0=battery_manufacturer,P,A,1
|
0=system_status,P,A,1
|
||||||
1=bt_comp,P,A,1
|
1=vreg_ctr[11],P,A,1
|
||||||
2=systemstatus,P,A,1
|
2=chg_led_override,P,A,1
|
||||||
3=system_status,P,A,1
|
3=temp_zone_charge_enable,P,A,1
|
||||||
4=vreg_ctr[11],P,A,1
|
4=bt_chg_ready,P,A,1
|
||||||
5=bt_remain_old,P,A,1
|
5=pmk04,P,A,1
|
||||||
6=chg_led_override,P,A,1
|
6=pmk4,P,A,1
|
||||||
7=temp_zone_charge_enable,P,A,1
|
7=pif4,P,A,1
|
||||||
8=bt_chg_ready,P,A,1
|
8=egn0,P,A,1
|
||||||
9=pmk04,P,A,1
|
9=p4.3,P,A,1
|
||||||
10=pmk4,P,A,1
|
10=vreg_ctr,P,A,1
|
||||||
11=pif4,P,A,1
|
11=bt_relax_timer,P,A,1
|
||||||
12=egn0,P,A,1
|
12=temp,P,A,1
|
||||||
13=p4.3,P,A,1
|
13=P0.0,P,A,1
|
||||||
14=vreg_ctr,P,A,1
|
14=PM0.0,P,A,1
|
||||||
15=bt_relax_timer,P,A,1
|
15=bt_remain_old,P,A,1
|
||||||
[Software Break]
|
[Software Break]
|
||||||
Geometry=408, 387, 756, 532
|
Geometry=408, 387, 756, 532
|
||||||
Window=Normal
|
Window=Normal
|
||||||
Width=150 30 200 100
|
Width=150 30 200 100
|
||||||
Count=0
|
Name0=Swb00002
|
||||||
|
Address0=pm.c#_BT_get_left+0x56
|
||||||
|
Window0=ASM
|
||||||
|
Status0=ON
|
||||||
|
Name1=Swb00003
|
||||||
|
Address1=task_sys.c#_chk_emergencyExit+0x0
|
||||||
|
Window1=ASM
|
||||||
|
Status1=ON
|
||||||
|
Count=2
|
||||||
[Reset]
|
[Reset]
|
||||||
Debugger=ON
|
Debugger=ON
|
||||||
Symbol=OFF
|
Symbol=OFF
|
||||||
|
|||||||
@ -4,11 +4,17 @@ FrameX=68
|
|||||||
FrameY=16
|
FrameY=16
|
||||||
FrameCX=1299
|
FrameCX=1299
|
||||||
FrameCY=1044
|
FrameCY=1044
|
||||||
OpenFile1=OutputWindow
|
OpenFile1=bsr_system.h,0,37,276,1281,1033,0,23,0,0
|
||||||
OutputPos=0,44,989,1000,1587
|
OpenFile2=renge\renge_defs.h,0,132,132,1376,889,25,15,25,0
|
||||||
OpenFile2=pm.c,0,176,176,1420,933,0,1036,0,0
|
OpenFile3=renge\\..\jhl_defs.h,0,411,261,1655,1018,10,14,18,0
|
||||||
OpenFile3=ProjectWindow
|
OpenFile4=ProjectWindow
|
||||||
PrjPos=0,2,754,3,253
|
PrjPos=0,2,754,3,253
|
||||||
|
OpenFile5=renge\renge.c,0,198,198,1442,955,0,27,0,0
|
||||||
|
OpenFile6=user_define.h,0,242,242,1486,999,0,1,0,0
|
||||||
|
OpenFile7=pm.c,0,264,264,1508,1021,0,1021,25,0
|
||||||
|
OpenFile8=config.h,0,154,154,1398,911,29,11,0,0
|
||||||
|
OpenFile9=OutputWindow
|
||||||
|
OutputPos=0,44,989,1000,1587
|
||||||
ActivePRJ=yav_mcu_bsr.prj
|
ActivePRJ=yav_mcu_bsr.prj
|
||||||
[ProjectWindow]
|
[ProjectWindow]
|
||||||
ProjectWindowDispType=0
|
ProjectWindowDispType=0
|
||||||
|
|||||||
@ -11,7 +11,7 @@ T=4c04abbf
|
|||||||
7=rtc.h
|
7=rtc.h
|
||||||
8=reboot.h
|
8=reboot.h
|
||||||
[pm.c]
|
[pm.c]
|
||||||
T=4c061888
|
T=4c0e00b6
|
||||||
1=incs.h
|
1=incs.h
|
||||||
2=adc.h
|
2=adc.h
|
||||||
3=led.h
|
3=led.h
|
||||||
@ -21,11 +21,11 @@ T=4c061888
|
|||||||
7=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
|
7=..\..\..\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r\fsl.h
|
||||||
8=fsl_user.h
|
8=fsl_user.h
|
||||||
[i2c_ctr.c]
|
[i2c_ctr.c]
|
||||||
T=4bfdf8cd
|
T=4c072cf1
|
||||||
1=config.h
|
1=config.h
|
||||||
2=incs.h
|
2=incs.h
|
||||||
[main.c]
|
[main.c]
|
||||||
T=4c04d673
|
T=4c0cd4a6
|
||||||
1=incs_loader.h
|
1=incs_loader.h
|
||||||
2=WDT.h
|
2=WDT.h
|
||||||
3=rtc.h
|
3=rtc.h
|
||||||
@ -35,7 +35,7 @@ T=4c04d673
|
|||||||
7=adc.h
|
7=adc.h
|
||||||
8=pool.h
|
8=pool.h
|
||||||
[magic.c]
|
[magic.c]
|
||||||
T=4c061856
|
T=4c0e07ec
|
||||||
1=config.h
|
1=config.h
|
||||||
[WDT.c]
|
[WDT.c]
|
||||||
T=4bf0d1e1
|
T=4bf0d1e1
|
||||||
@ -51,14 +51,14 @@ T=4bfd0d14
|
|||||||
3=i2c_twl_defs.h
|
3=i2c_twl_defs.h
|
||||||
4=i2c_twl.h
|
4=i2c_twl.h
|
||||||
[led.c]
|
[led.c]
|
||||||
T=4bfc790f
|
T=4c07087d
|
||||||
1=incs.h
|
1=incs.h
|
||||||
2=led.h
|
2=led.h
|
||||||
[rtc.c]
|
[rtc.c]
|
||||||
T=4c05e92b
|
T=4c0cd30b
|
||||||
1=incs.h
|
1=incs.h
|
||||||
[vreg_ctr.c]
|
[vreg_ctr.c]
|
||||||
T=4c036041
|
T=4c0dfc0d
|
||||||
1=incs.h
|
1=incs.h
|
||||||
2=vreg_ctr.h
|
2=vreg_ctr.h
|
||||||
3=rtc.h
|
3=rtc.h
|
||||||
@ -76,13 +76,13 @@ T=4bfcc957
|
|||||||
4=vreg_twl.h
|
4=vreg_twl.h
|
||||||
5=vreg_ctr.h
|
5=vreg_ctr.h
|
||||||
[adc.c]
|
[adc.c]
|
||||||
T=4c04ade6
|
T=4c0e0183
|
||||||
1=incs.h
|
1=incs.h
|
||||||
2=adc.h
|
2=adc.h
|
||||||
3=pm.h
|
3=pm.h
|
||||||
4=led.h
|
4=led.h
|
||||||
[renge\renge.c]
|
[renge\renge.c]
|
||||||
T=4c04d6fe
|
T=4c076060
|
||||||
1=renge\renge.h
|
1=renge\renge.h
|
||||||
2=renge\renge_task_intval.h
|
2=renge\renge_task_intval.h
|
||||||
3=renge\renge_task_immediate.h
|
3=renge\renge_task_immediate.h
|
||||||
@ -91,7 +91,7 @@ T=4c04d6fe
|
|||||||
6=user_define.h
|
6=user_define.h
|
||||||
7=bsr_system.h
|
7=bsr_system.h
|
||||||
[accero.c]
|
[accero.c]
|
||||||
T=4bfd0c27
|
T=4c073982
|
||||||
1=config.h
|
1=config.h
|
||||||
2=incs.h
|
2=incs.h
|
||||||
3=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
|
3=..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h
|
||||||
@ -126,7 +126,7 @@ T=4bfb53e4
|
|||||||
6=i2c_mcu.h
|
6=i2c_mcu.h
|
||||||
7=led.h
|
7=led.h
|
||||||
[task_sys.c]
|
[task_sys.c]
|
||||||
T=4c0604c3
|
T=4c0dc8dc
|
||||||
1=incs.h
|
1=incs.h
|
||||||
2=i2c_twl.h
|
2=i2c_twl.h
|
||||||
3=i2c_ctr.h
|
3=i2c_ctr.h
|
||||||
@ -168,32 +168,32 @@ T=4bf0d1e1
|
|||||||
8=i2c_mcu.h
|
8=i2c_mcu.h
|
||||||
9=WDT.h
|
9=WDT.h
|
||||||
[jhl_defs.h]
|
[jhl_defs.h]
|
||||||
T=4bf0d1e0
|
T=4c075832
|
||||||
1=config.h
|
1=config.h
|
||||||
[config.h]
|
[config.h]
|
||||||
T=4c05fd8e
|
T=4c0dfdcf
|
||||||
[user_define.h]
|
[user_define.h]
|
||||||
T=4c03603c
|
T=4c03603c
|
||||||
[bsr_system.h]
|
[bsr_system.h]
|
||||||
T=4c060112
|
T=4c072dc9
|
||||||
[renge\renge.h]
|
[renge\renge.h]
|
||||||
T=4bfdd9d2
|
T=4c0758e3
|
||||||
1=renge\renge_defs.h
|
1=renge\renge_defs.h
|
||||||
2=renge\renge_task_immediate.h
|
2=renge\renge_task_immediate.h
|
||||||
[renge\renge_defs.h]
|
[renge\renge_defs.h]
|
||||||
T=4bf0d1e0
|
T=4c073c5a
|
||||||
[renge\renge_task_immediate.h]
|
[renge\renge_task_immediate.h]
|
||||||
T=4bf0d1e0
|
T=4bf0d1e0
|
||||||
1=renge\renge_defs.h
|
1=renge\renge_defs.h
|
||||||
[vreg_ctr.h]
|
[vreg_ctr.h]
|
||||||
T=4bfc6650
|
T=4c072cf1
|
||||||
1=config.h
|
1=config.h
|
||||||
[vreg_twl.h]
|
[vreg_twl.h]
|
||||||
T=4bfa0ef0
|
T=4c072cf1
|
||||||
[loader.h]
|
[loader.h]
|
||||||
T=4bf0d1e0
|
T=4bf0d1e0
|
||||||
[i2c_mcu.h]
|
[i2c_mcu.h]
|
||||||
T=4bf0d1e0
|
T=4c0769e1
|
||||||
[WDT.h]
|
[WDT.h]
|
||||||
T=4bf0d1e1
|
T=4bf0d1e1
|
||||||
[fsl.h]
|
[fsl.h]
|
||||||
@ -203,13 +203,13 @@ T=4bf0d1e0
|
|||||||
[i2c_ctr.h]
|
[i2c_ctr.h]
|
||||||
T=4bf0d1e1
|
T=4bf0d1e1
|
||||||
[pm.h]
|
[pm.h]
|
||||||
T=4c05daea
|
T=4c072cf1
|
||||||
[rtc.h]
|
[rtc.h]
|
||||||
T=4bf0d1e1
|
T=4bf0d1e1
|
||||||
[reboot.h]
|
[reboot.h]
|
||||||
T=4bf0d1e1
|
T=4bf0d1e1
|
||||||
[incs.h]
|
[incs.h]
|
||||||
T=4bf6286a
|
T=4c072fc8
|
||||||
1=jhl_defs.h
|
1=jhl_defs.h
|
||||||
2=user_define.h
|
2=user_define.h
|
||||||
3=bsr_system.h
|
3=bsr_system.h
|
||||||
@ -233,23 +233,23 @@ T=4bfd1372
|
|||||||
T=4bf0d1e1
|
T=4bf0d1e1
|
||||||
1=jhl_defs.h
|
1=jhl_defs.h
|
||||||
[led.h]
|
[led.h]
|
||||||
T=4bfb6dbf
|
T=4c072cf1
|
||||||
[batt_params.h]
|
[batt_params.h]
|
||||||
T=4bff23c6
|
T=4c072cf1
|
||||||
[i2c_twl_defs.h]
|
[i2c_twl_defs.h]
|
||||||
T=4bf0d1e1
|
T=4bf0d1e1
|
||||||
[renge\renge_task_intval.h]
|
[renge\renge_task_intval.h]
|
||||||
T=4bf0d1e0
|
T=4c072cf1
|
||||||
1=renge\renge_defs.h
|
1=renge\renge_defs.h
|
||||||
[i2c_twl.h]
|
[i2c_twl.h]
|
||||||
T=4bf4e29e
|
T=4bf4e29e
|
||||||
[sw.h]
|
[sw.h]
|
||||||
T=4bfcbc5b
|
T=4c070c1a
|
||||||
1=config.h
|
1=config.h
|
||||||
[self_flash.h]
|
[self_flash.h]
|
||||||
T=4bf0d1e0
|
T=4bf0d1e0
|
||||||
[pool.h]
|
[pool.h]
|
||||||
T=4c05e88c
|
T=4c072cf1
|
||||||
1=pedometer.h
|
1=pedometer.h
|
||||||
[pedo_lpf_coeff.h]
|
[pedo_lpf_coeff.h]
|
||||||
T=4bf0d1e1
|
T=4bf0d1e1
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user