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.17 3rdNUP,SPFLローンチ用

Browse Source 
・SPFL-panaのパラメータを入れ忘れていた
・アモルファスLCDのシーケンスに対応

・マジックナンバーを#defineする（まだ見落としていたのがあった）

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@433 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2012-01-16 07:54:01 +00:00
parent cb0805a1ee
commit 67029ac2f5
11 changed files with 1275 additions and 1245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
trunk/batt_params.c
View File

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

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

730
trunk/bsr_k0r.map
View File

@ -26,7 +26,7 @@ Direc-file:bsr_mcu.dr
*** Link information *** *** Link information ***
73 output segment(s) 73 output segment(s)
3D82H byte(s) real data 3D5BH byte(s) real data
6153 symbol(s) defined 6153 symbol(s) defined
@ -152,55 +152,55 @@ Direc-file:bsr_mcu.dr
LDR_CODL util_funcs LDR_CODL util_funcs
000C4H 00000H 000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG ?CSEGSI 000C4H 0000AH CSEG
LDR_CODE 000CEH 008BCH CSEG LDR_CODE 000CEH 008BBH CSEG
LDR_CODE loader 000CEH 00178H LDR_CODE loader 000CEH 00177H
LDR_CODE WDT 00246H 00000H LDR_CODE WDT 00245H 00000H
LDR_CODE i2c_mcu 00246H 00293H LDR_CODE i2c_mcu 00245H 00293H
LDR_CODE self_flash LDR_CODE self_flash
004D9H 00370H 004D8H 00370H
LDR_CODE task_debug LDR_CODE task_debug
00849H 00000H 00848H 00000H
LDR_CODE task_status LDR_CODE task_status
00849H 00041H 00848H 00041H
LDR_CODE hal 0088AH 000DCH LDR_CODE hal 00889H 000DCH
LDR_CODE util_funcs LDR_CODE util_funcs
00966H 00024H 00965H 00024H
FSL_CODE 0098AH 00322H CSEG FSL_CODE 00989H 00322H CSEG
FSL_CODE fsl_block_cmd FSL_CODE fsl_block_cmd
0098AH 0002BH 00989H 0002BH
FSL_CODE fsl_block_check FSL_CODE fsl_block_check
009B5H 00013H 009B4H 00013H
FSL_CODE fsl_common FSL_CODE fsl_common
009C8H 0014FH 009C7H 0014FH
FSL_CODE fsl_reset FSL_CODE fsl_reset
00B17H 00001H 00B16H 00001H
FSL_CODE fsl_si_ibf FSL_CODE fsl_si_ibf
00B18H 00064H 00B17H 00064H
FSL_CODE fsl_phySwap FSL_CODE fsl_phySwap
00B7CH 0004DH 00B7BH 0004DH
FSL_CODE fsl_si_common FSL_CODE fsl_si_common
00BC9H 00061H 00BC8H 00061H
FSL_CODE fsl_swap 00C2AH 00030H FSL_CODE fsl_swap 00C29H 00030H
FSL_CODE fsl_write FSL_CODE fsl_write
00C5AH 00052H 00C59H 00052H
@@LCODE 00CACH 00277H CSEG @@LCODE 00CABH 00277H CSEG
@@LCODE @cstart 00CACH 0006DH @@LCODE @cstart 00CABH 0006DH
@@LCODE @imul 00D19H 00011H @@LCODE @imul 00D18H 00011H
@@LCODE @lumul 00D2AH 0002BH @@LCODE @lumul 00D29H 0002BH
@@LCODE @isdiv 00D55H 00022H @@LCODE @isdiv 00D54H 00022H
@@LCODE @iudiv 00D77H 0002DH @@LCODE @iudiv 00D76H 0002DH
@@LCODE @isrem 00DA4H 00021H @@LCODE @isrem 00DA3H 00021H
@@LCODE @iurem 00DC5H 0002FH @@LCODE @iurem 00DC4H 0002FH
@@LCODE @lsdiv 00DF4H 00039H @@LCODE @lsdiv 00DF3H 00039H
@@LCODE @ludiv 00E2DH 0003FH @@LCODE @ludiv 00E2CH 0003FH
@@LCODE @divuw 00E6CH 00034H @@LCODE @divuw 00E6BH 00034H
@@LCODE @ladd 00EA0H 0000FH @@LCODE @ladd 00E9FH 0000FH
@@LCODE @llsh 00EAFH 0001BH @@LCODE @llsh 00EAEH 0001BH
@@LCODE @lursh 00ECAH 0001FH @@LCODE @lursh 00EC9H 0001FH
@@LCODE @iscmp 00EE9H 0000CH @@LCODE @iscmp 00EE8H 0000CH
@@LCODE @lband 00EF5H 00014H @@LCODE @lband 00EF4H 00014H
@@LCODE @bcdtob 00F09H 0001AH @@LCODE @bcdtob 00F08H 0001AH
* gap * 00F23H 000D3H * gap * 00F22H 000D4H
MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH MGC_LOAD magic 00FF6H 0000AH
@ -254,303 +254,303 @@ Direc-file:bsr_mcu.dr
0228CH 00000H 0228CH 00000H
@@CNST i2c_mcu-sub @@CNST i2c_mcu-sub
0228CH 00000H 0228CH 00000H
ROM_CODE 0228CH 025C1H CSEG ROM_CODE 0228CH 0259DH CSEG
ROM_CODE pm 0228CH 009C9H ROM_CODE pm 0228CH 009C9H
ROM_CODE i2c_ctr 02C55H 0005CH ROM_CODE i2c_ctr 02C55H 0005CH
ROM_CODE main 02CB1H 00055H ROM_CODE main 02CB1H 00055H
ROM_CODE i2c_twl 02D06H 00062H ROM_CODE i2c_twl 02D06H 0005EH
ROM_CODE led 02D68H 0024FH ROM_CODE led 02D64H 0024FH
ROM_CODE rtc 02FB7H 000E0H ROM_CODE rtc 02FB3H 000E0H
ROM_CODE vreg_ctr 03097H 0047DH ROM_CODE vreg_ctr 03093H 0047DH
ROM_CODE vreg_twl 03514H 000F9H ROM_CODE vreg_twl 03510H 000F9H
ROM_CODE adc 0360DH 00261H ROM_CODE adc 03609H 00261H
ROM_CODE renge 0386EH 00018H ROM_CODE renge 0386AH 00018H
ROM_CODE accero 03886H 00155H ROM_CODE accero 03882H 00155H
ROM_CODE sw 039DBH 00126H ROM_CODE sw 039D7H 00126H
ROM_CODE task_misc ROM_CODE task_misc
03B01H 00204H 03AFDH 001E5H
ROM_CODE task_sys 03D05H 00381H ROM_CODE task_sys 03CE2H 00380H
ROM_CODE pedo_alg_thre_det2 ROM_CODE pedo_alg_thre_det2
04086H 004D4H 04062H 004D4H
ROM_CODE led_cam 0455AH 000C4H ROM_CODE led_cam 04536H 000C4H
ROM_CODE led_pow 0461EH 0016FH ROM_CODE led_pow 045FAH 0016FH
ROM_CODE voltable 0478DH 00000H ROM_CODE voltable 04769H 00000H
ROM_CODE pedo_lpf_coeff ROM_CODE pedo_lpf_coeff
0478DH 00000H 04769H 00000H
ROM_CODE kanaria_c ROM_CODE kanaria_c
0478DH 00006H 04769H 00006H
ROM_CODE get_ei 04793H 0000DH ROM_CODE get_ei 0476FH 0000DH
ROM_CODE i2c_mcu-sub ROM_CODE i2c_mcu-sub
047A0H 000ADH 0477CH 000ADH
@@BASE 0484DH 00614H CSEG BASE @@BASE 04829H 00614H CSEG BASE
@@BASE loader 0484DH 00000H @@BASE loader 04829H 00000H
@@BASE pm 0484DH 0003EH @@BASE pm 04829H 0003EH
@@BASE i2c_ctr 0488BH 00170H @@BASE i2c_ctr 04867H 00170H
@@BASE main 049FBH 00000H @@BASE main 049D7H 00000H
@@BASE magic 049FBH 00000H @@BASE magic 049D7H 00000H
@@BASE WDT 049FBH 00000H @@BASE WDT 049D7H 00000H
@@BASE i2c_mcu 049FBH 000F2H @@BASE i2c_mcu 049D7H 000F2H
@@BASE i2c_twl 04AEDH 000D0H @@BASE i2c_twl 04AC9H 000D0H
@@BASE led 04BBDH 00000H @@BASE led 04B99H 00000H
@@BASE rtc 04BBDH 0005DH @@BASE rtc 04B99H 0005DH
@@BASE vreg_ctr 04C1AH 00000H @@BASE vreg_ctr 04BF6H 00000H
@@BASE vreg_twl 04C1AH 00000H @@BASE vreg_twl 04BF6H 00000H
@@BASE adc 04C1AH 00094H @@BASE adc 04BF6H 00094H
@@BASE renge 04CAEH 0016BH @@BASE renge 04C8AH 0016BH
@@BASE accero 04E19H 00042H @@BASE accero 04DF5H 00042H
@@BASE self_flash @@BASE self_flash
04E5BH 00000H 04E37H 00000H
@@BASE sw 04E5BH 00000H @@BASE sw 04E37H 00000H
@@BASE task_debug @@BASE task_debug
04E5BH 00000H 04E37H 00000H
@@BASE task_misc @@BASE task_misc
04E5BH 00000H 04E37H 00000H
@@BASE task_sys 04E5BH 00000H @@BASE task_sys 04E37H 00000H
@@BASE pedo_alg_thre_det2 @@BASE pedo_alg_thre_det2
04E5BH 00000H 04E37H 00000H
@@BASE ini_VECT 04E5BH 00006H @@BASE ini_VECT 04E37H 00006H
@@BASE task_status @@BASE task_status
04E61H 00000H 04E3DH 00000H
@@BASE led_cam 04E61H 00000H @@BASE led_cam 04E3DH 00000H
@@BASE led_pow 04E61H 00000H @@BASE led_pow 04E3DH 00000H
@@BASE hal 04E61H 00000H @@BASE hal 04E3DH 00000H
@@BASE batt_params @@BASE batt_params
04E61H 00000H 04E3DH 00000H
@@BASE voltable 04E61H 00000H @@BASE voltable 04E3DH 00000H
@@BASE pedo_lpf_coeff @@BASE pedo_lpf_coeff
04E61H 00000H 04E3DH 00000H
@@BASE kanaria_c @@BASE kanaria_c
04E61H 00000H 04E3DH 00000H
@@BASE util_funcs @@BASE util_funcs
04E61H 00000H 04E3DH 00000H
@@BASE i2c_mcu-sub @@BASE i2c_mcu-sub
04E61H 00000H 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL @cstart 04E61H 00000H @@CNSTL @cstart 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL pm 04E61H 00000H @@CNSTL pm 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04E61H 00000H @@CNSTL i2c_ctr 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL main 04E61H 00000H @@CNSTL main 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04E61H 00000H @@CNSTL i2c_twl 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL led 04E61H 00000H @@CNSTL led 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL rtc 04E61H 00000H @@CNSTL rtc 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04E61H 00000H @@CNSTL vreg_ctr 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04E61H 00000H @@CNSTL vreg_twl 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL adc 04E61H 00000H @@CNSTL adc 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL renge 04E61H 00000H @@CNSTL renge 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL accero 04E61H 00000H @@CNSTL accero 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL sw 04E61H 00000H @@CNSTL sw 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL task_misc @@CNSTL task_misc
04E61H 00000H 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL task_sys 04E61H 00000H @@CNSTL task_sys 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2 @@CNSTL pedo_alg_thre_det2
04E61H 00000H 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04E61H 00000H @@CNSTL ini_VECT 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL led_cam 04E61H 00000H @@CNSTL led_cam 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL led_pow 04E61H 00000H @@CNSTL led_pow 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL batt_params @@CNSTL batt_params
04E61H 00000H 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL voltable 04E61H 00000H @@CNSTL voltable 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL pedo_lpf_coeff @@CNSTL pedo_lpf_coeff
04E61H 00000H 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL kanaria_c @@CNSTL kanaria_c
04E61H 00000H 04E3DH 00000H
@@CNSTL 04E61H 00000H CSEG PAGE64KP @@CNSTL 04E3DH 00000H CSEG PAGE64KP
@@CNSTL i2c_mcu-sub @@CNSTL i2c_mcu-sub
04E61H 00000H 04E3DH 00000H
@@RLINIT 04E61H 00000H CSEG UNIT64KP @@RLINIT 04E3DH 00000H CSEG UNIT64KP
@@RLINIT loader 04E61H 00000H @@RLINIT loader 04E3DH 00000H
@@RLINIT pm 04E61H 00000H @@RLINIT pm 04E3DH 00000H
@@RLINIT i2c_ctr 04E61H 00000H @@RLINIT i2c_ctr 04E3DH 00000H
@@RLINIT main 04E61H 00000H @@RLINIT main 04E3DH 00000H
@@RLINIT magic 04E61H 00000H @@RLINIT magic 04E3DH 00000H
@@RLINIT WDT 04E61H 00000H @@RLINIT WDT 04E3DH 00000H
@@RLINIT i2c_mcu 04E61H 00000H @@RLINIT i2c_mcu 04E3DH 00000H
@@RLINIT i2c_twl 04E61H 00000H @@RLINIT i2c_twl 04E3DH 00000H
@@RLINIT led 04E61H 00000H @@RLINIT led 04E3DH 00000H
@@RLINIT rtc 04E61H 00000H @@RLINIT rtc 04E3DH 00000H
@@RLINIT vreg_ctr 04E61H 00000H @@RLINIT vreg_ctr 04E3DH 00000H
@@RLINIT vreg_twl 04E61H 00000H @@RLINIT vreg_twl 04E3DH 00000H
@@RLINIT adc 04E61H 00000H @@RLINIT adc 04E3DH 00000H
@@RLINIT renge 04E61H 00000H @@RLINIT renge 04E3DH 00000H
@@RLINIT accero 04E61H 00000H @@RLINIT accero 04E3DH 00000H
@@RLINIT self_flash @@RLINIT self_flash
04E61H 00000H 04E3DH 00000H
@@RLINIT sw 04E61H 00000H @@RLINIT sw 04E3DH 00000H
@@RLINIT task_debug @@RLINIT task_debug
04E61H 00000H 04E3DH 00000H
@@RLINIT task_misc @@RLINIT task_misc
04E61H 00000H 04E3DH 00000H
@@RLINIT task_sys 04E61H 00000H @@RLINIT task_sys 04E3DH 00000H
@@RLINIT pedo_alg_thre_det2 @@RLINIT pedo_alg_thre_det2
04E61H 00000H 04E3DH 00000H
@@RLINIT ini_VECT 04E61H 00000H @@RLINIT ini_VECT 04E3DH 00000H
@@RLINIT task_status @@RLINIT task_status
04E61H 00000H 04E3DH 00000H
@@RLINIT led_cam 04E61H 00000H @@RLINIT led_cam 04E3DH 00000H
@@RLINIT led_pow 04E61H 00000H @@RLINIT led_pow 04E3DH 00000H
@@RLINIT hal 04E61H 00000H @@RLINIT hal 04E3DH 00000H
@@RLINIT batt_params @@RLINIT batt_params
04E61H 00000H 04E3DH 00000H
@@RLINIT voltable 04E61H 00000H @@RLINIT voltable 04E3DH 00000H
@@RLINIT pedo_lpf_coeff @@RLINIT pedo_lpf_coeff
04E61H 00000H 04E3DH 00000H
@@RLINIT kanaria_c @@RLINIT kanaria_c
04E61H 00000H 04E3DH 00000H
@@RLINIT util_funcs @@RLINIT util_funcs
04E61H 00000H 04E3DH 00000H
@@RLINIT i2c_mcu-sub @@RLINIT i2c_mcu-sub
04E61H 00000H 04E3DH 00000H
@@RLINIT @rom 04E61H 00000H @@RLINIT @rom 04E3DH 00000H
@@CODEL 04E61H 00000H CSEG @@CODEL 04E3DH 00000H CSEG
@@CODEL pm 04E61H 00000H @@CODEL pm 04E3DH 00000H
@@CODEL i2c_ctr 04E61H 00000H @@CODEL i2c_ctr 04E3DH 00000H
@@CODEL main 04E61H 00000H @@CODEL main 04E3DH 00000H
@@CODEL magic 04E61H 00000H @@CODEL magic 04E3DH 00000H
@@CODEL i2c_twl 04E61H 00000H @@CODEL i2c_twl 04E3DH 00000H
@@CODEL led 04E61H 00000H @@CODEL led 04E3DH 00000H
@@CODEL rtc 04E61H 00000H @@CODEL rtc 04E3DH 00000H
@@CODEL vreg_ctr 04E61H 00000H @@CODEL vreg_ctr 04E3DH 00000H
@@CODEL vreg_twl 04E61H 00000H @@CODEL vreg_twl 04E3DH 00000H
@@CODEL adc 04E61H 00000H @@CODEL adc 04E3DH 00000H
@@CODEL renge 04E61H 00000H @@CODEL renge 04E3DH 00000H
@@CODEL accero 04E61H 00000H @@CODEL accero 04E3DH 00000H
@@CODEL sw 04E61H 00000H @@CODEL sw 04E3DH 00000H
@@CODEL task_misc @@CODEL task_misc
04E61H 00000H 04E3DH 00000H
@@CODEL task_sys 04E61H 00000H @@CODEL task_sys 04E3DH 00000H
@@CODEL pedo_alg_thre_det2 @@CODEL pedo_alg_thre_det2
04E61H 00000H 04E3DH 00000H
@@CODEL ini_VECT 04E61H 00000H @@CODEL ini_VECT 04E3DH 00000H
@@CODEL led_cam 04E61H 00000H @@CODEL led_cam 04E3DH 00000H
@@CODEL led_pow 04E61H 00000H @@CODEL led_pow 04E3DH 00000H
@@CODEL batt_params @@CODEL batt_params
04E61H 00000H 04E3DH 00000H
@@CODEL voltable 04E61H 00000H @@CODEL voltable 04E3DH 00000H
@@CODEL pedo_lpf_coeff @@CODEL pedo_lpf_coeff
04E61H 00000H 04E3DH 00000H
@@CODEL kanaria_c @@CODEL kanaria_c
04E61H 00000H 04E3DH 00000H
@@CODEL i2c_mcu-sub @@CODEL i2c_mcu-sub
04E61H 00000H 04E3DH 00000H
* gap * 04E61H 00001H * gap * 04E3DH 00001H
@@CNSTL 04E62H 0000AH CSEG PAGE64KP @@CNSTL 04E3EH 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04E62H 0000AH @@CNSTL @bcdtob 04E3EH 0000AH
@@R_INIT 04E6CH 0004CH CSEG UNIT64KP @@R_INIT 04E48H 0004AH CSEG UNIT64KP
@@R_INIT @cstart 04E6CH 00000H @@R_INIT @cstart 04E48H 00000H
@@R_INIT loader 04E6CH 00000H @@R_INIT loader 04E48H 00000H
@@R_INIT pm 04E6CH 00000H @@R_INIT pm 04E48H 00000H
@@R_INIT i2c_ctr 04E6CH 00000H @@R_INIT i2c_ctr 04E48H 00000H
@@R_INIT main 04E6CH 00000H @@R_INIT main 04E48H 00000H
@@R_INIT magic 04E6CH 00000H @@R_INIT magic 04E48H 00000H
@@R_INIT WDT 04E6CH 00000H @@R_INIT WDT 04E48H 00000H
@@R_INIT i2c_mcu 04E6CH 00000H @@R_INIT i2c_mcu 04E48H 00000H
@@R_INIT i2c_twl 04E6CH 00000H @@R_INIT i2c_twl 04E48H 00000H
@@R_INIT led 04E6CH 00000H @@R_INIT led 04E48H 00000H
@@R_INIT rtc 04E6CH 00000H @@R_INIT rtc 04E48H 00000H
@@R_INIT vreg_ctr 04E6CH 00000H @@R_INIT vreg_ctr 04E48H 00000H
@@R_INIT vreg_twl 04E6CH 00000H @@R_INIT vreg_twl 04E48H 00000H
@@R_INIT adc 04E6CH 0000CH @@R_INIT adc 04E48H 0000CH
@@R_INIT renge 04E78H 00014H @@R_INIT renge 04E54H 00014H
@@R_INIT accero 04E8CH 00000H @@R_INIT accero 04E68H 00000H
@@R_INIT self_flash @@R_INIT self_flash
04E8CH 00000H 04E68H 00000H
@@R_INIT sw 04E8CH 00000H @@R_INIT sw 04E68H 00000H
@@R_INIT task_debug @@R_INIT task_debug
04E8CH 00000H 04E68H 00000H
@@R_INIT task_misc @@R_INIT task_misc
04E8CH 00028H 04E68H 00026H
@@R_INIT task_sys 04EB4H 00000H @@R_INIT task_sys 04E8EH 00000H
@@R_INIT pedo_alg_thre_det2 @@R_INIT pedo_alg_thre_det2
04EB4H 00000H 04E8EH 00000H
@@R_INIT ini_VECT 04EB4H 00000H @@R_INIT ini_VECT 04E8EH 00000H
@@R_INIT task_status @@R_INIT task_status
04EB4H 00000H 04E8EH 00000H
@@R_INIT led_cam 04EB4H 00000H @@R_INIT led_cam 04E8EH 00000H
@@R_INIT led_pow 04EB4H 00004H @@R_INIT led_pow 04E8EH 00004H
@@R_INIT hal 04EB8H 00000H @@R_INIT hal 04E92H 00000H
@@R_INIT batt_params @@R_INIT batt_params
04EB8H 00000H 04E92H 00000H
@@R_INIT voltable 04EB8H 00000H @@R_INIT voltable 04E92H 00000H
@@R_INIT pedo_lpf_coeff @@R_INIT pedo_lpf_coeff
04EB8H 00000H 04E92H 00000H
@@R_INIT kanaria_c @@R_INIT kanaria_c
04EB8H 00000H 04E92H 00000H
@@R_INIT util_funcs @@R_INIT util_funcs
04EB8H 00000H 04E92H 00000H
@@R_INIT i2c_mcu-sub @@R_INIT i2c_mcu-sub
04EB8H 00000H 04E92H 00000H
@@R_INIT @rom 04EB8H 00000H @@R_INIT @rom 04E92H 00000H
@@R_INIS 04EB8H 00010H CSEG UNIT64KP @@R_INIS 04E92H 00010H CSEG UNIT64KP
@@R_INIS @cstart 04EB8H 00000H @@R_INIS @cstart 04E92H 00000H
@@R_INIS loader 04EB8H 00000H @@R_INIS loader 04E92H 00000H
@@R_INIS pm 04EB8H 00002H @@R_INIS pm 04E92H 00002H
@@R_INIS i2c_ctr 04EBAH 00002H @@R_INIS i2c_ctr 04E94H 00002H
@@R_INIS main 04EBCH 00000H @@R_INIS main 04E96H 00000H
@@R_INIS magic 04EBCH 00000H @@R_INIS magic 04E96H 00000H
@@R_INIS WDT 04EBCH 00000H @@R_INIS WDT 04E96H 00000H
@@R_INIS i2c_mcu 04EBCH 00000H @@R_INIS i2c_mcu 04E96H 00000H
@@R_INIS i2c_twl 04EBCH 00000H @@R_INIS i2c_twl 04E96H 00000H
@@R_INIS led 04EBCH 00000H @@R_INIS led 04E96H 00000H
@@R_INIS rtc 04EBCH 00000H @@R_INIS rtc 04E96H 00000H
@@R_INIS vreg_ctr 04EBCH 00000H @@R_INIS vreg_ctr 04E96H 00000H
@@R_INIS vreg_twl 04EBCH 00000H @@R_INIS vreg_twl 04E96H 00000H
@@R_INIS adc 04EBCH 00000H @@R_INIS adc 04E96H 00000H
@@R_INIS renge 04EBCH 00000H @@R_INIS renge 04E96H 00000H
@@R_INIS accero 04EBCH 00000H @@R_INIS accero 04E96H 00000H
@@R_INIS self_flash @@R_INIS self_flash
04EBCH 00000H 04E96H 00000H
@@R_INIS sw 04EBCH 00000H @@R_INIS sw 04E96H 00000H
@@R_INIS task_debug @@R_INIS task_debug
04EBCH 00000H 04E96H 00000H
@@R_INIS task_misc @@R_INIS task_misc
04EBCH 00000H 04E96H 00000H
@@R_INIS task_sys 04EBCH 00002H @@R_INIS task_sys 04E96H 00002H
@@R_INIS pedo_alg_thre_det2 @@R_INIS pedo_alg_thre_det2
04EBEH 00006H 04E98H 00006H
@@R_INIS ini_VECT 04EC4H 00000H @@R_INIS ini_VECT 04E9EH 00000H
@@R_INIS task_status @@R_INIS task_status
04EC4H 00000H 04E9EH 00000H
@@R_INIS led_cam 04EC4H 00002H @@R_INIS led_cam 04E9EH 00002H
@@R_INIS led_pow 04EC6H 00002H @@R_INIS led_pow 04EA0H 00002H
@@R_INIS hal 04EC8H 00000H @@R_INIS hal 04EA2H 00000H
@@R_INIS batt_params @@R_INIS batt_params
04EC8H 00000H 04EA2H 00000H
@@R_INIS voltable 04EC8H 00000H @@R_INIS voltable 04EA2H 00000H
@@R_INIS pedo_lpf_coeff @@R_INIS pedo_lpf_coeff
04EC8H 00000H 04EA2H 00000H
@@R_INIS kanaria_c @@R_INIS kanaria_c
04EC8H 00000H 04EA2H 00000H
@@R_INIS util_funcs @@R_INIS util_funcs
04EC8H 00000H 04EA2H 00000H
@@R_INIS i2c_mcu-sub @@R_INIS i2c_mcu-sub
04EC8H 00000H 04EA2H 00000H
@@R_INIS @rom 04EC8H 00000H @@R_INIS @rom 04EA2H 00000H
@@LCODEL 04EC8H 00022H CSEG @@LCODEL 04EA2H 00022H CSEG
@@LCODEL abs 04EC8H 00008H @@LCODEL abs 04EA2H 00008H
@@LCODEL memcpy_n 04ED0H 0001AH @@LCODEL memcpy_n 04EAAH 0001AH
* gap * 04EEAH 0010AH * gap * 04EC4H 00130H
MGC_VER 04FF4H 00002H CSEG AT MGC_VER 04FF4H 00002H CSEG AT
MGC_VER magic 04FF4H 00002H MGC_VER magic 04FF4H 00002H
MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL 04FF6H 0000AH CSEG AT
@ -606,7 +606,7 @@ Direc-file:bsr_mcu.dr
@@DATA i2c_mcu-sub @@DATA i2c_mcu-sub
FFCCCH 00000H FFCCCH 00000H
@@DATA @rom FFCCCH 00000H @@DATA @rom FFCCCH 00000H
@@INIT FFCCCH 0004CH DSEG BASEP @@INIT FFCCCH 0004AH DSEG BASEP
@@INIT @cstart FFCCCH 00000H @@INIT @cstart FFCCCH 00000H
@@INIT loader FFCCCH 00000H @@INIT loader FFCCCH 00000H
@@INIT pm FFCCCH 00000H @@INIT pm FFCCCH 00000H
@ -629,123 +629,123 @@ Direc-file:bsr_mcu.dr
@@INIT task_debug @@INIT task_debug
FFCECH 00000H FFCECH 00000H
@@INIT task_misc @@INIT task_misc
FFCECH 00028H FFCECH 00026H
@@INIT task_sys FFD14H 00000H @@INIT task_sys FFD12H 00000H
@@INIT pedo_alg_thre_det2 @@INIT pedo_alg_thre_det2
FFD14H 00000H FFD12H 00000H
@@INIT ini_VECT FFD14H 00000H @@INIT ini_VECT FFD12H 00000H
@@INIT task_status @@INIT task_status
FFD14H 00000H FFD12H 00000H
@@INIT led_cam FFD14H 00000H @@INIT led_cam FFD12H 00000H
@@INIT led_pow FFD14H 00004H @@INIT led_pow FFD12H 00004H
@@INIT hal FFD18H 00000H @@INIT hal FFD16H 00000H
@@INIT batt_params @@INIT batt_params
FFD18H 00000H FFD16H 00000H
@@INIT voltable FFD18H 00000H @@INIT voltable FFD16H 00000H
@@INIT pedo_lpf_coeff @@INIT pedo_lpf_coeff
FFD18H 00000H FFD16H 00000H
@@INIT kanaria FFD18H 00000H @@INIT kanaria FFD16H 00000H
@@INIT kanaria_c @@INIT kanaria_c
FFD18H 00000H FFD16H 00000H
@@INIT util_funcs @@INIT util_funcs
FFD18H 00000H FFD16H 00000H
@@INIT i2c_mcu-sub @@INIT i2c_mcu-sub
FFD18H 00000H FFD16H 00000H
@@INIT @rom FFD18H 00000H @@INIT @rom FFD16H 00000H
FSL_DATA FFD18H 00010H DSEG UNITP FSL_DATA FFD16H 00010H DSEG UNITP
FSL_DATA fsl_common FSL_DATA fsl_common
FFD18H 00010H FFD16H 00010H
@@INITL FFD28H 00000H DSEG UNIT64KP @@INITL FFD26H 00000H DSEG UNIT64KP
@@INITL loader FFD28H 00000H @@INITL loader FFD26H 00000H
@@INITL pm FFD28H 00000H @@INITL pm FFD26H 00000H
@@INITL i2c_ctr FFD28H 00000H @@INITL i2c_ctr FFD26H 00000H
@@INITL main FFD28H 00000H @@INITL main FFD26H 00000H
@@INITL magic FFD28H 00000H @@INITL magic FFD26H 00000H
@@INITL WDT FFD28H 00000H @@INITL WDT FFD26H 00000H
@@INITL i2c_mcu FFD28H 00000H @@INITL i2c_mcu FFD26H 00000H
@@INITL i2c_twl FFD28H 00000H @@INITL i2c_twl FFD26H 00000H
@@INITL led FFD28H 00000H @@INITL led FFD26H 00000H
@@INITL rtc FFD28H 00000H @@INITL rtc FFD26H 00000H
@@INITL vreg_ctr FFD28H 00000H @@INITL vreg_ctr FFD26H 00000H
@@INITL vreg_twl FFD28H 00000H @@INITL vreg_twl FFD26H 00000H
@@INITL adc FFD28H 00000H @@INITL adc FFD26H 00000H
@@INITL renge FFD28H 00000H @@INITL renge FFD26H 00000H
@@INITL accero FFD28H 00000H @@INITL accero FFD26H 00000H
@@INITL self_flash @@INITL self_flash
FFD28H 00000H FFD26H 00000H
@@INITL sw FFD28H 00000H @@INITL sw FFD26H 00000H
@@INITL task_debug @@INITL task_debug
FFD28H 00000H FFD26H 00000H
@@INITL task_misc @@INITL task_misc
FFD28H 00000H FFD26H 00000H
@@INITL task_sys FFD28H 00000H @@INITL task_sys FFD26H 00000H
@@INITL pedo_alg_thre_det2 @@INITL pedo_alg_thre_det2
FFD28H 00000H FFD26H 00000H
@@INITL ini_VECT FFD28H 00000H @@INITL ini_VECT FFD26H 00000H
@@INITL task_status @@INITL task_status
FFD28H 00000H FFD26H 00000H
@@INITL led_cam FFD28H 00000H @@INITL led_cam FFD26H 00000H
@@INITL led_pow FFD28H 00000H @@INITL led_pow FFD26H 00000H
@@INITL hal FFD28H 00000H @@INITL hal FFD26H 00000H
@@INITL batt_params @@INITL batt_params
FFD28H 00000H FFD26H 00000H
@@INITL voltable FFD28H 00000H @@INITL voltable FFD26H 00000H
@@INITL pedo_lpf_coeff @@INITL pedo_lpf_coeff
FFD28H 00000H FFD26H 00000H
@@INITL kanaria FFD28H 00000H @@INITL kanaria FFD26H 00000H
@@INITL kanaria_c @@INITL kanaria_c
FFD28H 00000H FFD26H 00000H
@@INITL util_funcs @@INITL util_funcs
FFD28H 00000H FFD26H 00000H
@@INITL i2c_mcu-sub @@INITL i2c_mcu-sub
FFD28H 00000H FFD26H 00000H
@@INITL @rom FFD28H 00000H @@INITL @rom FFD26H 00000H
@@DATAL FFD28H 00000H DSEG UNIT64KP @@DATAL FFD26H 00000H DSEG UNIT64KP
@@DATAL loader FFD28H 00000H @@DATAL loader FFD26H 00000H
@@DATAL pm FFD28H 00000H @@DATAL pm FFD26H 00000H
@@DATAL i2c_ctr FFD28H 00000H @@DATAL i2c_ctr FFD26H 00000H
@@DATAL main FFD28H 00000H @@DATAL main FFD26H 00000H
@@DATAL magic FFD28H 00000H @@DATAL magic FFD26H 00000H
@@DATAL WDT FFD28H 00000H @@DATAL WDT FFD26H 00000H
@@DATAL i2c_mcu FFD28H 00000H @@DATAL i2c_mcu FFD26H 00000H
@@DATAL i2c_twl FFD28H 00000H @@DATAL i2c_twl FFD26H 00000H
@@DATAL led FFD28H 00000H @@DATAL led FFD26H 00000H
@@DATAL rtc FFD28H 00000H @@DATAL rtc FFD26H 00000H
@@DATAL vreg_ctr FFD28H 00000H @@DATAL vreg_ctr FFD26H 00000H
@@DATAL vreg_twl FFD28H 00000H @@DATAL vreg_twl FFD26H 00000H
@@DATAL adc FFD28H 00000H @@DATAL adc FFD26H 00000H
@@DATAL renge FFD28H 00000H @@DATAL renge FFD26H 00000H
@@DATAL accero FFD28H 00000H @@DATAL accero FFD26H 00000H
@@DATAL self_flash @@DATAL self_flash
FFD28H 00000H FFD26H 00000H
@@DATAL sw FFD28H 00000H @@DATAL sw FFD26H 00000H
@@DATAL task_debug @@DATAL task_debug
FFD28H 00000H FFD26H 00000H
@@DATAL task_misc @@DATAL task_misc
FFD28H 00000H FFD26H 00000H
@@DATAL task_sys FFD28H 00000H @@DATAL task_sys FFD26H 00000H
@@DATAL pedo_alg_thre_det2 @@DATAL pedo_alg_thre_det2
FFD28H 00000H FFD26H 00000H
@@DATAL ini_VECT FFD28H 00000H @@DATAL ini_VECT FFD26H 00000H
@@DATAL task_status @@DATAL task_status
FFD28H 00000H FFD26H 00000H
@@DATAL led_cam FFD28H 00000H @@DATAL led_cam FFD26H 00000H
@@DATAL led_pow FFD28H 00000H @@DATAL led_pow FFD26H 00000H
@@DATAL hal FFD28H 00000H @@DATAL hal FFD26H 00000H
@@DATAL batt_params @@DATAL batt_params
FFD28H 00000H FFD26H 00000H
@@DATAL voltable FFD28H 00000H @@DATAL voltable FFD26H 00000H
@@DATAL pedo_lpf_coeff @@DATAL pedo_lpf_coeff
FFD28H 00000H FFD26H 00000H
@@DATAL kanaria FFD28H 00000H @@DATAL kanaria FFD26H 00000H
@@DATAL kanaria_c @@DATAL kanaria_c
FFD28H 00000H FFD26H 00000H
@@DATAL util_funcs @@DATAL util_funcs
FFD28H 00000H FFD26H 00000H
@@DATAL i2c_mcu-sub @@DATAL i2c_mcu-sub
FFD28H 00000H FFD26H 00000H
@@DATAL @rom FFD28H 00000H @@DATAL @rom FFD26H 00000H
* gap * FFD28H 000D8H * gap * FFD26H 000DAH
MEMORY=RAM2 MEMORY=RAM2
BASE ADDRESS=FFE20H SIZE=000C0H BASE ADDRESS=FFE20H SIZE=000C0H

2
trunk/config.h
View File

@ -7,7 +7,7 @@
*/ */
#define MCU_VER_MAJOR 0x02 #define MCU_VER_MAJOR 0x02
#define MCU_VER_MINOR 0x16 #define MCU_VER_MINOR 0x17
// デバッグ向けスイッチ // デバッグ向けスイッチ

BIN
trunk/hoge.bin
View File

Binary file not shown.

2
trunk/loader.c
View File

@ -251,7 +251,7 @@ void hdwinit( void )
CMC = bits8(0,0,0,1, 0,0,0,0); /* X1発振せず(入力ポート)、XT1使用、超低電力発振は不安定に付き通常で */ CMC = bits8(0,0,0,1, 0,0,0,0); /* X1発振せず(入力ポート)、XT1使用、超低電力発振は不安定に付き通常で */
CSC = bits8(1,0,0,0, 0,0,0,0); /* X1発振なし、XT1発振あり、高速内蔵発振動作 */ CSC = bits8(1,0,0,0, 0,0,0,0); /* X1発振なし、XT1発振あり、高速内蔵発振動作 */
OSMC = 0x01; /* 隠しレジスタ */ OSMC = bits8(0,0,0,0, 0,0,0,1); /* 隠しレジスタ */
NOP();NOP();NOP(); // 3clk開ける NOP();NOP();NOP(); // 3clk開ける
CKC = bits8(0,0,0,0, 1,0,0,0); /* CPU/周辺クロック=fMAIN、fMAIN=fMX、fCLK=fMX */ CKC = bits8(0,0,0,0, 1,0,0,0); /* CPU/周辺クロック=fMAIN、fMAIN=fMX、fCLK=fMX */

54
trunk/pm.c
View File

@ -172,8 +172,24 @@ static void update_chg_led()
LED_CHARGE = temp_led_chg; LED_CHARGE = temp_led_chg;
// レジスタの充電中ビットはLEDに同期する // レジスタの充電中ビットはLEDに同期する。　と、割り込み
set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。 {
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 );
}
}
}
} }
@ -386,12 +402,14 @@ void BT_model_detect()
temp = get_adc( ADC_SEL_BATT_DET ); temp = get_adc( ADC_SEL_BATT_DET );
BT_DET_P = 0; BT_DET_P = 0;
system_status.captureBox = 0; system_status.captureBox = false;
// プラットフォーム判定 // // プラットフォーム判定 //
if( raw_adc_temperature > 0xF0 ) if( raw_adc_temperature > 0xF0 )
{ {
// TS // // TS //
system_status.model = MODEL_TS_BOARD; 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 ) else if( raw_adc_temperature < 4 )
{ {
@ -402,7 +420,7 @@ void BT_model_detect()
if(( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) == 0x01 ) && if(( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) == 0x01 ) &&
( iic_mcu_result == I2C_ERR_OK )) ( iic_mcu_result == I2C_ERR_OK ))
{ {
system_status.captureBox = 1; system_status.captureBox = true;
} }
} }
else else
@ -458,6 +476,7 @@ void BT_model_detect()
#define MGIC_CMD_QUICKSTART 0x4000
/********************************************//** /********************************************//**
MGICクイックスタート（主にバグ対策） MGICクイックスタート（主にバグ対策）
***********************************************/ ***********************************************/
@ -466,7 +485,7 @@ static void BT_mgic_quick_start()
wait_ms( 10 ); // MGICの起動に掛かる wait_ms( 10 ); // MGICの起動に掛かる
// 0. バッテリ残量IC クイックスタート // 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 ); wait_ms( 150 );
} }
@ -818,14 +837,20 @@ err PM_LCD_on( )
{ {
err rv = ERR_ERR; err rv = ERR_ERR;
PM_VDDLCD_on( ); PM_VDDLCD_on( ); // 内部で CGS と AMO 切り替えてます
if( system_status.family == FAMILY_SPFL ) if( system_status.family == FAMILY_SPFL )
{ {
// SPFL ならアモルファスHV on を間に挟む
wait_ms( 10 );
SPFL_LCD_AMOL_HV_CONT = 1; 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 ); wait_ms( DELAY_PM_TSS_50B_AND_TCOM );
}
PM_TCOM_on( ); PM_TCOM_on( );
@ -869,21 +894,22 @@ void PM_LCD_off()
} }
// 液晶電源切る //
SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでもL縛りなので弊害なし
// 50msとか待つし、確認しましょうかね… // 50msとか待つし、確認しましょうかね…
if( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ) if( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 )
{ {
if( system_status.family == FAMILY_SPFL )
{
wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。
}
PM_TCOM_off(); PM_TCOM_off();
wait_ms( 1 ); wait_ms( 1 );
PM_TCOM_VCS_off( ); PM_TCOM_VCS_off( );
wait_ms( DELAY_PM_LCD_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( ); // 残ってたの全部止めます。 PM_VDDLCD_off( ); // 残ってたの全部止めます。
vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW; vreg_ctr[VREG_C_STATUS] &= ~REG_BIT_LCD_POW;
} }

21
trunk/task_status.c
View File

@ -51,26 +51,6 @@ void tsk_status( )
{ {
state_old = vreg_ctr[VREG_C_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 ) if( diff & REG_BIT_ST_SHELL_OPEN )
{ {
// 蓋の開け閉め // 蓋の開け閉め
@ -81,7 +61,6 @@ void tsk_status( )
else else
{ {
set_irq( VREG_C_IRQ0, REG_BIT_SHELL_CLOSE ); set_irq( VREG_C_IRQ0, REG_BIT_SHELL_CLOSE );
}
} }
} }
} }

7
trunk/task_sys.c
View File

@ -452,7 +452,7 @@ void tsk_sys( )
#ifdef _DBG_CHK_OFF_LEAK_ #ifdef _DBG_CHK_OFF_LEAK_
leak_check(); leak_check();
#endif #endif
CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzに落としてからSTOPしなくてはならない CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzに落として(bit0)からSTOPしなくてはならない
OSMC = bits8(0,0,0,0, 0,0,0,0); // 5MHz以下モードへ。 OSMC = bits8(0,0,0,0, 0,0,0,0); // 5MHz以下モードへ。
if( PM_EXTDC_n_RAW ) // きわどいタイミングで挿抜が起きることがある。HAL通さないべき（off中ですし） if( PM_EXTDC_n_RAW ) // きわどいタイミングで挿抜が起きることがある。HAL通さないべき（off中ですし）
@ -466,12 +466,11 @@ void tsk_sys( )
// ・RTCアラーム（現在封印） // ・RTCアラーム（現在封印）
// クロック復帰 // クロック復帰
OSMC = bits8(1,0,0,0, 0,0,0,0); // 8MHz動作準備 OSMC = bits8(0,0,0,0, 0,0,0,1); // 8MHz動作準備
renge_flg_interval = 0; renge_flg_interval = 0;
hal_update(); hal_update();
CKC = bits8(0,0,0,0, 1,0,0,0); // FSEL = 1 後3clk以上開ける CKC = bits8(0,0,0,0, 1,0,0,0); // OSMC.FSEL = 1 後3clk以上開ける
// 起きた理由は？ // 起きた理由は？
if( !PM_EXTDC_n ){ if( !PM_EXTDC_n ){

35
trunk/yav_mcu_bsr.plg
View File

@ -1,11 +1,40 @@
C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c
"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 loader.c
loader.c(160) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(161) : 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\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 i2c_ctr.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\i2c_ctr.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 magic.c "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 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 (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\magic.asm "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\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 (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 i2c_mcu-sub.c "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 i2c_twl.c
Compilation 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\i2c_mcu-sub.asm "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\i2c_twl.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 led.c
led.c(90) : CC78K0R warning W0745: Expected function prototype
led.c(356) : 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\led.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(382) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(384) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(396) : 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
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. 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 i2c_mcu-sub.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 i2c_mcu-sub.rel
RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K'
@ -32,4 +61,4 @@ intel-HEX to bsr bin converter
file converted! file converted!
Build Total error(s) : 0 Total warning(s) : 13 Build Total error(s) : 0 Total warning(s) : 22