rvtr/ctr_mcu
1
Fork 0
mirror of https://github.com/rvtr/ctr_mcu.git synced 2025-10-31 13:51:10 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

■2.13 2.10(2nup)用にコミットしたが、加速度センサをonにするだけで歩数計がonになってしまったのを修正(エンバグ)

Browse Source 
I2Cのタイミングレジスタを微修正
status.chgの更新をtask_miscからtask_battへ移動
SPFL向け機能のマージ
　パナバッテリパラメータをマージ
　アモルファスLCD制御追加
コメントの追加



git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@424 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2011-11-24 00:52:13 +00:00
parent cc42774fda
commit 81182d5688
17 changed files with 1452 additions and 1476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trunk/accero.c
View File

@ -135,8 +135,9 @@ task_status_immed tski_cbk_accero( )
iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), ACC_RAW_DATA_SIZE, temp );
}
}
if(( system_status.pwr_state == ON )
||( system_status.pwr_state == SLEEP )
if( (( system_status.pwr_state == ON )
||( system_status.pwr_state == SLEEP ))
&&( ( vreg_ctr[VREG_C_ACC_CONFIG] & VREG_BITMASK_ACC_CONF_HOSU ) != 0 )
)
{
pedometer(); // •ŕ<E280A2>”Śv

7
trunk/adc.c
View File

@ -284,20 +284,17 @@ __interrupt void int_adc( )
switch ( ADS )
{
/*
case ( ADC_SEL_AMB_BRIT ):
// 環境明るさ //
case ( ADC_SEL_AMB_BRIT ): // 環境明るさ
vreg_ctr[ VREG_C_AMBIENT_BRIGHTNESS ] = adc_data;
break;
*/
case ( ADC_SEL_3D ):
// 3Dボリューム //
EI();
adc_raw_dep = adc_data;
break;
case ( ADC_SEL_VOL ):
// 音量スライダ //
EI();
if( system_status.model == MODEL_TS_BOARD )
{
@ -311,7 +308,6 @@ __interrupt void int_adc( )
break;
case ( ADC_SEL_BATT_TEMP ):
// バッテリ温度 //
EI();
#ifdef _ENABLE_HAL_
if( vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] == 0xFF ) // HAL無効
@ -338,7 +334,6 @@ __interrupt void int_adc( )
/* 呼ばれません
case ( ADC_SEL_BATT_DET ):
// バッテリメーカー識別 //
break;
*/
}

26
trunk/batt_params.c
View File

@ -66,22 +66,22 @@ const bt_param_ bt_param[ _BT_PARAM_NUM_ ] =
{ 0xF5, 0xF3 }
},
// BT_PARAM_SPFL_PANA
// BT_PARAM_SPFL_PANA !!dummy!!
{
{
0x9C, 0xF0, 0xAD, 0x50, 0xAF, 0xB0, 0xB3, 0x00,
0xB3, 0xE0, 0XB5, 0x60, 0XB6, 0x70, 0xB7, 0xA0,
0xBA, 0x00, 0xBC, 0x00, 0xBE, 0x90, 0xC1, 0x60,
0xC4, 0x00, 0xC7, 0x00, 0xCC, 0xA0, 0xD0, 0xA0,
0x02, 0x00, 0x19, 0x10, 0x12, 0x00, 0x48, 0x10,
0x25, 0x10, 0x41, 0xF0, 0x2F, 0xA0, 0x13, 0xF0,
0x1C, 0xD0, 0x10, 0xD0, 0x0F, 0xA0, 0x11, 0x00,
0x10, 0xE0, 0x0C, 0x10, 0x0C, 0x00, 0x0C, 0x00
0x8C, 0x30, 0x9C, 0x10, 0xA5, 0xE0, 0xB0, 0x40,
0xB1, 0xC0, 0xB2, 0x00, 0xB2, 0x50, 0xB3, 0x10,
0xB4, 0x90, 0xB6, 0x20, 0xB8, 0x60, 0xBA, 0x50,
0xBF, 0xA0, 0xC6, 0xB0, 0xCE, 0x90, 0xD0, 0x20,
0x00, 0x20, 0x00, 0x20, 0x00, 0x20, 0x00, 0x20,
0x7B, 0x30, 0x68, 0x60, 0x20, 0x00, 0x17, 0x00,
0x17, 0x30, 0x12, 0xF0, 0x0D, 0xE0, 0x07, 0xF0,
0x07, 0x00, 0x09, 0x30, 0x01, 0xC0, 0x01, 0xC0
},
2,
{ 113, (u8)(-256* 0.30), (u8)(-256* 2.25) },
0xDAA0,
{ 0xE5, 0xE7 },
1,
{ 171, (u8)(-256* 1.00), (u8)(-256* 2.60) },
0xDA20,
{ 0x69, 0x67 },
}
};

1884
trunk/bsr.hex
View File

File diff suppressed because it is too large Load Diff

BIN
trunk/bsr.lmf
View File

Binary file not shown.

744
trunk/bsr_k0r.map
View File

@ -1,22 +1,22 @@
78K0R Linker W1.33 Date: 4 Oct 2011 Page: 1
78K0R Linker W1.33 Date:24 Nov 2011 Page: 1
Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff -
obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C
C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr
_k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro
nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r
m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T
ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel pm
.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_t
wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng
e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi
sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_
status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel vo
ltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_e
i.rel util_funcs.rel
obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool
s\CC78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -p
bsr_k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Elec
tronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bc
l0rm.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronic
s Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel
pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2
c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel r
enge.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 ta
sk_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel
voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel ge
t_ei.rel util_funcs.rel
Para-file:
Out-file: bsr.lmf
Map-file: bsr_k0r.map
@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr
*** Link information ***
72 output segment(s)
3D12H byte(s) real data
6094 symbol(s) defined
3CEDH byte(s) real data
6152 symbol(s) defined
*** Memory map ***
@ -150,55 +150,55 @@ Direc-file:bsr_mcu.dr
LDR_CODL util_funcs
000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG
LDR_CODE 000CEH 00902H CSEG
LDR_CODE loader 000CEH 00178H
LDR_CODE WDT 00246H 00000H
LDR_CODE i2c_mcu 00246H 002D9H
LDR_CODE 000CEH 00935H CSEG
LDR_CODE loader 000CEH 00177H
LDR_CODE WDT 00245H 00000H
LDR_CODE i2c_mcu 00245H 002D9H
LDR_CODE self_flash
0051FH 00370H
0051EH 00370H
LDR_CODE task_debug
0088FH 00000H
0088EH 00000H
LDR_CODE task_status
0088FH 00041H
LDR_CODE hal 008D0H 000DCH
0088EH 00075H
LDR_CODE hal 00903H 000DCH
LDR_CODE util_funcs
009ACH 00024H
FSL_CODE 009D0H 00322H CSEG
009DFH 00024H
FSL_CODE 00A03H 00322H CSEG
FSL_CODE fsl_block_cmd
009D0H 0002BH
00A03H 0002BH
FSL_CODE fsl_block_check
009FBH 00013H
00A2EH 00013H
FSL_CODE fsl_common
00A0EH 0014FH
00A41H 0014FH
FSL_CODE fsl_reset
00B5DH 00001H
00B90H 00001H
FSL_CODE fsl_si_ibf
00B5EH 00064H
00B91H 00064H
FSL_CODE fsl_phySwap
00BC2H 0004DH
00BF5H 0004DH
FSL_CODE fsl_si_common
00C0FH 00061H
FSL_CODE fsl_swap 00C70H 00030H
00C42H 00061H
FSL_CODE fsl_swap 00CA3H 00030H
FSL_CODE fsl_write
00CA0H 00052H
@@LCODE 00CF2H 00277H CSEG
@@LCODE @cstart 00CF2H 0006DH
@@LCODE @imul 00D5FH 00011H
@@LCODE @lumul 00D70H 0002BH
@@LCODE @isdiv 00D9BH 00022H
@@LCODE @iudiv 00DBDH 0002DH
@@LCODE @isrem 00DEAH 00021H
@@LCODE @iurem 00E0BH 0002FH
@@LCODE @lsdiv 00E3AH 00039H
@@LCODE @ludiv 00E73H 0003FH
@@LCODE @divuw 00EB2H 00034H
@@LCODE @ladd 00EE6H 0000FH
@@LCODE @llsh 00EF5H 0001BH
@@LCODE @lursh 00F10H 0001FH
@@LCODE @iscmp 00F2FH 0000CH
@@LCODE @lband 00F3BH 00014H
@@LCODE @bcdtob 00F4FH 0001AH
* gap * 00F69H 0008DH
00CD3H 00052H
@@LCODE 00D25H 00277H CSEG
@@LCODE @cstart 00D25H 0006DH
@@LCODE @imul 00D92H 00011H
@@LCODE @lumul 00DA3H 0002BH
@@LCODE @isdiv 00DCEH 00022H
@@LCODE @iudiv 00DF0H 0002DH
@@LCODE @isrem 00E1DH 00021H
@@LCODE @iurem 00E3EH 0002FH
@@LCODE @lsdiv 00E6DH 00039H
@@LCODE @ludiv 00EA6H 0003FH
@@LCODE @divuw 00EE5H 00034H
@@LCODE @ladd 00F19H 0000FH
@@LCODE @llsh 00F28H 0001BH
@@LCODE @lursh 00F43H 0001FH
@@LCODE @iscmp 00F62H 0000CH
@@LCODE @lband 00F6EH 00014H
@@LCODE @bcdtob 00F82H 0001AH
* gap * 00F9CH 0005AH
MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH
@ -250,288 +250,288 @@ Direc-file:bsr_mcu.dr
0228CH 00000H
@@CNST util_funcs
0228CH 00000H
ROM_CODE 0228CH 0250BH CSEG
ROM_CODE pm 0228CH 009C8H
ROM_CODE i2c_ctr 02C54H 0005CH
ROM_CODE main 02CB0H 00055H
ROM_CODE i2c_twl 02D05H 00062H
ROM_CODE led 02D67H 0024FH
ROM_CODE rtc 02FB6H 000E0H
ROM_CODE vreg_ctr 03096H 0047DH
ROM_CODE vreg_twl 03513H 000F9H
ROM_CODE adc 0360CH 00261H
ROM_CODE renge 0386DH 00018H
ROM_CODE accero 03885H 0014DH
ROM_CODE sw 039D2H 00126H
ROM_CODE 0228CH 024B5H CSEG
ROM_CODE pm 0228CH 0098DH
ROM_CODE i2c_ctr 02C19H 0005CH
ROM_CODE main 02C75H 00055H
ROM_CODE i2c_twl 02CCAH 0005EH
ROM_CODE led 02D28H 0024FH
ROM_CODE rtc 02F77H 000E0H
ROM_CODE vreg_ctr 03057H 0047DH
ROM_CODE vreg_twl 034D4H 000F9H
ROM_CODE adc 035CDH 00261H
ROM_CODE renge 0382EH 00018H
ROM_CODE accero 03846H 00155H
ROM_CODE sw 0399BH 00126H
ROM_CODE task_misc
03AF8H 00204H
ROM_CODE task_sys 03CFCH 00381H
03AC1H 001E5H
ROM_CODE task_sys 03CA6H 00381H
ROM_CODE pedo_alg_thre_det2
0407DH 004D4H
ROM_CODE led_cam 04551H 000C4H
ROM_CODE led_pow 04615H 0016FH
ROM_CODE voltable 04784H 00000H
04027H 004D4H
ROM_CODE led_cam 044FBH 000C4H
ROM_CODE led_pow 045BFH 0016FH
ROM_CODE voltable 0472EH 00000H
ROM_CODE pedo_lpf_coeff
04784H 00000H
0472EH 00000H
ROM_CODE kanaria_c
04784H 00006H
ROM_CODE get_ei 0478AH 0000DH
@@BASE 04797H 00614H CSEG BASE
@@BASE loader 04797H 00000H
@@BASE pm 04797H 0003EH
@@BASE i2c_ctr 047D5H 00170H
@@BASE main 04945H 00000H
@@BASE magic 04945H 00000H
@@BASE WDT 04945H 00000H
@@BASE i2c_mcu 04945H 000F2H
@@BASE i2c_twl 04A37H 000D0H
@@BASE led 04B07H 00000H
@@BASE rtc 04B07H 0005DH
@@BASE vreg_ctr 04B64H 00000H
@@BASE vreg_twl 04B64H 00000H
@@BASE adc 04B64H 00094H
@@BASE renge 04BF8H 0016BH
@@BASE accero 04D63H 00042H
0472EH 00006H
ROM_CODE get_ei 04734H 0000DH
@@BASE 04741H 00614H CSEG BASE
@@BASE loader 04741H 00000H
@@BASE pm 04741H 0003EH
@@BASE i2c_ctr 0477FH 00170H
@@BASE main 048EFH 00000H
@@BASE magic 048EFH 00000H
@@BASE WDT 048EFH 00000H
@@BASE i2c_mcu 048EFH 000F2H
@@BASE i2c_twl 049E1H 000D0H
@@BASE led 04AB1H 00000H
@@BASE rtc 04AB1H 0005DH
@@BASE vreg_ctr 04B0EH 00000H
@@BASE vreg_twl 04B0EH 00000H
@@BASE adc 04B0EH 00094H
@@BASE renge 04BA2H 0016BH
@@BASE accero 04D0DH 00042H
@@BASE self_flash
04DA5H 00000H
@@BASE sw 04DA5H 00000H
04D4FH 00000H
@@BASE sw 04D4FH 00000H
@@BASE task_debug
04DA5H 00000H
04D4FH 00000H
@@BASE task_misc
04DA5H 00000H
@@BASE task_sys 04DA5H 00000H
04D4FH 00000H
@@BASE task_sys 04D4FH 00000H
@@BASE pedo_alg_thre_det2
04DA5H 00000H
@@BASE ini_VECT 04DA5H 00006H
04D4FH 00000H
@@BASE ini_VECT 04D4FH 00006H
@@BASE task_status
04DABH 00000H
@@BASE led_cam 04DABH 00000H
@@BASE led_pow 04DABH 00000H
@@BASE hal 04DABH 00000H
04D55H 00000H
@@BASE led_cam 04D55H 00000H
@@BASE led_pow 04D55H 00000H
@@BASE hal 04D55H 00000H
@@BASE batt_params
04DABH 00000H
@@BASE voltable 04DABH 00000H
04D55H 00000H
@@BASE voltable 04D55H 00000H
@@BASE pedo_lpf_coeff
04DABH 00000H
04D55H 00000H
@@BASE kanaria_c
04DABH 00000H
04D55H 00000H
@@BASE util_funcs
04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL @cstart 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL pm 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL main 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL led 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL rtc 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL adc 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL renge 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL accero 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL sw 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL @cstart 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL pm 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL main 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL led 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL rtc 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL adc 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL renge 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL accero 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL sw 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL task_misc
04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL task_sys 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL task_sys 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2
04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL led_cam 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL led_pow 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL led_cam 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL led_pow 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL batt_params
04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
@@CNSTL voltable 04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL voltable 04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL pedo_lpf_coeff
04DABH 00000H
@@CNSTL 04DABH 00000H CSEG PAGE64KP
04D55H 00000H
@@CNSTL 04D55H 00000H CSEG PAGE64KP
@@CNSTL kanaria_c
04DABH 00000H
@@RLINIT 04DABH 00000H CSEG UNIT64KP
@@RLINIT loader 04DABH 00000H
@@RLINIT pm 04DABH 00000H
@@RLINIT i2c_ctr 04DABH 00000H
@@RLINIT main 04DABH 00000H
@@RLINIT magic 04DABH 00000H
@@RLINIT WDT 04DABH 00000H
@@RLINIT i2c_mcu 04DABH 00000H
@@RLINIT i2c_twl 04DABH 00000H
@@RLINIT led 04DABH 00000H
@@RLINIT rtc 04DABH 00000H
@@RLINIT vreg_ctr 04DABH 00000H
@@RLINIT vreg_twl 04DABH 00000H
@@RLINIT adc 04DABH 00000H
@@RLINIT renge 04DABH 00000H
@@RLINIT accero 04DABH 00000H
04D55H 00000H
@@RLINIT 04D55H 00000H CSEG UNIT64KP
@@RLINIT loader 04D55H 00000H
@@RLINIT pm 04D55H 00000H
@@RLINIT i2c_ctr 04D55H 00000H
@@RLINIT main 04D55H 00000H
@@RLINIT magic 04D55H 00000H
@@RLINIT WDT 04D55H 00000H
@@RLINIT i2c_mcu 04D55H 00000H
@@RLINIT i2c_twl 04D55H 00000H
@@RLINIT led 04D55H 00000H
@@RLINIT rtc 04D55H 00000H
@@RLINIT vreg_ctr 04D55H 00000H
@@RLINIT vreg_twl 04D55H 00000H
@@RLINIT adc 04D55H 00000H
@@RLINIT renge 04D55H 00000H
@@RLINIT accero 04D55H 00000H
@@RLINIT self_flash
04DABH 00000H
@@RLINIT sw 04DABH 00000H
04D55H 00000H
@@RLINIT sw 04D55H 00000H
@@RLINIT task_debug
04DABH 00000H
04D55H 00000H
@@RLINIT task_misc
04DABH 00000H
@@RLINIT task_sys 04DABH 00000H
04D55H 00000H
@@RLINIT task_sys 04D55H 00000H
@@RLINIT pedo_alg_thre_det2
04DABH 00000H
@@RLINIT ini_VECT 04DABH 00000H
04D55H 00000H
@@RLINIT ini_VECT 04D55H 00000H
@@RLINIT task_status
04DABH 00000H
@@RLINIT led_cam 04DABH 00000H
@@RLINIT led_pow 04DABH 00000H
@@RLINIT hal 04DABH 00000H
04D55H 00000H
@@RLINIT led_cam 04D55H 00000H
@@RLINIT led_pow 04D55H 00000H
@@RLINIT hal 04D55H 00000H
@@RLINIT batt_params
04DABH 00000H
@@RLINIT voltable 04DABH 00000H
04D55H 00000H
@@RLINIT voltable 04D55H 00000H
@@RLINIT pedo_lpf_coeff
04DABH 00000H
04D55H 00000H
@@RLINIT kanaria_c
04DABH 00000H
04D55H 00000H
@@RLINIT util_funcs
04DABH 00000H
@@RLINIT @rom 04DABH 00000H
@@CODEL 04DABH 00000H CSEG
@@CODEL pm 04DABH 00000H
@@CODEL i2c_ctr 04DABH 00000H
@@CODEL main 04DABH 00000H
@@CODEL magic 04DABH 00000H
@@CODEL i2c_twl 04DABH 00000H
@@CODEL led 04DABH 00000H
@@CODEL rtc 04DABH 00000H
@@CODEL vreg_ctr 04DABH 00000H
@@CODEL vreg_twl 04DABH 00000H
@@CODEL adc 04DABH 00000H
@@CODEL renge 04DABH 00000H
@@CODEL accero 04DABH 00000H
@@CODEL sw 04DABH 00000H
04D55H 00000H
@@RLINIT @rom 04D55H 00000H
@@CODEL 04D55H 00000H CSEG
@@CODEL pm 04D55H 00000H
@@CODEL i2c_ctr 04D55H 00000H
@@CODEL main 04D55H 00000H
@@CODEL magic 04D55H 00000H
@@CODEL i2c_twl 04D55H 00000H
@@CODEL led 04D55H 00000H
@@CODEL rtc 04D55H 00000H
@@CODEL vreg_ctr 04D55H 00000H
@@CODEL vreg_twl 04D55H 00000H
@@CODEL adc 04D55H 00000H
@@CODEL renge 04D55H 00000H
@@CODEL accero 04D55H 00000H
@@CODEL sw 04D55H 00000H
@@CODEL task_misc
04DABH 00000H
@@CODEL task_sys 04DABH 00000H
04D55H 00000H
@@CODEL task_sys 04D55H 00000H
@@CODEL pedo_alg_thre_det2
04DABH 00000H
@@CODEL ini_VECT 04DABH 00000H
@@CODEL led_cam 04DABH 00000H
@@CODEL led_pow 04DABH 00000H
04D55H 00000H
@@CODEL ini_VECT 04D55H 00000H
@@CODEL led_cam 04D55H 00000H
@@CODEL led_pow 04D55H 00000H
@@CODEL batt_params
04DABH 00000H
@@CODEL voltable 04DABH 00000H
04D55H 00000H
@@CODEL voltable 04D55H 00000H
@@CODEL pedo_lpf_coeff
04DABH 00000H
04D55H 00000H
@@CODEL kanaria_c
04DABH 00000H
* gap * 04DABH 00001H
@@CNSTL 04DACH 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04DACH 0000AH
@@R_INIT 04DB6H 0004CH CSEG UNIT64KP
@@R_INIT @cstart 04DB6H 00000H
@@R_INIT loader 04DB6H 00000H
@@R_INIT pm 04DB6H 00000H
@@R_INIT i2c_ctr 04DB6H 00000H
@@R_INIT main 04DB6H 00000H
@@R_INIT magic 04DB6H 00000H
@@R_INIT WDT 04DB6H 00000H
@@R_INIT i2c_mcu 04DB6H 00000H
@@R_INIT i2c_twl 04DB6H 00000H
@@R_INIT led 04DB6H 00000H
@@R_INIT rtc 04DB6H 00000H
@@R_INIT vreg_ctr 04DB6H 00000H
@@R_INIT vreg_twl 04DB6H 00000H
@@R_INIT adc 04DB6H 0000CH
@@R_INIT renge 04DC2H 00014H
@@R_INIT accero 04DD6H 00000H
04D55H 00000H
* gap * 04D55H 00001H
@@CNSTL 04D56H 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04D56H 0000AH
@@R_INIT 04D60H 0004AH CSEG UNIT64KP
@@R_INIT @cstart 04D60H 00000H
@@R_INIT loader 04D60H 00000H
@@R_INIT pm 04D60H 00000H
@@R_INIT i2c_ctr 04D60H 00000H
@@R_INIT main 04D60H 00000H
@@R_INIT magic 04D60H 00000H
@@R_INIT WDT 04D60H 00000H
@@R_INIT i2c_mcu 04D60H 00000H
@@R_INIT i2c_twl 04D60H 00000H
@@R_INIT led 04D60H 00000H
@@R_INIT rtc 04D60H 00000H
@@R_INIT vreg_ctr 04D60H 00000H
@@R_INIT vreg_twl 04D60H 00000H
@@R_INIT adc 04D60H 0000CH
@@R_INIT renge 04D6CH 00014H
@@R_INIT accero 04D80H 00000H
@@R_INIT self_flash
04DD6H 00000H
@@R_INIT sw 04DD6H 00000H
04D80H 00000H
@@R_INIT sw 04D80H 00000H
@@R_INIT task_debug
04DD6H 00000H
04D80H 00000H
@@R_INIT task_misc
04DD6H 00028H
@@R_INIT task_sys 04DFEH 00000H
04D80H 00026H
@@R_INIT task_sys 04DA6H 00000H
@@R_INIT pedo_alg_thre_det2
04DFEH 00000H
@@R_INIT ini_VECT 04DFEH 00000H
04DA6H 00000H
@@R_INIT ini_VECT 04DA6H 00000H
@@R_INIT task_status
04DFEH 00000H
@@R_INIT led_cam 04DFEH 00000H
@@R_INIT led_pow 04DFEH 00004H
@@R_INIT hal 04E02H 00000H
04DA6H 00000H
@@R_INIT led_cam 04DA6H 00000H
@@R_INIT led_pow 04DA6H 00004H
@@R_INIT hal 04DAAH 00000H
@@R_INIT batt_params
04E02H 00000H
@@R_INIT voltable 04E02H 00000H
04DAAH 00000H
@@R_INIT voltable 04DAAH 00000H
@@R_INIT pedo_lpf_coeff
04E02H 00000H
04DAAH 00000H
@@R_INIT kanaria_c
04E02H 00000H
04DAAH 00000H
@@R_INIT util_funcs
04E02H 00000H
@@R_INIT @rom 04E02H 00000H
@@R_INIS 04E02H 00010H CSEG UNIT64KP
@@R_INIS @cstart 04E02H 00000H
@@R_INIS loader 04E02H 00000H
@@R_INIS pm 04E02H 00002H
@@R_INIS i2c_ctr 04E04H 00002H
@@R_INIS main 04E06H 00000H
@@R_INIS magic 04E06H 00000H
@@R_INIS WDT 04E06H 00000H
@@R_INIS i2c_mcu 04E06H 00000H
@@R_INIS i2c_twl 04E06H 00000H
@@R_INIS led 04E06H 00000H
@@R_INIS rtc 04E06H 00000H
@@R_INIS vreg_ctr 04E06H 00000H
@@R_INIS vreg_twl 04E06H 00000H
@@R_INIS adc 04E06H 00000H
@@R_INIS renge 04E06H 00000H
@@R_INIS accero 04E06H 00000H
04DAAH 00000H
@@R_INIT @rom 04DAAH 00000H
@@R_INIS 04DAAH 00010H CSEG UNIT64KP
@@R_INIS @cstart 04DAAH 00000H
@@R_INIS loader 04DAAH 00000H
@@R_INIS pm 04DAAH 00002H
@@R_INIS i2c_ctr 04DACH 00002H
@@R_INIS main 04DAEH 00000H
@@R_INIS magic 04DAEH 00000H
@@R_INIS WDT 04DAEH 00000H
@@R_INIS i2c_mcu 04DAEH 00000H
@@R_INIS i2c_twl 04DAEH 00000H
@@R_INIS led 04DAEH 00000H
@@R_INIS rtc 04DAEH 00000H
@@R_INIS vreg_ctr 04DAEH 00000H
@@R_INIS vreg_twl 04DAEH 00000H
@@R_INIS adc 04DAEH 00000H
@@R_INIS renge 04DAEH 00000H
@@R_INIS accero 04DAEH 00000H
@@R_INIS self_flash
04E06H 00000H
@@R_INIS sw 04E06H 00000H
04DAEH 00000H
@@R_INIS sw 04DAEH 00000H
@@R_INIS task_debug
04E06H 00000H
04DAEH 00000H
@@R_INIS task_misc
04E06H 00000H
@@R_INIS task_sys 04E06H 00002H
04DAEH 00000H
@@R_INIS task_sys 04DAEH 00002H
@@R_INIS pedo_alg_thre_det2
04E08H 00006H
@@R_INIS ini_VECT 04E0EH 00000H
04DB0H 00006H
@@R_INIS ini_VECT 04DB6H 00000H
@@R_INIS task_status
04E0EH 00000H
@@R_INIS led_cam 04E0EH 00002H
@@R_INIS led_pow 04E10H 00002H
@@R_INIS hal 04E12H 00000H
04DB6H 00000H
@@R_INIS led_cam 04DB6H 00002H
@@R_INIS led_pow 04DB8H 00002H
@@R_INIS hal 04DBAH 00000H
@@R_INIS batt_params
04E12H 00000H
@@R_INIS voltable 04E12H 00000H
04DBAH 00000H
@@R_INIS voltable 04DBAH 00000H
@@R_INIS pedo_lpf_coeff
04E12H 00000H
04DBAH 00000H
@@R_INIS kanaria_c
04E12H 00000H
04DBAH 00000H
@@R_INIS util_funcs
04E12H 00000H
@@R_INIS @rom 04E12H 00000H
@@LCODEL 04E12H 00022H CSEG
@@LCODEL abs 04E12H 00008H
@@LCODEL memcpy_n 04E1AH 0001AH
* gap * 04E34H 001C0H
04DBAH 00000H
@@R_INIS @rom 04DBAH 00000H
@@LCODEL 04DBAH 00022H CSEG
@@LCODEL abs 04DBAH 00008H
@@LCODEL memcpy_n 04DC2H 0001AH
* gap * 04DDCH 00218H
MGC_VER 04FF4H 00002H CSEG AT
MGC_VER magic 04FF4H 00002H
MGC_TAIL 04FF6H 0000AH CSEG AT
@ -585,7 +585,7 @@ Direc-file:bsr_mcu.dr
@@DATA util_funcs
FFCCCH 00000H
@@DATA @rom FFCCCH 00000H
@@INIT FFCCCH 0004CH DSEG BASEP
@@INIT FFCCCH 0004AH DSEG BASEP
@@INIT @cstart FFCCCH 00000H
@@INIT loader FFCCCH 00000H
@@INIT pm FFCCCH 00000H
@ -608,117 +608,117 @@ Direc-file:bsr_mcu.dr
@@INIT task_debug
FFCECH 00000H
@@INIT task_misc
FFCECH 00028H
@@INIT task_sys FFD14H 00000H
FFCECH 00026H
@@INIT task_sys FFD12H 00000H
@@INIT pedo_alg_thre_det2
FFD14H 00000H
@@INIT ini_VECT FFD14H 00000H
FFD12H 00000H
@@INIT ini_VECT FFD12H 00000H
@@INIT task_status
FFD14H 00000H
@@INIT led_cam FFD14H 00000H
@@INIT led_pow FFD14H 00004H
@@INIT hal FFD18H 00000H
FFD12H 00000H
@@INIT led_cam FFD12H 00000H
@@INIT led_pow FFD12H 00004H
@@INIT hal FFD16H 00000H
@@INIT batt_params
FFD18H 00000H
@@INIT voltable FFD18H 00000H
FFD16H 00000H
@@INIT voltable FFD16H 00000H
@@INIT pedo_lpf_coeff
FFD18H 00000H
@@INIT kanaria FFD18H 00000H
FFD16H 00000H
@@INIT kanaria FFD16H 00000H
@@INIT kanaria_c
FFD18H 00000H
FFD16H 00000H
@@INIT util_funcs
FFD18H 00000H
@@INIT @rom FFD18H 00000H
FSL_DATA FFD18H 00010H DSEG UNITP
FFD16H 00000H
@@INIT @rom FFD16H 00000H
FSL_DATA FFD16H 00010H DSEG UNITP
FSL_DATA fsl_common
FFD18H 00010H
@@INITL FFD28H 00000H DSEG UNIT64KP
@@INITL loader FFD28H 00000H
@@INITL pm FFD28H 00000H
@@INITL i2c_ctr FFD28H 00000H
@@INITL main FFD28H 00000H
@@INITL magic FFD28H 00000H
@@INITL WDT FFD28H 00000H
@@INITL i2c_mcu FFD28H 00000H
@@INITL i2c_twl FFD28H 00000H
@@INITL led FFD28H 00000H
@@INITL rtc FFD28H 00000H
@@INITL vreg_ctr FFD28H 00000H
@@INITL vreg_twl FFD28H 00000H
@@INITL adc FFD28H 00000H
@@INITL renge FFD28H 00000H
@@INITL accero FFD28H 00000H
FFD16H 00010H
@@INITL FFD26H 00000H DSEG UNIT64KP
@@INITL loader FFD26H 00000H
@@INITL pm FFD26H 00000H
@@INITL i2c_ctr FFD26H 00000H
@@INITL main FFD26H 00000H
@@INITL magic FFD26H 00000H
@@INITL WDT FFD26H 00000H
@@INITL i2c_mcu FFD26H 00000H
@@INITL i2c_twl FFD26H 00000H
@@INITL led FFD26H 00000H
@@INITL rtc FFD26H 00000H
@@INITL vreg_ctr FFD26H 00000H
@@INITL vreg_twl FFD26H 00000H
@@INITL adc FFD26H 00000H
@@INITL renge FFD26H 00000H
@@INITL accero FFD26H 00000H
@@INITL self_flash
FFD28H 00000H
@@INITL sw FFD28H 00000H
FFD26H 00000H
@@INITL sw FFD26H 00000H
@@INITL task_debug
FFD28H 00000H
FFD26H 00000H
@@INITL task_misc
FFD28H 00000H
@@INITL task_sys FFD28H 00000H
FFD26H 00000H
@@INITL task_sys FFD26H 00000H
@@INITL pedo_alg_thre_det2
FFD28H 00000H
@@INITL ini_VECT FFD28H 00000H
FFD26H 00000H
@@INITL ini_VECT FFD26H 00000H
@@INITL task_status
FFD28H 00000H
@@INITL led_cam FFD28H 00000H
@@INITL led_pow FFD28H 00000H
@@INITL hal FFD28H 00000H
FFD26H 00000H
@@INITL led_cam FFD26H 00000H
@@INITL led_pow FFD26H 00000H
@@INITL hal FFD26H 00000H
@@INITL batt_params
FFD28H 00000H
@@INITL voltable FFD28H 00000H
FFD26H 00000H
@@INITL voltable FFD26H 00000H
@@INITL pedo_lpf_coeff
FFD28H 00000H
@@INITL kanaria FFD28H 00000H
FFD26H 00000H
@@INITL kanaria FFD26H 00000H
@@INITL kanaria_c
FFD28H 00000H
FFD26H 00000H
@@INITL util_funcs
FFD28H 00000H
@@INITL @rom FFD28H 00000H
@@DATAL FFD28H 00000H DSEG UNIT64KP
@@DATAL loader FFD28H 00000H
@@DATAL pm FFD28H 00000H
@@DATAL i2c_ctr FFD28H 00000H
@@DATAL main FFD28H 00000H
@@DATAL magic FFD28H 00000H
@@DATAL WDT FFD28H 00000H
@@DATAL i2c_mcu FFD28H 00000H
@@DATAL i2c_twl FFD28H 00000H
@@DATAL led FFD28H 00000H
@@DATAL rtc FFD28H 00000H
@@DATAL vreg_ctr FFD28H 00000H
@@DATAL vreg_twl FFD28H 00000H
@@DATAL adc FFD28H 00000H
@@DATAL renge FFD28H 00000H
@@DATAL accero FFD28H 00000H
FFD26H 00000H
@@INITL @rom FFD26H 00000H
@@DATAL FFD26H 00000H DSEG UNIT64KP
@@DATAL loader FFD26H 00000H
@@DATAL pm FFD26H 00000H
@@DATAL i2c_ctr FFD26H 00000H
@@DATAL main FFD26H 00000H
@@DATAL magic FFD26H 00000H
@@DATAL WDT FFD26H 00000H
@@DATAL i2c_mcu FFD26H 00000H
@@DATAL i2c_twl FFD26H 00000H
@@DATAL led FFD26H 00000H
@@DATAL rtc FFD26H 00000H
@@DATAL vreg_ctr FFD26H 00000H
@@DATAL vreg_twl FFD26H 00000H
@@DATAL adc FFD26H 00000H
@@DATAL renge FFD26H 00000H
@@DATAL accero FFD26H 00000H
@@DATAL self_flash
FFD28H 00000H
@@DATAL sw FFD28H 00000H
FFD26H 00000H
@@DATAL sw FFD26H 00000H
@@DATAL task_debug
FFD28H 00000H
FFD26H 00000H
@@DATAL task_misc
FFD28H 00000H
@@DATAL task_sys FFD28H 00000H
FFD26H 00000H
@@DATAL task_sys FFD26H 00000H
@@DATAL pedo_alg_thre_det2
FFD28H 00000H
@@DATAL ini_VECT FFD28H 00000H
FFD26H 00000H
@@DATAL ini_VECT FFD26H 00000H
@@DATAL task_status
FFD28H 00000H
@@DATAL led_cam FFD28H 00000H
@@DATAL led_pow FFD28H 00000H
@@DATAL hal FFD28H 00000H
FFD26H 00000H
@@DATAL led_cam FFD26H 00000H
@@DATAL led_pow FFD26H 00000H
@@DATAL hal FFD26H 00000H
@@DATAL batt_params
FFD28H 00000H
@@DATAL voltable FFD28H 00000H
FFD26H 00000H
@@DATAL voltable FFD26H 00000H
@@DATAL pedo_lpf_coeff
FFD28H 00000H
@@DATAL kanaria FFD28H 00000H
FFD26H 00000H
@@DATAL kanaria FFD26H 00000H
@@DATAL kanaria_c
FFD28H 00000H
FFD26H 00000H
@@DATAL util_funcs
FFD28H 00000H
@@DATAL @rom FFD28H 00000H
* gap * FFD28H 000D8H
FFD26H 00000H
@@DATAL @rom FFD26H 00000H
* gap * FFD26H 000DAH
MEMORY=RAM2
BASE ADDRESS=FFE20H SIZE=000C0H

2
trunk/config.h
View File

@ -3,7 +3,7 @@
#define MCU_VER_MAJOR 0x02
#define MCU_VER_MINOR 0x12
#define MCU_VER_MINOR 0x13
// デバッグ向けスイッチ

BIN
trunk/hoge.bin
View File

Binary file not shown.

4
trunk/i2c_ctr.c
View File

@ -280,8 +280,8 @@ void IIC_ctr_Init( void )
WTIM = 1; // 自動でACKを返した後clkをLに固定する
ACKE = 1;
IICWH = 9;
IICWL = 11; // L期間の長さ
IICWH = 5;
IICWL = 10; // L期間の長さ
SMC = 1; // 高速モード
DFC = 1; // デジタルフィルタon (@fast mode)

6
trunk/i2c_twl.c
View File

@ -52,7 +52,6 @@
#define WTIM WTIM0
#define SMC SMC0
#define TRC TRC0
#define DFC DFC0
#endif // _MCU_BSR_
@ -214,11 +213,10 @@ void IIC_twl_Init( void )
WTIM = 1; // 自動でACKを返した後clkをLに固定する
ACKE = 1; // ダメCPUは無視して次の通信をはじめるかもしれないんで早くclkを開放しないといけない
IICWH = 9;
IICWL = 11; // L期間の長さ（？）
IICWH = 5;
IICWL = 10; // L期間の長さ（？）
SMC = 1;
DFC = 1; // デジタルフィルタon (@fast mode)
IICAMK = 0; // 割り込みを許可

4
trunk/loader.c
View File

@ -198,7 +198,7 @@ static void chk_firm_broke()
void chk_platform_type()
{
// ●CTRファミリ //
system_status.family = (enum family_)( DEV_DET >> 1 ); /// あぁ... CTR TS がSPFLと誤判定するが、後で上書き
system_status.family = (enum family_)( DEV_DET >> 1 ); /// あぁ...
if( system_status.family == FAMILY_SPFL )
{
pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_AMO;
@ -251,7 +251,7 @@ void hdwinit( void )
CMC = bits8(0,0,0,1, 0,0,0,0); /* X1発振せず(入力ポート)、XT1使用、超低電力発振は不安定に付き通常で */
CSC = bits8(1,0,0,0, 0,0,0,0); /* X1発振なし、XT1発振あり、高速内蔵発振動作 */
OSMC = bits8(1,0,0,0, 0,0,0,1); /* 隠しレジスタ */
OSMC = 0x01; /* 隠しレジスタ */
NOP();NOP();NOP(); // 3clk開ける
CKC = bits8(0,0,0,0, 1,0,0,0); /* CPU/周辺クロック=fMAIN、fMAIN=fMX、fCLK=fMX */

55
trunk/pm.c
View File

@ -170,24 +170,8 @@ static void update_chg_led()
LED_CHARGE = temp_led_chg;
// レジスタの充電中ビットはLEDに同期する。　と、割り込み
{
u8 staus_old = vreg_ctr[VREG_C_STATUS]; /// Cだと簡潔に書けない...
set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE );
if( (( vreg_ctr[VREG_C_STATUS] ^ staus_old ) & REG_BIT_BATT_CHARGE ) != 0 ) // 変化があったら割り込み
{
if( LED_CHARGE ) // set_irqを別々に呼ぶ方がコンパクト
{
set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_START );
}
else
{
set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_STOP );
}
}
}
// レジスタの充電中ビットはLEDに同期する
set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。
}
@ -400,14 +384,12 @@ void BT_model_detect()
temp = get_adc( ADC_SEL_BATT_DET );
BT_DET_P = 0;
system_status.captureBox = false;
system_status.captureBox = 0;
// プラットフォーム判定 //
if( raw_adc_temperature > 0xF0 )
{
// TS //
system_status.model = MODEL_TS_BOARD;
system_status.family = FAMILY_CTR; // 旧回路での誤判定を上書き
pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_CGS;
}
else if( raw_adc_temperature < 4 )
{
@ -418,7 +400,7 @@ void BT_model_detect()
if(( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) == 0x01 ) &&
( iic_mcu_result == I2C_ERR_OK ))
{
system_status.captureBox = true;
system_status.captureBox = 1;
}
}
else
@ -474,7 +456,6 @@ void BT_model_detect()
#define MGIC_CMD_QUICKSTART 0x4000
/********************************************//**
MGICクイックスタート（主にバグ対策）
***********************************************/
@ -483,7 +464,7 @@ static void BT_mgic_quick_start()
wait_ms( 10 ); // MGICの起動に掛かる
// 0. バッテリ残量IC クイックスタート
send_cmd_mgic_2B( BT_GAUGE_REG_MODE, swap_endian_16( MGIC_CMD_QUICKSTART ) );
send_cmd_mgic_2B( BT_GAUGE_REG_MODE, swap_endian_16( 0x4000 ) );
wait_ms( 150 );
}
@ -835,20 +816,14 @@ err PM_LCD_on( )
{
err rv = ERR_ERR;
PM_VDDLCD_on( ); // 内部で CGS と AMO 切り替えてます
PM_VDDLCD_on( );
if( system_status.family == FAMILY_SPFL )
{
// SPFL ならアモルファスHV on を間に挟む
wait_ms( 10 );
SPFL_LCD_AMOL_HV_CONT = 1;
wait_ms( DELAY_PM_TSS_50B_AND_TCOM - 10 );
}
else
{
// CTR 時
wait_ms( DELAY_PM_TSS_50B_AND_TCOM );
}
PM_TCOM_on( );
@ -892,21 +867,21 @@ void PM_LCD_off()
}
// 液晶電源切る //
SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでもL縛りなので弊害なし
// 50msとか待つし、確認しましょうかね…
if( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 )
{
if( system_status.family == FAMILY_SPFL )
{
wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。
}
PM_TCOM_off();
wait_ms( 1 );
PM_TCOM_VCS_off( );
wait_ms( DELAY_PM_LCD_OFF );
if( system_status.family == FAMILY_SPFL )
{
// 液晶電源切る //
SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでもL縛りなので弊害なし
wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。
}
PM_VDDLCD_off( ); // 残ってたの全部止めます。
vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
}
@ -1137,7 +1112,7 @@ __interrupt void intp6_PM_irq( )
/********************************************//**
CODECからの割り込みを受けて、NTR PMIC互換レジスタからリード
PMICからの割り込みを受けて、NTR PMIC互換レジスタからリード
***********************************************/
task_status_immed tski_ntr_pmic_comm( )
{

45
trunk/task_misc.c
View File

@ -318,34 +318,33 @@ extern bit bt_authorized;
#define KOUMOKU 20
#define KOUMOKU 19
static u8 infos_bits[2];
static u8 infos_temp[6];
static u8 infos_temp[5];
static const u8 *infos_table[] = {
&infos_temp[0], // 0 プラットフォーム */
&pmic_version, // 1 PMIC バージョン
(u8*)&battery_manufacturer, // 2 電池メーカー
&mgic_version[0], // 3 MGIC Ver(MSB)
&mgic_version[1], // 4 〃 LSB
&infos_temp[1], // 5 ( rcomp & 0xFF )
&raw_adc_temperature, // 6 サーミスタ ADC 値
&infos_temp[2], // 7 ( !temp_zone_charge_disable | ( bt_authorized << 1 ) )
&infos_temp[3], // 8 お知らせLEDはフルカラー？
(u8*)&system_status.family, // 9 system_status.family
// LED_pow_red, ↓　bit型のポインタは不可 /* 10 */
&infos_temp[0], /* 0 */
&pmic_version,
(u8*)&battery_manufacturer,
&mgic_version[0],
&mgic_version[1],
&infos_temp[1], /* 5 */
&raw_adc_temperature,
&infos_temp[2],
&infos_temp[3],
(u8*)&system_status.family,
// LED_pow_red, /* 10 */
&infos_bits[0],
(u8*)&LED_duty_pow_blu,
(u8*)&LED_duty_3d,
(u8*)&LED_duty_notify_red,
(u8*)&LED_duty_notify_grn,
(u8*)&LED_duty_notify_blu, // 15
// &LED_CAM, ↓
(u8*)&LED_duty_notify_blu, /* 15 */
&infos_bits[1],
// &LED_CAM,
(u8*)&LED_duty_WiFi,
&infos_temp[4], // 18 ioピン状態（コード参照）
&infos_temp[5] // 19 特殊実機？（コード参照）
&infos_temp[4] /* 18 */
/* 項目足すときは KOUMOKU に注意 */
};
@ -366,16 +365,6 @@ static const u8 *infos_table[] = {
- 8) ( !temp_zone_charge_disable | ( bt_authorized << 1 ) )
- 9) お知らせLEDはフルカラー？
- 10) system_status.family
- 11) LED_pow_red,
- 12) (u8*)&LED_duty_pow_blu,
- 13) (u8*)&LED_duty_3d,
- 14) (u8*)&LED_duty_notify_red,
- 15) (u8*)&LED_duty_notify_grn,
- 16) (u8*)&LED_duty_notify_blu,
- 17) &LED_CAM, ↓
- 18) (u8*)&LED_duty_WiFi,
- 19) ioピン状態
- 20) 特殊実機？
***********************************************/
u8 extinfo_read(void)
{
@ -404,8 +393,6 @@ u8 extinfo_read(void)
| ( SW_WIFI_n ? REG_BIT_HAL0_SW_WIFI_n : 0 )
| ( SW_HOME_n ? REG_BIT_HAL0_SW_HOME_n : 0 )
| ( SW_POW_n ? REG_BIT_HAL0_SW_POW_n : 0 );
infos_temp[5] = ( system_status.taikendai ? 1 <<0 : 0 )
|( system_status.taikendai_nbd ? 1 <<1 : 0 );
infos_bits[0] = (u8)LED_pow_red;
infos_bits[1] = (u8)LED_CAM;

21
trunk/task_status.c
View File

@ -51,6 +51,26 @@ void tsk_status( )
{
state_old = vreg_ctr[VREG_C_STATUS];
if( system_status.pwr_state == ON )
{
if( diff & REG_BIT_BATT_CHARGE )
{
// 充電状態反映
if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BATT_CHARGE ) // set_irqを別々に呼ぶ方がコンパクト
{
set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_START );
}
else
{
set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_STOP );
}
}
}
if(( system_status.pwr_state == ON ) ||
( system_status.pwr_state == SLEEP )
)
{
if( diff & REG_BIT_ST_SHELL_OPEN )
{
// 蓋の開け閉め
@ -61,6 +81,7 @@ void tsk_status( )
else
{
set_irq( VREG_C_IRQ0, REG_BIT_SHELL_CLOSE );
}
}
}
}

3
trunk/task_sys.c
View File

@ -466,7 +466,8 @@ void tsk_sys( )
// ・RTCアラーム（現在封印）
// クロック復帰
OSMC = bits8(1,0,0,0, 0,0,0,1); // 8MHz“®<E2809C>ì<EFBFBD>€”õ
OSMC = bits8(1,0,0,0, 0,0,0,0); // 8MHz“®<E2809C>ì<EFBFBD>€”õ
renge_flg_interval = 0;
hal_update();

43
trunk/yav_mcu_bsr.plg
View File

@ -6,15 +6,15 @@ Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\loader.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no pm.c
pm.c(547) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(853) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(857) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(885) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(898) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(972) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(981) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1185) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1187) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(528) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(828) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(832) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(860) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(880) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(947) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(956) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1160) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1162) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 9 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\pm.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
@ -81,10 +81,10 @@ Assembly complete, 0 error(s) and 0 warning(s) found.
adc.c(104) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(190) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(241) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(308) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(434) : CC78K0R warning W0745: Expected function prototype
adc.c(305) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(429) : CC78K0R warning W0745: Expected function prototype
adc.c(458) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(463) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(468) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 7 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\adc.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
@ -112,16 +112,15 @@ Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_debug.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_misc.c
task_misc.c(392) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(394) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(406) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(408) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 4 warning(s) found.
task_misc.c(381) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(383) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(395) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 3 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_misc.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no task_sys.c
task_sys.c(234) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(569) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(570) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\task_sys.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
@ -156,6 +155,10 @@ Assembly complete, 0 error(s) and 0 warning(s) found.
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\hal.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no batt_params.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\batt_params.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no voltable.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\voltable.asm
@ -172,7 +175,7 @@ Assembly complete, 0 error(s) and 0 warning(s) found.
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -pinter_asm -ks -kx inter_asm\util_funcs.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 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 led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 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 led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel
RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K'
Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\
RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K'
@ -198,4 +201,4 @@ intel-HEX to bsr bin converter
file converted!
Build Total error(s) : 0 Total warning(s) : 66
Build Total error(s) : 0 Total warning(s) : 65

79
trunk/yav_mcu_bsr.prj
View File

@ -1,6 +1,6 @@
[ProjectManager]
Version=6.00
Path=C:\78k_data\yav-mcu-basara\trunk\
Path=C:\78k_data\yav-mcu-basara\branches\2.13_2nup\
Title=yav-mcu
Series=78K0R.PM
Device=uPD79F0104
@ -1075,45 +1075,6 @@ Source30=kanaria.asm
Source31=kanaria_c.c
Source32=get_ei.asm
Source33=util_funcs.c
[IncFile]
Include1=incs_loader.h
Include2=sim\simOnWin.h
Include3=sim\sfrAlias.h
Include4=config.h
Include5=jhl_defs.h
Include6=user_define.h
Include7=hal.h
Include8=bsr_system.h
Include9=renge\renge.h
Include10=renge\renge_defs.h
Include11=renge\renge_task_immediate.h
Include12=vreg_ctr.h
Include13=vreg_twl.h
Include14=loader.h
Include15=i2c_mcu.h
Include16=WDT.h
Include17=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
Include18=fsl_user.h
Include19=i2c_ctr.h
Include20=pm.h
Include21=rtc.h
Include22=reboot.h
Include23=magic.h
Include24=incs.h
Include25=i2c_twl.h
Include26=accero.h
Include27=pedometer.h
Include28=sw.h
Include29=adc.h
Include30=led.h
Include31=batt_params.h
Include32=pool.h
Include33=i2c_twl_defs.h
Include34=renge\renge_task_intval.h
Include35=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
Include36=self_flash.h
Include37=sim\sim_interrupt_decrare.c
Include38=util_funcs.h
[Options.LK78K0R 0]
Version=100
O0=bsr_k0r.lmf
@ -1232,7 +1193,7 @@ ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
OFILE=C:\78k_data\yav-mcu-basara\trunk\bsr.lmf
OFILE=C:\78k_data\yav-mcu-basara\branches\2.13_2nup\bsr.lmf
[Options.LK78K0R 3]
Version=100
O0=bsr_bsr.lmf
@ -1407,3 +1368,39 @@ DefaultMode2=1
DefaultMode3=1
DefaultMode4=1
DefaultMode5=1
[IncFile]
Include1=incs_loader.h
Include2=config.h
Include3=jhl_defs.h
Include4=user_define.h
Include5=hal.h
Include6=bsr_system.h
Include7=renge\renge.h
Include8=renge\renge_defs.h
Include9=renge\renge_task_immediate.h
Include10=vreg_ctr.h
Include11=vreg_twl.h
Include12=loader.h
Include13=i2c_mcu.h
Include14=WDT.h
Include15=fsl_user.h
Include16=i2c_ctr.h
Include17=pm.h
Include18=rtc.h
Include19=reboot.h
Include20=magic.h
Include21=incs.h
Include22=i2c_twl.h
Include23=accero.h
Include24=pedometer.h
Include25=sw.h
Include26=adc.h
Include27=led.h
Include28=batt_params.h
Include29=pool.h
Include30=i2c_twl_defs.h
Include31=renge\renge_task_intval.h
Include32=self_flash.h
Include33=util_funcs.h
Include34=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h
Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h