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

・TSボードが判定を誤るので一応対応（サポート外でよいようですが）

Browse Source 
・アモルファス電源 on 時のシーケンスの調整（暫定）
・拡張ステータスに追加：スタンドアロン試遊台/NBD試遊台

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@417 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2011-09-20 04:44:37 +00:00
parent bc33c9ad09
commit 4535387d5a
11 changed files with 1140 additions and 1112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
trunk/adc.c
View File

@ -284,17 +284,20 @@ __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 ):
EI();
case ( ADC_SEL_3D ):
// 3Dボリューム //
EI();
adc_raw_dep = adc_data;
break;
case ( ADC_SEL_VOL ):
// 音量スライダ //
EI();
if( system_status.model == MODEL_TS_BOARD )
{
@ -308,7 +311,8 @@ case ( ADC_SEL_AMB_BRIT ): //
break;
case ( ADC_SEL_BATT_TEMP ):
EI();
// バッテリ温度 //
EI();
#ifdef _ENABLE_HAL_
if( vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] == 0xFF ) // HAL無効
#else
@ -334,6 +338,7 @@ case ( ADC_SEL_AMB_BRIT ): //
/* 呼ばれません
case ( ADC_SEL_BATT_DET ):
// バッテリメーカー識別 //
break;
*/
}

1435
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.

671
trunk/bsr_k0r.map
View File

@ -1,7 +1,7 @@
78K0R Linker W1.33 Date: 8 Sep 2011 Page: 1
78K0R Linker W1.33 Date:16 Sep 2011 Page: 1
Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff -
obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C
@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr
*** Link information ***
72 output segment(s)
3CB1H byte(s) real data
6072 symbol(s) defined
3CE4H byte(s) real data
6076 symbol(s) defined
*** Memory map ***
@ -250,288 +250,287 @@ Direc-file:bsr_mcu.dr
0228CH 00000H
@@CNST util_funcs
0228CH 00000H
ROM_CODE 0228CH 024ADH 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 0014DH
ROM_CODE sw 03993H 00126H
ROM_CODE 0228CH 024DEH CSEG
ROM_CODE pm 0228CH 0099FH
ROM_CODE i2c_ctr 02C2BH 0005CH
ROM_CODE main 02C87H 00055H
ROM_CODE i2c_twl 02CDCH 0005EH
ROM_CODE led 02D3AH 0024FH
ROM_CODE rtc 02F89H 000E0H
ROM_CODE vreg_ctr 03069H 0047DH
ROM_CODE vreg_twl 034E6H 000F9H
ROM_CODE adc 035DFH 00261H
ROM_CODE renge 03840H 00018H
ROM_CODE accero 03858H 0014DH
ROM_CODE sw 039A5H 00126H
ROM_CODE task_misc
03AB9H 001E5H
ROM_CODE task_sys 03C9EH 00381H
03ACBH 00204H
ROM_CODE task_sys 03CCFH 00381H
ROM_CODE pedo_alg_thre_det2
0401FH 004D4H
ROM_CODE led_cam 044F3H 000C4H
ROM_CODE led_pow 045B7H 0016FH
ROM_CODE voltable 04726H 00000H
04050H 004D4H
ROM_CODE led_cam 04524H 000C4H
ROM_CODE led_pow 045E8H 0016FH
ROM_CODE voltable 04757H 00000H
ROM_CODE pedo_lpf_coeff
04726H 00000H
04757H 00000H
ROM_CODE kanaria_c
04726H 00006H
ROM_CODE get_ei 0472CH 0000DH
@@BASE 04739H 00614H CSEG BASE
@@BASE loader 04739H 00000H
@@BASE pm 04739H 0003EH
@@BASE i2c_ctr 04777H 00170H
@@BASE main 048E7H 00000H
@@BASE magic 048E7H 00000H
@@BASE WDT 048E7H 00000H
@@BASE i2c_mcu 048E7H 000F2H
@@BASE i2c_twl 049D9H 000D0H
@@BASE led 04AA9H 00000H
@@BASE rtc 04AA9H 0005DH
@@BASE vreg_ctr 04B06H 00000H
@@BASE vreg_twl 04B06H 00000H
@@BASE adc 04B06H 00094H
@@BASE renge 04B9AH 0016BH
@@BASE accero 04D05H 00042H
04757H 00006H
ROM_CODE get_ei 0475DH 0000DH
@@BASE 0476AH 00614H CSEG BASE
@@BASE loader 0476AH 00000H
@@BASE pm 0476AH 0003EH
@@BASE i2c_ctr 047A8H 00170H
@@BASE main 04918H 00000H
@@BASE magic 04918H 00000H
@@BASE WDT 04918H 00000H
@@BASE i2c_mcu 04918H 000F2H
@@BASE i2c_twl 04A0AH 000D0H
@@BASE led 04ADAH 00000H
@@BASE rtc 04ADAH 0005DH
@@BASE vreg_ctr 04B37H 00000H
@@BASE vreg_twl 04B37H 00000H
@@BASE adc 04B37H 00094H
@@BASE renge 04BCBH 0016BH
@@BASE accero 04D36H 00042H
@@BASE self_flash
04D47H 00000H
@@BASE sw 04D47H 00000H
04D78H 00000H
@@BASE sw 04D78H 00000H
@@BASE task_debug
04D47H 00000H
04D78H 00000H
@@BASE task_misc
04D47H 00000H
@@BASE task_sys 04D47H 00000H
04D78H 00000H
@@BASE task_sys 04D78H 00000H
@@BASE pedo_alg_thre_det2
04D47H 00000H
@@BASE ini_VECT 04D47H 00006H
04D78H 00000H
@@BASE ini_VECT 04D78H 00006H
@@BASE task_status
04D4DH 00000H
@@BASE led_cam 04D4DH 00000H
@@BASE led_pow 04D4DH 00000H
@@BASE hal 04D4DH 00000H
04D7EH 00000H
@@BASE led_cam 04D7EH 00000H
@@BASE led_pow 04D7EH 00000H
@@BASE hal 04D7EH 00000H
@@BASE batt_params
04D4DH 00000H
@@BASE voltable 04D4DH 00000H
04D7EH 00000H
@@BASE voltable 04D7EH 00000H
@@BASE pedo_lpf_coeff
04D4DH 00000H
04D7EH 00000H
@@BASE kanaria_c
04D4DH 00000H
04D7EH 00000H
@@BASE util_funcs
04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL @cstart 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL pm 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL main 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL led 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL rtc 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL adc 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL renge 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL accero 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL sw 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL @cstart 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL pm 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL main 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL led 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL rtc 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL adc 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL renge 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL accero 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL sw 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL task_misc
04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL task_sys 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL task_sys 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2
04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL led_cam 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL led_pow 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL led_cam 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL led_pow 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL batt_params
04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
@@CNSTL voltable 04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL voltable 04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL pedo_lpf_coeff
04D4DH 00000H
@@CNSTL 04D4DH 00000H CSEG PAGE64KP
04D7EH 00000H
@@CNSTL 04D7EH 00000H CSEG PAGE64KP
@@CNSTL kanaria_c
04D4DH 00000H
@@RLINIT 04D4DH 00000H CSEG UNIT64KP
@@RLINIT loader 04D4DH 00000H
@@RLINIT pm 04D4DH 00000H
@@RLINIT i2c_ctr 04D4DH 00000H
@@RLINIT main 04D4DH 00000H
@@RLINIT magic 04D4DH 00000H
@@RLINIT WDT 04D4DH 00000H
@@RLINIT i2c_mcu 04D4DH 00000H
@@RLINIT i2c_twl 04D4DH 00000H
@@RLINIT led 04D4DH 00000H
@@RLINIT rtc 04D4DH 00000H
@@RLINIT vreg_ctr 04D4DH 00000H
@@RLINIT vreg_twl 04D4DH 00000H
@@RLINIT adc 04D4DH 00000H
@@RLINIT renge 04D4DH 00000H
@@RLINIT accero 04D4DH 00000H
@@RLINIT self_flash
04D4DH 00000H
@@RLINIT sw 04D4DH 00000H
@@RLINIT task_debug
04D4DH 00000H
@@RLINIT task_misc
04D4DH 00000H
@@RLINIT task_sys 04D4DH 00000H
@@RLINIT pedo_alg_thre_det2
04D4DH 00000H
@@RLINIT ini_VECT 04D4DH 00000H
@@RLINIT task_status
04D4DH 00000H
@@RLINIT led_cam 04D4DH 00000H
@@RLINIT led_pow 04D4DH 00000H
@@RLINIT hal 04D4DH 00000H
@@RLINIT batt_params
04D4DH 00000H
@@RLINIT voltable 04D4DH 00000H
@@RLINIT pedo_lpf_coeff
04D4DH 00000H
@@RLINIT kanaria_c
04D4DH 00000H
@@RLINIT util_funcs
04D4DH 00000H
@@RLINIT @rom 04D4DH 00000H
@@CODEL 04D4DH 00000H CSEG
@@CODEL pm 04D4DH 00000H
@@CODEL i2c_ctr 04D4DH 00000H
@@CODEL main 04D4DH 00000H
@@CODEL magic 04D4DH 00000H
@@CODEL i2c_twl 04D4DH 00000H
@@CODEL led 04D4DH 00000H
@@CODEL rtc 04D4DH 00000H
@@CODEL vreg_ctr 04D4DH 00000H
@@CODEL vreg_twl 04D4DH 00000H
@@CODEL adc 04D4DH 00000H
@@CODEL renge 04D4DH 00000H
@@CODEL accero 04D4DH 00000H
@@CODEL sw 04D4DH 00000H
@@CODEL task_misc
04D4DH 00000H
@@CODEL task_sys 04D4DH 00000H
@@CODEL pedo_alg_thre_det2
04D4DH 00000H
@@CODEL ini_VECT 04D4DH 00000H
@@CODEL led_cam 04D4DH 00000H
@@CODEL led_pow 04D4DH 00000H
@@CODEL batt_params
04D4DH 00000H
@@CODEL voltable 04D4DH 00000H
@@CODEL pedo_lpf_coeff
04D4DH 00000H
@@CODEL kanaria_c
04D4DH 00000H
* gap * 04D4DH 00001H
@@CNSTL 04D4EH 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04D4EH 0000AH
@@R_INIT 04D58H 0004AH CSEG UNIT64KP
@@R_INIT @cstart 04D58H 00000H
@@R_INIT loader 04D58H 00000H
@@R_INIT pm 04D58H 00000H
@@R_INIT i2c_ctr 04D58H 00000H
@@R_INIT main 04D58H 00000H
@@R_INIT magic 04D58H 00000H
@@R_INIT WDT 04D58H 00000H
@@R_INIT i2c_mcu 04D58H 00000H
@@R_INIT i2c_twl 04D58H 00000H
@@R_INIT led 04D58H 00000H
@@R_INIT rtc 04D58H 00000H
@@R_INIT vreg_ctr 04D58H 00000H
@@R_INIT vreg_twl 04D58H 00000H
@@R_INIT adc 04D58H 0000CH
@@R_INIT renge 04D64H 00014H
@@R_INIT accero 04D78H 00000H
04D7EH 00000H
@@CNSTL 04D7EH 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04D7EH 0000AH
@@R_INIT 04D88H 0004CH CSEG UNIT64KP
@@R_INIT @cstart 04D88H 00000H
@@R_INIT loader 04D88H 00000H
@@R_INIT pm 04D88H 00000H
@@R_INIT i2c_ctr 04D88H 00000H
@@R_INIT main 04D88H 00000H
@@R_INIT magic 04D88H 00000H
@@R_INIT WDT 04D88H 00000H
@@R_INIT i2c_mcu 04D88H 00000H
@@R_INIT i2c_twl 04D88H 00000H
@@R_INIT led 04D88H 00000H
@@R_INIT rtc 04D88H 00000H
@@R_INIT vreg_ctr 04D88H 00000H
@@R_INIT vreg_twl 04D88H 00000H
@@R_INIT adc 04D88H 0000CH
@@R_INIT renge 04D94H 00014H
@@R_INIT accero 04DA8H 00000H
@@R_INIT self_flash
04D78H 00000H
@@R_INIT sw 04D78H 00000H
04DA8H 00000H
@@R_INIT sw 04DA8H 00000H
@@R_INIT task_debug
04D78H 00000H
04DA8H 00000H
@@R_INIT task_misc
04D78H 00026H
@@R_INIT task_sys 04D9EH 00000H
04DA8H 00028H
@@R_INIT task_sys 04DD0H 00000H
@@R_INIT pedo_alg_thre_det2
04D9EH 00000H
@@R_INIT ini_VECT 04D9EH 00000H
04DD0H 00000H
@@R_INIT ini_VECT 04DD0H 00000H
@@R_INIT task_status
04D9EH 00000H
@@R_INIT led_cam 04D9EH 00000H
@@R_INIT led_pow 04D9EH 00004H
@@R_INIT hal 04DA2H 00000H
04DD0H 00000H
@@R_INIT led_cam 04DD0H 00000H
@@R_INIT led_pow 04DD0H 00004H
@@R_INIT hal 04DD4H 00000H
@@R_INIT batt_params
04DA2H 00000H
@@R_INIT voltable 04DA2H 00000H
04DD4H 00000H
@@R_INIT voltable 04DD4H 00000H
@@R_INIT pedo_lpf_coeff
04DA2H 00000H
04DD4H 00000H
@@R_INIT kanaria_c
04DA2H 00000H
04DD4H 00000H
@@R_INIT util_funcs
04DA2H 00000H
@@R_INIT @rom 04DA2H 00000H
@@R_INIS 04DA2H 00010H CSEG UNIT64KP
@@R_INIS @cstart 04DA2H 00000H
@@R_INIS loader 04DA2H 00000H
@@R_INIS pm 04DA2H 00002H
@@R_INIS i2c_ctr 04DA4H 00002H
@@R_INIS main 04DA6H 00000H
@@R_INIS magic 04DA6H 00000H
@@R_INIS WDT 04DA6H 00000H
@@R_INIS i2c_mcu 04DA6H 00000H
@@R_INIS i2c_twl 04DA6H 00000H
@@R_INIS led 04DA6H 00000H
@@R_INIS rtc 04DA6H 00000H
@@R_INIS vreg_ctr 04DA6H 00000H
@@R_INIS vreg_twl 04DA6H 00000H
@@R_INIS adc 04DA6H 00000H
@@R_INIS renge 04DA6H 00000H
@@R_INIS accero 04DA6H 00000H
04DD4H 00000H
@@R_INIT @rom 04DD4H 00000H
@@R_INIS 04DD4H 00010H CSEG UNIT64KP
@@R_INIS @cstart 04DD4H 00000H
@@R_INIS loader 04DD4H 00000H
@@R_INIS pm 04DD4H 00002H
@@R_INIS i2c_ctr 04DD6H 00002H
@@R_INIS main 04DD8H 00000H
@@R_INIS magic 04DD8H 00000H
@@R_INIS WDT 04DD8H 00000H
@@R_INIS i2c_mcu 04DD8H 00000H
@@R_INIS i2c_twl 04DD8H 00000H
@@R_INIS led 04DD8H 00000H
@@R_INIS rtc 04DD8H 00000H
@@R_INIS vreg_ctr 04DD8H 00000H
@@R_INIS vreg_twl 04DD8H 00000H
@@R_INIS adc 04DD8H 00000H
@@R_INIS renge 04DD8H 00000H
@@R_INIS accero 04DD8H 00000H
@@R_INIS self_flash
04DA6H 00000H
@@R_INIS sw 04DA6H 00000H
04DD8H 00000H
@@R_INIS sw 04DD8H 00000H
@@R_INIS task_debug
04DA6H 00000H
04DD8H 00000H
@@R_INIS task_misc
04DA6H 00000H
@@R_INIS task_sys 04DA6H 00002H
04DD8H 00000H
@@R_INIS task_sys 04DD8H 00002H
@@R_INIS pedo_alg_thre_det2
04DA8H 00006H
@@R_INIS ini_VECT 04DAEH 00000H
04DDAH 00006H
@@R_INIS ini_VECT 04DE0H 00000H
@@R_INIS task_status
04DAEH 00000H
@@R_INIS led_cam 04DAEH 00002H
@@R_INIS led_pow 04DB0H 00002H
@@R_INIS hal 04DB2H 00000H
04DE0H 00000H
@@R_INIS led_cam 04DE0H 00002H
@@R_INIS led_pow 04DE2H 00002H
@@R_INIS hal 04DE4H 00000H
@@R_INIS batt_params
04DB2H 00000H
@@R_INIS voltable 04DB2H 00000H
04DE4H 00000H
@@R_INIS voltable 04DE4H 00000H
@@R_INIS pedo_lpf_coeff
04DB2H 00000H
04DE4H 00000H
@@R_INIS kanaria_c
04DB2H 00000H
04DE4H 00000H
@@R_INIS util_funcs
04DB2H 00000H
@@R_INIS @rom 04DB2H 00000H
@@LCODEL 04DB2H 00022H CSEG
@@LCODEL abs 04DB2H 00008H
@@LCODEL memcpy_n 04DBAH 0001AH
* gap * 04DD4H 00220H
04DE4H 00000H
@@R_INIS @rom 04DE4H 00000H
@@RLINIT 04DE4H 00000H CSEG UNIT64KP
@@RLINIT loader 04DE4H 00000H
@@RLINIT pm 04DE4H 00000H
@@RLINIT i2c_ctr 04DE4H 00000H
@@RLINIT main 04DE4H 00000H
@@RLINIT magic 04DE4H 00000H
@@RLINIT WDT 04DE4H 00000H
@@RLINIT i2c_mcu 04DE4H 00000H
@@RLINIT i2c_twl 04DE4H 00000H
@@RLINIT led 04DE4H 00000H
@@RLINIT rtc 04DE4H 00000H
@@RLINIT vreg_ctr 04DE4H 00000H
@@RLINIT vreg_twl 04DE4H 00000H
@@RLINIT adc 04DE4H 00000H
@@RLINIT renge 04DE4H 00000H
@@RLINIT accero 04DE4H 00000H
@@RLINIT self_flash
04DE4H 00000H
@@RLINIT sw 04DE4H 00000H
@@RLINIT task_debug
04DE4H 00000H
@@RLINIT task_misc
04DE4H 00000H
@@RLINIT task_sys 04DE4H 00000H
@@RLINIT pedo_alg_thre_det2
04DE4H 00000H
@@RLINIT ini_VECT 04DE4H 00000H
@@RLINIT task_status
04DE4H 00000H
@@RLINIT led_cam 04DE4H 00000H
@@RLINIT led_pow 04DE4H 00000H
@@RLINIT hal 04DE4H 00000H
@@RLINIT batt_params
04DE4H 00000H
@@RLINIT voltable 04DE4H 00000H
@@RLINIT pedo_lpf_coeff
04DE4H 00000H
@@RLINIT kanaria_c
04DE4H 00000H
@@RLINIT util_funcs
04DE4H 00000H
@@RLINIT @rom 04DE4H 00000H
@@CODEL 04DE4H 00000H CSEG
@@CODEL pm 04DE4H 00000H
@@CODEL i2c_ctr 04DE4H 00000H
@@CODEL main 04DE4H 00000H
@@CODEL magic 04DE4H 00000H
@@CODEL i2c_twl 04DE4H 00000H
@@CODEL led 04DE4H 00000H
@@CODEL rtc 04DE4H 00000H
@@CODEL vreg_ctr 04DE4H 00000H
@@CODEL vreg_twl 04DE4H 00000H
@@CODEL adc 04DE4H 00000H
@@CODEL renge 04DE4H 00000H
@@CODEL accero 04DE4H 00000H
@@CODEL sw 04DE4H 00000H
@@CODEL task_misc
04DE4H 00000H
@@CODEL task_sys 04DE4H 00000H
@@CODEL pedo_alg_thre_det2
04DE4H 00000H
@@CODEL ini_VECT 04DE4H 00000H
@@CODEL led_cam 04DE4H 00000H
@@CODEL led_pow 04DE4H 00000H
@@CODEL batt_params
04DE4H 00000H
@@CODEL voltable 04DE4H 00000H
@@CODEL pedo_lpf_coeff
04DE4H 00000H
@@CODEL kanaria_c
04DE4H 00000H
@@LCODEL 04DE4H 00022H CSEG
@@LCODEL abs 04DE4H 00008H
@@LCODEL memcpy_n 04DECH 0001AH
* gap * 04E06H 001EEH
MGC_VER 04FF4H 00002H CSEG AT
MGC_VER magic 04FF4H 00002H
MGC_TAIL 04FF6H 0000AH CSEG AT
@ -585,7 +584,7 @@ Direc-file:bsr_mcu.dr
@@DATA util_funcs
FFCCCH 00000H
@@DATA @rom FFCCCH 00000H
@@INIT FFCCCH 0004AH DSEG BASEP
@@INIT FFCCCH 0004CH DSEG BASEP
@@INIT @cstart FFCCCH 00000H
@@INIT loader FFCCCH 00000H
@@INIT pm FFCCCH 00000H
@ -608,117 +607,117 @@ Direc-file:bsr_mcu.dr
@@INIT task_debug
FFCECH 00000H
@@INIT task_misc
FFCECH 00026H
@@INIT task_sys FFD12H 00000H
FFCECH 00028H
@@INIT task_sys FFD14H 00000H
@@INIT pedo_alg_thre_det2
FFD12H 00000H
@@INIT ini_VECT FFD12H 00000H
FFD14H 00000H
@@INIT ini_VECT FFD14H 00000H
@@INIT task_status
FFD12H 00000H
@@INIT led_cam FFD12H 00000H
@@INIT led_pow FFD12H 00004H
@@INIT hal FFD16H 00000H
FFD14H 00000H
@@INIT led_cam FFD14H 00000H
@@INIT led_pow FFD14H 00004H
@@INIT hal FFD18H 00000H
@@INIT batt_params
FFD16H 00000H
@@INIT voltable FFD16H 00000H
FFD18H 00000H
@@INIT voltable FFD18H 00000H
@@INIT pedo_lpf_coeff
FFD16H 00000H
@@INIT kanaria FFD16H 00000H
FFD18H 00000H
@@INIT kanaria FFD18H 00000H
@@INIT kanaria_c
FFD16H 00000H
FFD18H 00000H
@@INIT util_funcs
FFD16H 00000H
@@INIT @rom FFD16H 00000H
FSL_DATA FFD16H 00010H DSEG UNITP
FFD18H 00000H
@@INIT @rom FFD18H 00000H
FSL_DATA FFD18H 00010H DSEG UNITP
FSL_DATA fsl_common
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
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
@@INITL self_flash
FFD26H 00000H
@@INITL sw FFD26H 00000H
FFD28H 00000H
@@INITL sw FFD28H 00000H
@@INITL task_debug
FFD26H 00000H
FFD28H 00000H
@@INITL task_misc
FFD26H 00000H
@@INITL task_sys FFD26H 00000H
FFD28H 00000H
@@INITL task_sys FFD28H 00000H
@@INITL pedo_alg_thre_det2
FFD26H 00000H
@@INITL ini_VECT FFD26H 00000H
FFD28H 00000H
@@INITL ini_VECT FFD28H 00000H
@@INITL task_status
FFD26H 00000H
@@INITL led_cam FFD26H 00000H
@@INITL led_pow FFD26H 00000H
@@INITL hal FFD26H 00000H
FFD28H 00000H
@@INITL led_cam FFD28H 00000H
@@INITL led_pow FFD28H 00000H
@@INITL hal FFD28H 00000H
@@INITL batt_params
FFD26H 00000H
@@INITL voltable FFD26H 00000H
FFD28H 00000H
@@INITL voltable FFD28H 00000H
@@INITL pedo_lpf_coeff
FFD26H 00000H
@@INITL kanaria FFD26H 00000H
FFD28H 00000H
@@INITL kanaria FFD28H 00000H
@@INITL kanaria_c
FFD26H 00000H
FFD28H 00000H
@@INITL util_funcs
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
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
@@DATAL self_flash
FFD26H 00000H
@@DATAL sw FFD26H 00000H
FFD28H 00000H
@@DATAL sw FFD28H 00000H
@@DATAL task_debug
FFD26H 00000H
FFD28H 00000H
@@DATAL task_misc
FFD26H 00000H
@@DATAL task_sys FFD26H 00000H
FFD28H 00000H
@@DATAL task_sys FFD28H 00000H
@@DATAL pedo_alg_thre_det2
FFD26H 00000H
@@DATAL ini_VECT FFD26H 00000H
FFD28H 00000H
@@DATAL ini_VECT FFD28H 00000H
@@DATAL task_status
FFD26H 00000H
@@DATAL led_cam FFD26H 00000H
@@DATAL led_pow FFD26H 00000H
@@DATAL hal FFD26H 00000H
FFD28H 00000H
@@DATAL led_cam FFD28H 00000H
@@DATAL led_pow FFD28H 00000H
@@DATAL hal FFD28H 00000H
@@DATAL batt_params
FFD26H 00000H
@@DATAL voltable FFD26H 00000H
FFD28H 00000H
@@DATAL voltable FFD28H 00000H
@@DATAL pedo_lpf_coeff
FFD26H 00000H
@@DATAL kanaria FFD26H 00000H
FFD28H 00000H
@@DATAL kanaria FFD28H 00000H
@@DATAL kanaria_c
FFD26H 00000H
FFD28H 00000H
@@DATAL util_funcs
FFD26H 00000H
@@DATAL @rom FFD26H 00000H
* gap * FFD26H 000DAH
FFD28H 00000H
@@DATAL @rom FFD28H 00000H
* gap * FFD28H 000D8H
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 0x0F
#define MCU_VER_MINOR 0x10
// デバッグ向けスイッチ

BIN
trunk/hoge.bin
View File

Binary file not shown.

2
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 ); /// あぁ...
system_status.family = (enum family_)( DEV_DET >> 1 ); /// あぁ... CTR TS がSPFLと誤判定するが、後で上書き
if( system_status.family == FAMILY_SPFL )
{
pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_AMO;

40
trunk/pm.c
View File

@ -384,13 +384,15 @@ void BT_model_detect()
temp = get_adc( ADC_SEL_BATT_DET );
BT_DET_P = 0;
system_status.captureBox = 0;
system_status.captureBox = false;
// プラットフォーム判定 //
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 )
{
// 白箱 //
@ -400,7 +402,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 = 1;
system_status.captureBox = true;
}
}
else
@ -456,6 +458,7 @@ void BT_model_detect()
#define MGIC_CMD_QUICKSTART 0x4000
/********************************************//**
MGICクイックスタート（主にバグ対策）
***********************************************/
@ -464,7 +467,7 @@ static void BT_mgic_quick_start()
wait_ms( 10 ); // MGICの起動に掛かる
// 0. バッテリ残量IC クイックスタート
send_cmd_mgic_2B( BT_GAUGE_REG_MODE, swap_endian_16( 0x4000 ) );
send_cmd_mgic_2B( BT_GAUGE_REG_MODE, swap_endian_16( MGIC_CMD_QUICKSTART ) );
wait_ms( 150 );
}
@ -816,14 +819,20 @@ err PM_LCD_on( )
{
err rv = ERR_ERR;
PM_VDDLCD_on( );
PM_VDDLCD_on( ); // 内部で CGS と AMO 切り替えてます
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 );
}
wait_ms( DELAY_PM_TSS_50B_AND_TCOM );
else
{
// CTR 時
wait_ms( DELAY_PM_TSS_50B_AND_TCOM );
}
PM_TCOM_on( );
@ -867,22 +876,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;
}
@ -1113,7 +1121,7 @@ __interrupt void intp6_PM_irq( )
/********************************************//**
PMICからの割り込みを受けて、NTR PMIC互換レジスタからリード
CODECからの割り込みを受けて、NTR PMIC互換レジスタからリード
***********************************************/
task_status_immed tski_ntr_pmic_comm( )
{

63
trunk/task_misc.c
View File

@ -318,33 +318,34 @@ extern bit bt_authorized;
#define KOUMOKU 19
#define KOUMOKU 20
static u8 infos_bits[2];
static u8 infos_temp[5];
static u8 infos_temp[6];
static const u8 *infos_table[] = {
&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_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_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 */
(u8*)&LED_duty_notify_blu, // 15
// &LED_CAM, ↓
&infos_bits[1],
// &LED_CAM,
(u8*)&LED_duty_WiFi,
&infos_temp[4] /* 18 */
&infos_temp[4], // 18 ioピン状態（コード参照）
&infos_temp[5] // 19 特殊実機？（コード参照）
/* 項目足すときは KOUMOKU に注意 */
};
@ -355,16 +356,26 @@ static const u8 *infos_table[] = {
出てくる順場は、
- 1) プラットフォーム
- 2) PMIC バージョン
- 3) 電池メーカー
- 4) ガスゲージバージョン
- 5) 〃
- 6) ( rcomp & 0xFF )
- 7) raw_adc_temperature
- 8) ( !temp_zone_charge_disable | ( bt_authorized << 1 ) )
- 9) お知らせLEDはフルカラー？
- 1) プラットフォーム
- 2) PMIC バージョン
- 3) 電池メーカー
- 4) ガスゲージバージョン
- 5) 〃
- 6) ( rcomp & 0xFF )
- 7) raw_adc_temperature
- 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)
{
@ -393,6 +404,8 @@ 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;

14
trunk/yav_mcu_bsr.prk
View File

@ -1,9 +1,9 @@
[ProjectManager]
FrameMax=0
FrameX=25
FrameY=25
FrameCX=1440
FrameCY=850
FrameX=350
FrameY=182
FrameCX=1022
FrameCY=722
OpenFile1=i2c_ctr.c,0,655,120,1628,751,0,1,0,0
OpenFile2=kanaria_c.c,0,68,138,763,769,8,5,8,0
OpenFile3=pm.c,0,373,197,1346,828,35,374,32,0
@ -15,10 +15,10 @@ OpenFile8=i2c_mcu.c,0,175,175,1036,939,1,453,1,0
OpenFile9=main.c,0,402,105,1713,812,0,68,0,0
OpenFile10=magic.c,0,192,199,1387,680,19,11,0,0
OpenFile11=config.h,0,75,75,902,478,0,15,0,0
OpenFile12=OutputWindow
OutputPos=0,228,679,379,1256
OpenFile13=ProjectWindow
OpenFile12=ProjectWindow
PrjPos=0,0,706,0,291
OpenFile13=OutputWindow
OutputPos=0,80,531,104,981
ActivePRJ=yav_mcu_bsr.prj
[ProjectWindow]
ProjectWindowDispType=0

12
trunk/yav_mcu_bsr.sdb
View File

@ -13,7 +13,7 @@ T=4e647ac1
9=WDT.h
10=magic.h
[pm.c]
T=4e6489a3
T=4e71bd3f
1=incs.h
2=adc.h
3=led.h
@ -40,7 +40,7 @@ T=4e647b08
7=i2c_mcu.h
8=pool.h
[magic.c]
T=4e68758c
T=4e71764f
1=magic.h
2=config.h
[WDT.c]
@ -88,7 +88,7 @@ T=4e6491f4
4=vreg_twl.h
5=adc.h
[adc.c]
T=4e648e7a
T=4e6dc5ed
1=incs.h
2=adc.h
3=pm.h
@ -107,7 +107,7 @@ T=4e6872a9
8=sim\simOnWin.h
9=bsr_system.h
[accero.c]
T=4e687584
T=4e687ab8
1=incs.h
2=accero.h
3=i2c_mcu.h
@ -164,7 +164,7 @@ T=4e6865dd
11=i2c_mcu.h
12=vreg_twl.h
[pedo_alg_thre_det2.c]
T=4e687272
T=4e687ba7
1=incs.h
2=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h
3=accero.h
@ -234,7 +234,7 @@ T=4e559884
T=4e5b0fa2
1=config.h
[config.h]
T=4e686baa
T=4e71764b
[jhl_defs.h]
T=4e647343
[user_define.h]