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

led.c 停止時のLED強制消灯周りをリファクタリング

Browse Source 
PM.c　LCD電源断時のシーケンスを修正　
　　　起動時のCODECのレジスタ初期化の仕様を変更（可能か限りSPIで行う）
sw.c　電源スイッチクリック割り込みを入れるまでの、押し続けなければいけない時間を修正（仕様確定）
task_misc.c　CODECのリセット後のVol更新をマイコンが適当に行うのではなく、コマンドを待つように仕様変更
task_sys.c　本体電源off中にアダプタのチェックを怠っていた。　off中にアダプタを抜いたりすると期待通りの動作でになっていないケースがあった
led.c　お知らせのパターンを書き込み中（4バイト目以降）はパターンの０を再生するよう変更


git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@227 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
N2232 2010-09-08 05:49:52 +00:00
parent 15006d7393
commit 6fed3efe31
18 changed files with 1421 additions and 1577 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

642
trunk/bsr_k0r.map
View File

@ -1,20 +1,20 @@
78K0R Linker W1.33 Date:12 Aug 2010 Page: 1 78K0R Linker W1.31 Date: 8 Sep 2010 Page: 1
Command: -yd:\program files\nec electronics tools\dev -_msgoff -obsr.l Command: -yC:\Program Files\NEC Electronics Tools\DEV -_msgoff -obsr.l
mf ..\..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2 mf ..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10
.12\lib78k0r\s0rm.rel -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map \lib78k0r\s0rm.rel -go85h,0FC00h,1024 -gi1B339499E033F240BFAA
-nkd -gb0FEFBFFh -bC:\Program Files\NEC Electronics Tools\FS h -pbsr_k0r.map -nkd -gb0FEFBFFh -bC:\Program Files\NEC Elect
L78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0rm.l ronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib -bcl0rd
ib -bcl0rmf.lib -iD:\Program Files\NEC Electronics Tools\CC78 m.lib -bcl0rm.lib -bcl0rmf.lib -iC:\Program Files\NEC Electro
K0R\W2.12\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ nics Tools\CC78K0R\W2.10\lib78k0r -dbsr_mcu.dr -s -w0 loader.
ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel le rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel
d.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel acc i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.re
ero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel ta l renge.rel accero.rel self_flash.rel sw.rel task_debug.rel t
sk_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.re ask_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel
l task_status.rel
Para-file: Para-file:
Out-file: bsr.lmf Out-file: bsr.lmf
Map-file: bsr_k0r.map Map-file: bsr_k0r.map
@ -23,9 +23,9 @@ Direc-file:bsr_mcu.dr
*** Link information *** *** Link information ***
64 output segment(s) 66 output segment(s)
3E20H byte(s) real data 3E59H byte(s) real data
5492 symbol(s) defined 5510 symbol(s) defined
*** Memory map *** *** Memory map ***
@ -57,7 +57,8 @@ Direc-file:bsr_mcu.dr
LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL 00002H 00000H CSEG PAGE64KP
LDR_CNSL task_status LDR_CNSL task_status
00002H 00000H 00002H 00000H
* gap * 00002H 0000EH ??NMIROM 00002H 00002H CSEG
* gap * 00004H 0000CH
@@VECT10 00010H 00004H CSEG AT @@VECT10 00010H 00004H CSEG AT
@@VECT10 ini_VECT 00010H 00004H @@VECT10 ini_VECT 00010H 00004H
* gap * 00014H 00008H * gap * 00014H 00008H
@ -98,55 +99,56 @@ Direc-file:bsr_mcu.dr
LDR_CODL task_status LDR_CODL task_status
000C4H 00000H 000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG ?CSEGSI 000C4H 0000AH CSEG
LDR_CODE 000CEH 0090BH CSEG ?OCDSTAD 000CEH 0000AH CSEG
LDR_CODE loader 000CEH 001D9H LDR_CODE 000D8H 0090BH CSEG
LDR_CODE main 002A7H 0006EH LDR_CODE loader 000D8H 001D9H
LDR_CODE WDT 00315H 00000H LDR_CODE main 002B1H 0006EH
LDR_CODE i2c_mcu 00315H 002F1H LDR_CODE WDT 0031FH 00000H
LDR_CODE i2c_mcu 0031FH 002F1H
LDR_CODE self_flash LDR_CODE self_flash
00606H 0034DH 00610H 0034DH
LDR_CODE task_debug LDR_CODE task_debug
00953H 00001H 0095DH 00001H
LDR_CODE task_status LDR_CODE task_status
00954H 00085H 0095EH 00085H
FSL_CODE 009D9H 00322H CSEG FSL_CODE 009E3H 00322H CSEG
FSL_CODE fsl_block_cmd FSL_CODE fsl_block_cmd
009D9H 0002BH 009E3H 0002BH
FSL_CODE fsl_block_check FSL_CODE fsl_block_check
00A04H 00013H 00A0EH 00013H
FSL_CODE fsl_common FSL_CODE fsl_common
00A17H 0014FH 00A21H 0014FH
FSL_CODE fsl_reset FSL_CODE fsl_reset
00B66H 00001H 00B70H 00001H
FSL_CODE fsl_si_ibf FSL_CODE fsl_si_ibf
00B67H 00064H 00B71H 00064H
FSL_CODE fsl_phySwap FSL_CODE fsl_phySwap
00BCBH 0004DH 00BD5H 0004DH
FSL_CODE fsl_si_common FSL_CODE fsl_si_common
00C18H 00061H 00C22H 00061H
FSL_CODE fsl_swap 00C79H 00030H FSL_CODE fsl_swap 00C83H 00030H
FSL_CODE fsl_write FSL_CODE fsl_write
00CA9H 00052H 00CB3H 00052H
@@LCODE 00CFBH 002AFH CSEG @@LCODE 00D05H 002AFH CSEG
@@LCODE @cstart 00CFBH 0006DH @@LCODE @cstart 00D05H 0006DH
@@LCODE @imul 00D68H 00011H @@LCODE @imul 00D72H 00011H
@@LCODE @lumul 00D79H 0002BH @@LCODE @lumul 00D83H 0002BH
@@LCODE @isdiv 00DA4H 00022H @@LCODE @isdiv 00DAEH 00022H
@@LCODE @iudiv 00DC6H 0002DH @@LCODE @iudiv 00DD0H 0002DH
@@LCODE @isrem 00DF3H 00021H @@LCODE @isrem 00DFDH 00021H
@@LCODE @iurem 00E14H 0002FH @@LCODE @iurem 00E1EH 0002FH
@@LCODE @lsdiv 00E43H 00039H @@LCODE @lsdiv 00E4DH 00039H
@@LCODE @ludiv 00E7CH 0003FH @@LCODE @ludiv 00E86H 0003FH
@@LCODE @divuw 00EBBH 00034H @@LCODE @divuw 00EC5H 00034H
@@LCODE @ladd 00EEFH 0000FH @@LCODE @ladd 00EF9H 0000FH
@@LCODE @llsh 00EFEH 0001BH @@LCODE @llsh 00F08H 0001BH
@@LCODE @lursh 00F19H 0001FH @@LCODE @lursh 00F23H 0001FH
@@LCODE @iscmp 00F38H 0000CH @@LCODE @iscmp 00F42H 0000CH
@@LCODE @lscmp 00F44H 00014H @@LCODE @lscmp 00F4EH 00014H
@@LCODE @lband 00F58H 00014H @@LCODE @lband 00F62H 00014H
@@LCODE @bcdtob 00F6CH 0001AH @@LCODE @bcdtob 00F76H 0001AH
@@LCODE @bbcd 00F86H 00024H @@LCODE @bbcd 00F90H 00024H
* gap * 00FAAH 0004CH * gap * 00FB4H 00042H
MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH MGC_LOAD magic 00FF6H 0000AH
@ -192,7 +194,7 @@ Direc-file:bsr_mcu.dr
@@CNSTL @bcdtob 02000H 0000AH @@CNSTL @bcdtob 02000H 0000AH
@@CNSTL 0200AH 00010H CSEG PAGE64KP @@CNSTL 0200AH 00010H CSEG PAGE64KP
@@CNSTL @bbcd 0200AH 00010H @@CNSTL @bbcd 0200AH 00010H
@@R_INIT 0201AH 0003CH CSEG UNIT64KP @@R_INIT 0201AH 0003EH CSEG UNIT64KP
@@R_INIT @cstart 0201AH 00000H @@R_INIT @cstart 0201AH 00000H
@@R_INIT loader 0201AH 00000H @@R_INIT loader 0201AH 00000H
@@R_INIT pm 0201AH 00002H @@R_INIT pm 0201AH 00002H
@ -218,124 +220,124 @@ Direc-file:bsr_mcu.dr
0204AH 00000H 0204AH 00000H
@@R_INIT task_sys 0204AH 00002H @@R_INIT task_sys 0204AH 00002H
@@R_INIT pedo_alg_thre_det2 @@R_INIT pedo_alg_thre_det2
0204CH 00008H 0204CH 0000AH
@@R_INIT ini_VECT 02054H 00000H @@R_INIT ini_VECT 02056H 00000H
@@R_INIT task_status @@R_INIT task_status
02054H 00002H 02056H 00002H
@@R_INIT @rom 02056H 00000H @@R_INIT @rom 02058H 00000H
@@R_INIS 02056H 00000H CSEG UNIT64KP @@R_INIS 02058H 00000H CSEG UNIT64KP
@@R_INIS @cstart 02056H 00000H @@R_INIS @cstart 02058H 00000H
@@R_INIS loader 02056H 00000H @@R_INIS loader 02058H 00000H
@@R_INIS pm 02056H 00000H @@R_INIS pm 02058H 00000H
@@R_INIS i2c_ctr 02056H 00000H @@R_INIS i2c_ctr 02058H 00000H
@@R_INIS main 02056H 00000H @@R_INIS main 02058H 00000H
@@R_INIS magic 02056H 00000H @@R_INIS magic 02058H 00000H
@@R_INIS WDT 02056H 00000H @@R_INIS WDT 02058H 00000H
@@R_INIS i2c_mcu 02056H 00000H @@R_INIS i2c_mcu 02058H 00000H
@@R_INIS i2c_twl 02056H 00000H @@R_INIS i2c_twl 02058H 00000H
@@R_INIS led 02056H 00000H @@R_INIS led 02058H 00000H
@@R_INIS rtc 02056H 00000H @@R_INIS rtc 02058H 00000H
@@R_INIS vreg_ctr 02056H 00000H @@R_INIS vreg_ctr 02058H 00000H
@@R_INIS vreg_twl 02056H 00000H @@R_INIS vreg_twl 02058H 00000H
@@R_INIS adc 02056H 00000H @@R_INIS adc 02058H 00000H
@@R_INIS renge 02056H 00000H @@R_INIS renge 02058H 00000H
@@R_INIS accero 02056H 00000H @@R_INIS accero 02058H 00000H
@@R_INIS self_flash @@R_INIS self_flash
02056H 00000H 02058H 00000H
@@R_INIS sw 02056H 00000H @@R_INIS sw 02058H 00000H
@@R_INIS task_debug @@R_INIS task_debug
02056H 00000H 02058H 00000H
@@R_INIS task_misc @@R_INIS task_misc
02056H 00000H 02058H 00000H
@@R_INIS task_sys 02056H 00000H @@R_INIS task_sys 02058H 00000H
@@R_INIS pedo_alg_thre_det2 @@R_INIS pedo_alg_thre_det2
02056H 00000H 02058H 00000H
@@R_INIS ini_VECT 02056H 00000H @@R_INIS ini_VECT 02058H 00000H
@@R_INIS task_status @@R_INIS task_status
02056H 00000H 02058H 00000H
@@R_INIS @rom 02056H 00000H @@R_INIS @rom 02058H 00000H
@@CALT 02056H 00000H CSEG @@CALT 02058H 00000H CSEG
@@CALT @cstart 02056H 00000H @@CALT @cstart 02058H 00000H
@@CALT loader 02056H 00000H @@CALT loader 02058H 00000H
@@CALT pm 02056H 00000H @@CALT pm 02058H 00000H
@@CALT i2c_ctr 02056H 00000H @@CALT i2c_ctr 02058H 00000H
@@CALT main 02056H 00000H @@CALT main 02058H 00000H
@@CALT magic 02056H 00000H @@CALT magic 02058H 00000H
@@CALT WDT 02056H 00000H @@CALT WDT 02058H 00000H
@@CALT i2c_mcu 02056H 00000H @@CALT i2c_mcu 02058H 00000H
@@CALT i2c_twl 02056H 00000H @@CALT i2c_twl 02058H 00000H
@@CALT led 02056H 00000H @@CALT led 02058H 00000H
@@CALT rtc 02056H 00000H @@CALT rtc 02058H 00000H
@@CALT vreg_ctr 02056H 00000H @@CALT vreg_ctr 02058H 00000H
@@CALT vreg_twl 02056H 00000H @@CALT vreg_twl 02058H 00000H
@@CALT adc 02056H 00000H @@CALT adc 02058H 00000H
@@CALT renge 02056H 00000H @@CALT renge 02058H 00000H
@@CALT accero 02056H 00000H @@CALT accero 02058H 00000H
@@CALT self_flash @@CALT self_flash
02056H 00000H 02058H 00000H
@@CALT sw 02056H 00000H @@CALT sw 02058H 00000H
@@CALT task_debug @@CALT task_debug
02056H 00000H 02058H 00000H
@@CALT task_misc @@CALT task_misc
02056H 00000H 02058H 00000H
@@CALT task_sys 02056H 00000H @@CALT task_sys 02058H 00000H
@@CALT pedo_alg_thre_det2 @@CALT pedo_alg_thre_det2
02056H 00000H 02058H 00000H
@@CALT ini_VECT 02056H 00000H @@CALT ini_VECT 02058H 00000H
@@CALT task_status @@CALT task_status
02056H 00000H 02058H 00000H
@@RLINIT 02056H 00000H CSEG UNIT64KP @@RLINIT 02058H 00000H CSEG UNIT64KP
@@RLINIT loader 02056H 00000H @@RLINIT loader 02058H 00000H
@@RLINIT pm 02056H 00000H @@RLINIT pm 02058H 00000H
@@RLINIT i2c_ctr 02056H 00000H @@RLINIT i2c_ctr 02058H 00000H
@@RLINIT main 02056H 00000H @@RLINIT main 02058H 00000H
@@RLINIT magic 02056H 00000H @@RLINIT magic 02058H 00000H
@@RLINIT WDT 02056H 00000H @@RLINIT WDT 02058H 00000H
@@RLINIT i2c_mcu 02056H 00000H @@RLINIT i2c_mcu 02058H 00000H
@@RLINIT i2c_twl 02056H 00000H @@RLINIT i2c_twl 02058H 00000H
@@RLINIT led 02056H 00000H @@RLINIT led 02058H 00000H
@@RLINIT rtc 02056H 00000H @@RLINIT rtc 02058H 00000H
@@RLINIT vreg_ctr 02056H 00000H @@RLINIT vreg_ctr 02058H 00000H
@@RLINIT vreg_twl 02056H 00000H @@RLINIT vreg_twl 02058H 00000H
@@RLINIT adc 02056H 00000H @@RLINIT adc 02058H 00000H
@@RLINIT renge 02056H 00000H @@RLINIT renge 02058H 00000H
@@RLINIT accero 02056H 00000H @@RLINIT accero 02058H 00000H
@@RLINIT self_flash @@RLINIT self_flash
02056H 00000H 02058H 00000H
@@RLINIT sw 02056H 00000H @@RLINIT sw 02058H 00000H
@@RLINIT task_debug @@RLINIT task_debug
02056H 00000H 02058H 00000H
@@RLINIT task_misc @@RLINIT task_misc
02056H 00000H 02058H 00000H
@@RLINIT task_sys 02056H 00000H @@RLINIT task_sys 02058H 00000H
@@RLINIT pedo_alg_thre_det2 @@RLINIT pedo_alg_thre_det2
02056H 00000H 02058H 00000H
@@RLINIT ini_VECT 02056H 00000H @@RLINIT ini_VECT 02058H 00000H
@@RLINIT task_status @@RLINIT task_status
02056H 00000H 02058H 00000H
@@RLINIT @rom 02056H 00000H @@RLINIT @rom 02058H 00000H
@@CODEL 02056H 00000H CSEG @@CODEL 02058H 00000H CSEG
@@CODEL pm 02056H 00000H @@CODEL pm 02058H 00000H
@@CODEL i2c_ctr 02056H 00000H @@CODEL i2c_ctr 02058H 00000H
@@CODEL magic 02056H 00000H @@CODEL magic 02058H 00000H
@@CODEL i2c_twl 02056H 00000H @@CODEL i2c_twl 02058H 00000H
@@CODEL led 02056H 00000H @@CODEL led 02058H 00000H
@@CODEL rtc 02056H 00000H @@CODEL rtc 02058H 00000H
@@CODEL vreg_ctr 02056H 00000H @@CODEL vreg_ctr 02058H 00000H
@@CODEL vreg_twl 02056H 00000H @@CODEL vreg_twl 02058H 00000H
@@CODEL adc 02056H 00000H @@CODEL adc 02058H 00000H
@@CODEL renge 02056H 00000H @@CODEL renge 02058H 00000H
@@CODEL accero 02056H 00000H @@CODEL accero 02058H 00000H
@@CODEL sw 02056H 00000H @@CODEL sw 02058H 00000H
@@CODEL task_misc @@CODEL task_misc
02056H 00000H 02058H 00000H
@@CODEL task_sys 02056H 00000H @@CODEL task_sys 02058H 00000H
@@CODEL pedo_alg_thre_det2 @@CODEL pedo_alg_thre_det2
02056H 00000H 02058H 00000H
@@CODEL ini_VECT 02056H 00000H @@CODEL ini_VECT 02058H 00000H
@@LCODEL 02056H 00008H CSEG @@LCODEL 02058H 00008H CSEG
@@LCODEL abs 02056H 00008H @@LCODEL abs 02058H 00008H
* gap * 0205EH 000A2H * gap * 02060H 000A0H
MGC_MIMI 02100H 0000AH CSEG AT MGC_MIMI 02100H 0000AH CSEG AT
MGC_MIMI magic 02100H 0000AH MGC_MIMI magic 02100H 0000AH
@@CNST 0210AH 002BAH CSEG @@CNST 0210AH 002BAH CSEG
@ -368,53 +370,53 @@ Direc-file:bsr_mcu.dr
@@CNST ini_VECT 023C4H 00000H @@CNST ini_VECT 023C4H 00000H
@@CNST task_status @@CNST task_status
023C4H 00000H 023C4H 00000H
ROM_CODE 023C4H 026DFH CSEG ROM_CODE 023C4H 0270AH CSEG
ROM_CODE pm 023C4H 00A1EH ROM_CODE pm 023C4H 00A31H
ROM_CODE i2c_ctr 02DE2H 00060H ROM_CODE i2c_ctr 02DF5H 00060H
ROM_CODE i2c_twl 02E42H 0005EH ROM_CODE i2c_twl 02E55H 0005EH
ROM_CODE led 02EA0H 00503H ROM_CODE led 02EB3H 0050CH
ROM_CODE rtc 033A3H 000E3H ROM_CODE rtc 033BFH 000E0H
ROM_CODE vreg_ctr 03486H 00457H ROM_CODE vreg_ctr 0349FH 0047CH
ROM_CODE vreg_twl 038DDH 00122H ROM_CODE vreg_twl 0391BH 00122H
ROM_CODE adc 039FFH 002B9H ROM_CODE adc 03A3DH 002B9H
ROM_CODE renge 03CB8H 001C3H ROM_CODE renge 03CF6H 001C3H
ROM_CODE accero 03E7BH 0013DH ROM_CODE accero 03EB9H 0013DH
ROM_CODE sw 03FB8H 00117H ROM_CODE sw 03FF6H 00117H
ROM_CODE task_misc ROM_CODE task_misc
040CFH 001C1H 0410DH 001B5H
ROM_CODE task_sys 04290H 0030BH ROM_CODE task_sys 042C2H 0030EH
ROM_CODE pedo_alg_thre_det2 ROM_CODE pedo_alg_thre_det2
0459BH 00508H 045D0H 004FEH
@@BASE 04AA3H 00507H CSEG BASE @@BASE 04ACEH 00507H CSEG BASE
@@BASE loader 04AA3H 00000H @@BASE loader 04ACEH 00000H
@@BASE pm 04AA3H 0003FH @@BASE pm 04ACEH 0003FH
@@BASE i2c_ctr 04AE2H 00198H @@BASE i2c_ctr 04B0DH 00198H
@@BASE main 04C7AH 00000H @@BASE main 04CA5H 00000H
@@BASE magic 04C7AH 00000H @@BASE magic 04CA5H 00000H
@@BASE WDT 04C7AH 00000H @@BASE WDT 04CA5H 00000H
@@BASE i2c_mcu 04C7AH 000D9H @@BASE i2c_mcu 04CA5H 000D9H
@@BASE i2c_twl 04D53H 000CDH @@BASE i2c_twl 04D7EH 000CDH
@@BASE led 04E20H 00000H @@BASE led 04E4BH 00000H
@@BASE rtc 04E20H 00052H @@BASE rtc 04E4BH 00052H
@@BASE vreg_ctr 04E72H 00000H @@BASE vreg_ctr 04E9DH 00000H
@@BASE vreg_twl 04E72H 00000H @@BASE vreg_twl 04E9DH 00000H
@@BASE adc 04E72H 000B3H @@BASE adc 04E9DH 000B3H
@@BASE renge 04F25H 00000H @@BASE renge 04F50H 00000H
@@BASE accero 04F25H 0004AH @@BASE accero 04F50H 0004AH
@@BASE self_flash @@BASE self_flash
04F6FH 00000H 04F9AH 00000H
@@BASE sw 04F6FH 00000H @@BASE sw 04F9AH 00000H
@@BASE task_debug @@BASE task_debug
04F6FH 00000H 04F9AH 00000H
@@BASE task_misc @@BASE task_misc
04F6FH 00000H 04F9AH 00000H
@@BASE task_sys 04F6FH 00000H @@BASE task_sys 04F9AH 00000H
@@BASE pedo_alg_thre_det2 @@BASE pedo_alg_thre_det2
04F6FH 00000H 04F9AH 00000H
@@BASE ini_VECT 04F6FH 0003BH @@BASE ini_VECT 04F9AH 0003BH
@@BASE task_status @@BASE task_status
04FAAH 00000H 04FD5H 00000H
* gap * 04FAAH 0004CH * gap * 04FD5H 00021H
MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL 04FF6H 0000AH CSEG AT
MGC_TAIL magic 04FF6H 0000AH MGC_TAIL magic 04FF6H 0000AH
@ -453,7 +455,7 @@ Direc-file:bsr_mcu.dr
@@DATA task_status @@DATA task_status
FFD12H 00002H FFD12H 00002H
@@DATA @rom FFD14H 00000H @@DATA @rom FFD14H 00000H
@@INIT FFD14H 0003CH DSEG BASEP @@INIT FFD14H 0003EH DSEG BASEP
@@INIT @cstart FFD14H 00000H @@INIT @cstart FFD14H 00000H
@@INIT loader FFD14H 00000H @@INIT loader FFD14H 00000H
@@INIT pm FFD14H 00002H @@INIT pm FFD14H 00002H
@ -479,137 +481,137 @@ Direc-file:bsr_mcu.dr
FFD44H 00000H FFD44H 00000H
@@INIT task_sys FFD44H 00002H @@INIT task_sys FFD44H 00002H
@@INIT pedo_alg_thre_det2 @@INIT pedo_alg_thre_det2
FFD46H 00008H FFD46H 0000AH
@@INIT ini_VECT FFD4EH 00000H @@INIT ini_VECT FFD50H 00000H
@@INIT task_status @@INIT task_status
FFD4EH 00002H FFD50H 00002H
@@INIT @rom FFD50H 00000H @@INIT @rom FFD52H 00000H
@@INIS FFD50H 00000H DSEG UNITP @@INIS FFD52H 00000H DSEG UNITP
@@INIS @cstart FFD50H 00000H @@INIS @cstart FFD52H 00000H
@@INIS loader FFD50H 00000H @@INIS loader FFD52H 00000H
@@INIS pm FFD50H 00000H @@INIS pm FFD52H 00000H
@@INIS i2c_ctr FFD50H 00000H @@INIS i2c_ctr FFD52H 00000H
@@INIS main FFD50H 00000H @@INIS main FFD52H 00000H
@@INIS magic FFD50H 00000H @@INIS magic FFD52H 00000H
@@INIS WDT FFD50H 00000H @@INIS WDT FFD52H 00000H
@@INIS i2c_mcu FFD50H 00000H @@INIS i2c_mcu FFD52H 00000H
@@INIS i2c_twl FFD50H 00000H @@INIS i2c_twl FFD52H 00000H
@@INIS led FFD50H 00000H @@INIS led FFD52H 00000H
@@INIS rtc FFD50H 00000H @@INIS rtc FFD52H 00000H
@@INIS vreg_ctr FFD50H 00000H @@INIS vreg_ctr FFD52H 00000H
@@INIS vreg_twl FFD50H 00000H @@INIS vreg_twl FFD52H 00000H
@@INIS adc FFD50H 00000H @@INIS adc FFD52H 00000H
@@INIS renge FFD50H 00000H @@INIS renge FFD52H 00000H
@@INIS accero FFD50H 00000H @@INIS accero FFD52H 00000H
@@INIS self_flash @@INIS self_flash
FFD50H 00000H FFD52H 00000H
@@INIS sw FFD50H 00000H @@INIS sw FFD52H 00000H
@@INIS task_debug @@INIS task_debug
FFD50H 00000H FFD52H 00000H
@@INIS task_misc @@INIS task_misc
FFD50H 00000H FFD52H 00000H
@@INIS task_sys FFD50H 00000H @@INIS task_sys FFD52H 00000H
@@INIS pedo_alg_thre_det2 @@INIS pedo_alg_thre_det2
FFD50H 00000H FFD52H 00000H
@@INIS ini_VECT FFD50H 00000H @@INIS ini_VECT FFD52H 00000H
@@INIS task_status @@INIS task_status
FFD50H 00000H FFD52H 00000H
@@INIS @rom FFD50H 00000H @@INIS @rom FFD52H 00000H
@@DATS FFD50H 00000H DSEG UNITP @@DATS FFD52H 00000H DSEG UNITP
@@DATS @cstart FFD50H 00000H @@DATS @cstart FFD52H 00000H
@@DATS loader FFD50H 00000H @@DATS loader FFD52H 00000H
@@DATS pm FFD50H 00000H @@DATS pm FFD52H 00000H
@@DATS i2c_ctr FFD50H 00000H @@DATS i2c_ctr FFD52H 00000H
@@DATS main FFD50H 00000H @@DATS main FFD52H 00000H
@@DATS magic FFD50H 00000H @@DATS magic FFD52H 00000H
@@DATS WDT FFD50H 00000H @@DATS WDT FFD52H 00000H
@@DATS i2c_mcu FFD50H 00000H @@DATS i2c_mcu FFD52H 00000H
@@DATS i2c_twl FFD50H 00000H @@DATS i2c_twl FFD52H 00000H
@@DATS led FFD50H 00000H @@DATS led FFD52H 00000H
@@DATS rtc FFD50H 00000H @@DATS rtc FFD52H 00000H
@@DATS vreg_ctr FFD50H 00000H @@DATS vreg_ctr FFD52H 00000H
@@DATS vreg_twl FFD50H 00000H @@DATS vreg_twl FFD52H 00000H
@@DATS adc FFD50H 00000H @@DATS adc FFD52H 00000H
@@DATS renge FFD50H 00000H @@DATS renge FFD52H 00000H
@@DATS accero FFD50H 00000H @@DATS accero FFD52H 00000H
@@DATS self_flash @@DATS self_flash
FFD50H 00000H FFD52H 00000H
@@DATS sw FFD50H 00000H @@DATS sw FFD52H 00000H
@@DATS task_debug @@DATS task_debug
FFD50H 00000H FFD52H 00000H
@@DATS task_misc @@DATS task_misc
FFD50H 00000H FFD52H 00000H
@@DATS task_sys FFD50H 00000H @@DATS task_sys FFD52H 00000H
@@DATS pedo_alg_thre_det2 @@DATS pedo_alg_thre_det2
FFD50H 00000H FFD52H 00000H
@@DATS ini_VECT FFD50H 00000H @@DATS ini_VECT FFD52H 00000H
@@DATS task_status @@DATS task_status
FFD50H 00000H FFD52H 00000H
@@DATS @rom FFD50H 00000H @@DATS @rom FFD52H 00000H
FSL_DATA FFD50H 00010H DSEG UNITP FSL_DATA FFD52H 00010H DSEG UNITP
FSL_DATA fsl_common FSL_DATA fsl_common
FFD50H 00010H FFD52H 00010H
@@INITL FFD60H 00000H DSEG UNIT64KP @@INITL FFD62H 00000H DSEG UNIT64KP
@@INITL loader FFD60H 00000H @@INITL loader FFD62H 00000H
@@INITL pm FFD60H 00000H @@INITL pm FFD62H 00000H
@@INITL i2c_ctr FFD60H 00000H @@INITL i2c_ctr FFD62H 00000H
@@INITL main FFD60H 00000H @@INITL main FFD62H 00000H
@@INITL magic FFD60H 00000H @@INITL magic FFD62H 00000H
@@INITL WDT FFD60H 00000H @@INITL WDT FFD62H 00000H
@@INITL i2c_mcu FFD60H 00000H @@INITL i2c_mcu FFD62H 00000H
@@INITL i2c_twl FFD60H 00000H @@INITL i2c_twl FFD62H 00000H
@@INITL led FFD60H 00000H @@INITL led FFD62H 00000H
@@INITL rtc FFD60H 00000H @@INITL rtc FFD62H 00000H
@@INITL vreg_ctr FFD60H 00000H @@INITL vreg_ctr FFD62H 00000H
@@INITL vreg_twl FFD60H 00000H @@INITL vreg_twl FFD62H 00000H
@@INITL adc FFD60H 00000H @@INITL adc FFD62H 00000H
@@INITL renge FFD60H 00000H @@INITL renge FFD62H 00000H
@@INITL accero FFD60H 00000H @@INITL accero FFD62H 00000H
@@INITL self_flash @@INITL self_flash
FFD60H 00000H FFD62H 00000H
@@INITL sw FFD60H 00000H @@INITL sw FFD62H 00000H
@@INITL task_debug @@INITL task_debug
FFD60H 00000H FFD62H 00000H
@@INITL task_misc @@INITL task_misc
FFD60H 00000H FFD62H 00000H
@@INITL task_sys FFD60H 00000H @@INITL task_sys FFD62H 00000H
@@INITL pedo_alg_thre_det2 @@INITL pedo_alg_thre_det2
FFD60H 00000H FFD62H 00000H
@@INITL ini_VECT FFD60H 00000H @@INITL ini_VECT FFD62H 00000H
@@INITL task_status @@INITL task_status
FFD60H 00000H FFD62H 00000H
@@INITL @rom FFD60H 00000H @@INITL @rom FFD62H 00000H
@@DATAL FFD60H 00000H DSEG UNIT64KP @@DATAL FFD62H 00000H DSEG UNIT64KP
@@DATAL loader FFD60H 00000H @@DATAL loader FFD62H 00000H
@@DATAL pm FFD60H 00000H @@DATAL pm FFD62H 00000H
@@DATAL i2c_ctr FFD60H 00000H @@DATAL i2c_ctr FFD62H 00000H
@@DATAL main FFD60H 00000H @@DATAL main FFD62H 00000H
@@DATAL magic FFD60H 00000H @@DATAL magic FFD62H 00000H
@@DATAL WDT FFD60H 00000H @@DATAL WDT FFD62H 00000H
@@DATAL i2c_mcu FFD60H 00000H @@DATAL i2c_mcu FFD62H 00000H
@@DATAL i2c_twl FFD60H 00000H @@DATAL i2c_twl FFD62H 00000H
@@DATAL led FFD60H 00000H @@DATAL led FFD62H 00000H
@@DATAL rtc FFD60H 00000H @@DATAL rtc FFD62H 00000H
@@DATAL vreg_ctr FFD60H 00000H @@DATAL vreg_ctr FFD62H 00000H
@@DATAL vreg_twl FFD60H 00000H @@DATAL vreg_twl FFD62H 00000H
@@DATAL adc FFD60H 00000H @@DATAL adc FFD62H 00000H
@@DATAL renge FFD60H 00000H @@DATAL renge FFD62H 00000H
@@DATAL accero FFD60H 00000H @@DATAL accero FFD62H 00000H
@@DATAL self_flash @@DATAL self_flash
FFD60H 00000H FFD62H 00000H
@@DATAL sw FFD60H 00000H @@DATAL sw FFD62H 00000H
@@DATAL task_debug @@DATAL task_debug
FFD60H 00000H FFD62H 00000H
@@DATAL task_misc @@DATAL task_misc
FFD60H 00000H FFD62H 00000H
@@DATAL task_sys FFD60H 00000H @@DATAL task_sys FFD62H 00000H
@@DATAL pedo_alg_thre_det2 @@DATAL pedo_alg_thre_det2
FFD60H 00000H FFD62H 00000H
@@DATAL ini_VECT FFD60H 00000H @@DATAL ini_VECT FFD62H 00000H
@@DATAL task_status @@DATAL task_status
FFD60H 00000H FFD62H 00000H
@@DATAL @rom FFD60H 00000H @@DATAL @rom FFD62H 00000H
* gap * FFD60H 000A0H * gap * FFD62H 0009EH
MEMORY=RAM2 MEMORY=RAM2
BASE ADDRESS=FFE20H SIZE=000C0H BASE ADDRESS=FFE20H SIZE=000C0H
@ -626,25 +628,25 @@ Direc-file:bsr_mcu.dr
@@BITS i2c_mcu FFE20H.3 00000H.3 @@BITS i2c_mcu FFE20H.3 00000H.3
@@BITS i2c_twl FFE20H.6 00000H.0 @@BITS i2c_twl FFE20H.6 00000H.0
@@BITS led FFE20H.6 00000H.5 @@BITS led FFE20H.6 00000H.5
@@BITS rtc FFE21H.3 00000H.4 @@BITS rtc FFE21H.3 00000H.3
@@BITS vreg_ctr FFE21H.7 00000H.1 @@BITS vreg_ctr FFE21H.6 00000H.1
@@BITS vreg_twl FFE22H.0 00000H.0 @@BITS vreg_twl FFE21H.7 00000H.0
@@BITS adc FFE22H.0 00000H.4 @@BITS adc FFE21H.7 00000H.4
@@BITS renge FFE22H.4 00000H.2 @@BITS renge FFE22H.3 00000H.2
@@BITS accero FFE22H.6 00000H.0 @@BITS accero FFE22H.5 00000H.0
@@BITS self_flash @@BITS self_flash
FFE22H.6 00000H.0 FFE22H.5 00000H.0
@@BITS sw FFE22H.6 00000H.2 @@BITS sw FFE22H.5 00000H.2
@@BITS task_debug @@BITS task_debug
FFE23H.0 00000H.0 FFE22H.7 00000H.0
@@BITS task_misc @@BITS task_misc
FFE23H.0 00000H.3 FFE22H.7 00000H.3
@@BITS task_sys FFE23H.3 00000H.0 @@BITS task_sys FFE23H.2 00000H.0
@@BITS pedo_alg_thre_det2 @@BITS pedo_alg_thre_det2
FFE23H.3 00000H.1 FFE23H.2 00000H.1
@@BITS ini_VECT FFE23H.4 00000H.0 @@BITS ini_VECT FFE23H.3 00000H.0
@@BITS task_status @@BITS task_status
FFE23H.4 00000H.0 FFE23H.3 00000H.0
* gap * FFE24H 000B0H * gap * FFE24H 000B0H
@@SEGREG FFED4H 00004H DSEG AT @@SEGREG FFED4H 00004H DSEG AT
@@SEGREG @SEGREG FFED4H 00004H @@SEGREG @SEGREG FFED4H 00004H

2
trunk/config.h
View File

@ -14,7 +14,7 @@
//#define _DBG_FORCE_JIKKI_ //#define _DBG_FORCE_JIKKI_
#define MCU_VER_MAJOR 0x01 #define MCU_VER_MAJOR 0x01
#define MCU_VER_MINOR 0x05 #define MCU_VER_MINOR 0x06
//#define _MODEL_TEG2_ //#define _MODEL_TEG2_

BIN
trunk/hoge.bin
View File

Binary file not shown.

8
trunk/led.c
View File

@ -195,14 +195,12 @@ void LED_init( )
void LED_stop( ) void LED_stop( )
{ {
LED_duty_notify_red = 0;
LED_duty_notify_blu = 0;
LED_duty_notify_grn = 0;
TT0 = 0b0000000011101111; // 一斉停止（しないとだめ） TT0 = 0b0000000011101111; // 一斉停止（しないとだめ）
TOE0 = 0b0000000000000000; // TOxをタイマーモジュールが制御？(GPIOになる) TOE0 = 0b0000000000000000; // TOxをタイマーモジュールが制御？(GPIOになる)
TAU0EN = 0; TAU0EN = 0;
LED_pow_red = 0; LED_pow_red = 0;
LED_CAM = 0; LED_CAM = 0;
LED_old_pow_red = 0;
} }
@ -555,10 +553,12 @@ void tsk_led_notify( )
// 次のフレームに進める？ // 次のフレームに進める？
if( time_to_next_frame == 0 ) if( time_to_next_frame == 0 )
{ {
DBG_LED_on;
time_to_next_frame = info_LED.info_LED.term; time_to_next_frame = info_LED.info_LED.term;
if( frame >= NOTIFY_LED_TERM -1 ) if( frame >= NOTIFY_LED_TERM -1 )
{ {
DBG_LED2_on;
vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] |= REG_BIT_IN_LOOP; vreg_ctr[ VREG_C_LED_NOTIFY_FLAG ] |= REG_BIT_IN_LOOP;
if( info_LED.info_LED.last_loop != 255 ) // 255:無限ループ if( info_LED.info_LED.last_loop != 255 ) // 255:無限ループ
{ {
@ -586,6 +586,8 @@ void tsk_led_notify( )
LED_dim_status_info_B.delta = (( LED_dim_status_info_B.to - LED_dim_status_info_B.now ) ) / info_LED.info_LED.fade_time; LED_dim_status_info_B.delta = (( LED_dim_status_info_B.to - LED_dim_status_info_B.now ) ) / info_LED.info_LED.fade_time;
} }
DBG_LED_off;
DBG_LED2_off;
time_to_next_frame -= 1; time_to_next_frame -= 1;
} }
} }

83
trunk/pm.c
View File

@ -74,30 +74,8 @@ void tsk_batt( )
task_interval = (u8)( INTERVAL_TSK_BATT / SYS_INTERVAL_TICK ); task_interval = (u8)( INTERVAL_TSK_BATT / SYS_INTERVAL_TICK );
} }
// アダプタステータス更新 ///////// // アダプタステータス更新 /////////
{ pm_chk_adapter();
static u8 pm_extdc_old;
u8 temp_pm_extdc;
temp_pm_extdc = !PM_EXTDC_n; // volatileのため
if( pm_extdc_old != temp_pm_extdc )
{
pm_extdc_old = temp_pm_extdc;
if( temp_pm_extdc )
{
set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_CONNECT );
chg_led_override = (u8)( 1000 / INTERVAL_TSK_BATT / SYS_INTERVAL_TICK );
}
else
{
set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_DISC );
chg_led_override = 0;
}
}
}
// 充電 /////////////////////////// // 充電 ///////////////////////////
// 温度付きヒステリシス // 温度付きヒステリシス
@ -189,6 +167,36 @@ void tsk_batt( )
/********************************************************
アダプタの有無チェック
電源off中のアダプタ抜き差しで外から呼ばれるため分離
***********************************************************/
void pm_chk_adapter()
{
static u8 pm_extdc_old;
u8 temp_pm_extdc;
temp_pm_extdc = !PM_EXTDC_n; // volatileのため
if( pm_extdc_old != temp_pm_extdc )
{
pm_extdc_old = temp_pm_extdc;
if( temp_pm_extdc )
{
set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_CONNECT );
chg_led_override = (u8)( 1000 / INTERVAL_TSK_BATT / SYS_INTERVAL_TICK );
}
else
{
set_bit( 0, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );
set_irq( VREG_C_IRQ1, REG_BIT_BT_DC_DISC );
chg_led_override = 0;
}
}
}
/******************************************************** /********************************************************
電池関係の初期化 電池関係の初期化
@ -712,7 +720,7 @@ err PM_LCD_on( )
SND_DEPOP_SND_ENABLE; SND_DEPOP_SND_ENABLE;
return ( ERR_ERR ); return ( ERR_ERR );
} }
return ( ERR_SUCCESS ); return ( ERR_SUCCESS );
} }
// BSR // // BSR //
@ -741,6 +749,8 @@ void PM_LCD_off()
if( iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD ) != 0 ) if( iic_mcu_read_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD ) != 0 )
{ {
PM_TCOM_off();
wait_ms( 1 );
PM_TCOM_VCS_off( ); PM_TCOM_VCS_off( );
wait_ms( DELAY_PM_LCD_OFF ); wait_ms( DELAY_PM_LCD_OFF );
@ -894,15 +904,8 @@ err PM_sys_pow_on( )
FCRAM_RST_neg; FCRAM_RST_neg;
RESET2_neg; RESET2_neg;
{ codec_reg_init(); // CODEC 不定レジスタ初期化
wait_ms( 100 ); reg_shadow = 0; // 　〃　こんなところで...
// CODEC 不定レジスタ初期化
iic_mcu_write_a_byte_codec( CODEC_REG_PM, 0 );
iic_mcu_write_a_byte_codec( CODEC_REG_PM+1, 0 );
iic_mcu_write_a_byte_codec( CODEC_REG_PM+2, 0 );
reg_shadow = 0; // こんなところで...
}
return ( ERR_SUCCESS ); return ( ERR_SUCCESS );
} }
@ -1125,3 +1128,17 @@ task_status_immed tski_PM_BL_set()
return( ERR_FINISED ); return( ERR_FINISED );
} }
/**********************************************************
　reset2 で CODEC にリセットがかかり、レジスタが不定になるため
**********************************************************/
void codec_reg_init()
{
wait_ms( 100 );
{
iic_mcu_write_a_byte_codec( CODEC_REG_PM+2, 0 ); // SoC から書けず
vol_reset();
renge_task_immed_add( tski_vol_update );
}
}

4
trunk/pm.h
View File

@ -145,6 +145,9 @@ err PM_BL_set( u8 );
void BT_chk(); void BT_chk();
void BT_get_left(); void BT_get_left();
void pm_chk_adapter();
void codec_reg_init();
@ -195,6 +198,7 @@ task_status_immed tski_PM_BL_set();
#define PM_VDDLCD_on() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, PM_REG_BIT_VDDLCD )) #define PM_VDDLCD_on() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, PM_REG_BIT_VDDLCD ))
#define PM_TCOM_on() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, ( PM_REG_BIT_VDDLCD | PM_REG_BIT_LCD_TCOM ))) #define PM_TCOM_on() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, ( PM_REG_BIT_VDDLCD | PM_REG_BIT_LCD_TCOM )))
#define PM_VCS_on() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, ( PM_REG_BIT_VDDLCD | PM_REG_BIT_LCD_VCS | PM_REG_BIT_LCD_TCOM ))) #define PM_VCS_on() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, ( PM_REG_BIT_VDDLCD | PM_REG_BIT_LCD_VCS | PM_REG_BIT_LCD_TCOM )))
#define PM_TCOM_off() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, ( PM_REG_BIT_VDDLCD | PM_REG_BIT_LCD_VCS )))
#define PM_TCOM_VCS_off() PM_VDDLCD_on() #define PM_TCOM_VCS_off() PM_VDDLCD_on()
#define PM_VDDLCD_off() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, 0 ) ) #define PM_VDDLCD_off() ( iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_VDD_LCD, 0 ) )

5
trunk/sw.c
View File

@ -100,10 +100,7 @@ void tsk_sw( )
case ( BT_CHARGE ): case ( BT_CHARGE ):
case ( OFF ): case ( OFF ):
// 電源スイッチの監視 // // 電源スイッチの監視 //
// if( SW_pow_count == (u8)(16/(INTERVAL_TSK_SW / SYS_INTERVAL_TICK)) ) if( SW_pow_count == (u8)(160/(INTERVAL_TSK_SW / SYS_INTERVAL_TICK)) )
if( SW_pow_count == (u8)(50/(INTERVAL_TSK_SW / SYS_INTERVAL_TICK)) )
// if( SW_pow_count == (u8)(80/(INTERVAL_TSK_SW / SYS_INTERVAL_TICK)) )
// if( SW_pow_count == (u8)(160/(INTERVAL_TSK_SW / SYS_INTERVAL_TICK)) )
{ {
set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK );
} }

15
trunk/task_misc.c
View File

@ -205,19 +205,10 @@ task_status_immed do_command0( )
PM_reset_neg(); PM_reset_neg();
RESET2_neg; RESET2_neg;
vol_reset();
renge_task_immed_add( tski_vol_update );
twl_ntr_mode = 0; twl_ntr_mode = 0;
// 起動時以外はリセット不要
/* // CODEC 不定レジスタ初期化
// CODEC 不定レジスタ初期化 codec_reg_init();
wait_ms( 100 );
{
u8 codec_reg_init[3] = { 0,0,0 };
iic_mcu_write_codec( IIC_SLA_CODEC, CODEC_REG_PM, 3, codec_reg_init );
}
*/
} }
} }
/* /*

1
trunk/task_sys.c
View File

@ -336,6 +336,7 @@ void tsk_sys( )
system_status.poweron_reason = NONE; system_status.poweron_reason = NONE;
iic_mcu_stop( ); iic_mcu_stop( );
pm_chk_adapter();
PM_Chg_Stop(); PM_Chg_Stop();
bt_force_update = 1; bt_force_update = 1;

13
trunk/user_define.h
View File

@ -9,14 +9,19 @@
#ifdef _debug_led_ #ifdef _debug_led_
# define DBG_LED_on { PM2.1 = 0; P2.1 = 1; } # define DBG_LED_on { PM2.1 = 0; P2.1 = 1; }
//# define DBG_LED_off { PM2.1 = 1; P2.1 = 0; }
# define DBG_LED_off { P2.1 = 0; } # define DBG_LED_off { P2.1 = 0; }
# define DBG_LED_toggle ( P2.1 ^= 1 ) # define DBG_LED_toggle ( P2.1 ^= 1 )
# define DBG_LED2_on { PM2.2 = 0; P2.2 = 1; }
# define DBG_LED2_off { P2.2 = 0; }
# define DBG_LED2_toggle ( P2.2 ^= 1 )
#else #else
# define DBG_LED_on ; # define DBG_LED_on ;
# define DBG_LED_off ; # define DBG_LED_off ;
# define DBG_LED_toggle ; # define DBG_LED_toggle ;
# define DBG_LED2_on ;
# define DBG_LED2_off ;
# define DBG_LED2_toggle ;
#endif #endif
#ifdef _PMIC_CTR_ #ifdef _PMIC_CTR_
@ -117,16 +122,10 @@
// 充電せよ(out) // 充電せよ(out)
#ifdef _PMIC_CTR_
// 負論理です。注意。 // 負論理です。注意。
#define BT_CHG_ENABLE() ( P4.3 = 0 ) #define BT_CHG_ENABLE() ( P4.3 = 0 )
#define BT_CHG_DISABLE() ( P4.3 = 1 ) #define BT_CHG_DISABLE() ( P4.3 = 1 )
#define BT_CHG_Ena P4.3 #define BT_CHG_Ena P4.3
#else
#define BT_CHG_ENABLE() ( P4.2 = 0 )
#define BT_CHG_DISABLE() ( P4.2 = 1 )
#define BT_CHG_Ena P4.2
#endif
// 充電中(in) // 充電中(in)
#define BT_IN_CHG_n P5.1 #define BT_IN_CHG_n P5.1

4
trunk/vreg_ctr.c
View File

@ -193,6 +193,10 @@ void vreg_ctr_write( u8 adrs, u8 data )
case ( VREG_C_LED_NOTIFY_DATA ): case ( VREG_C_LED_NOTIFY_DATA ):
if( iic_burst_state < sizeof( uni_info_LED ) ) if( iic_burst_state < sizeof( uni_info_LED ) )
{ {
if(( iic_burst_state == 1 ) && ( data == 0 )) // fade_time == 0 ‹ÖŽ~
{
data = 1;
}
info_LED.bindata[ iic_burst_state ] = data; info_LED.bindata[ iic_burst_state ] = data;
iic_burst_state += 1; iic_burst_state += 1;
if( iic_burst_state > 4 ) // パターンを1文字でも書いた if( iic_burst_state > 4 ) // パターンを1文字でも書いた

172
trunk/yav_mcu_bsr.plg
View File

@ -1,178 +1,20 @@
C:\WINDOWS\system32\cmd.exe /c touch magic.c C:\WINDOWS\system32\cmd.exe /c touch magic.c
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no loader.c
loader.c(104) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(105) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no pm.c
pm.c(83) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(154) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(241) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
pm.c(461) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(561) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(562) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(668) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(704) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(733) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(808) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(816) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(971) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
pm.c(1038) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1041) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.h(97) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.h(97) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.h(98) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.h(98) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.h(99) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.h(99) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.h(100) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.h(101) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.h(102) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.h(103) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 24 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_ctr.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_ctr.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no main.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\main.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no magic.c "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -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\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm
Assembly complete, 0 error(s) and 0 warning(s) found. Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no WDT.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\WDT.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_mcu.c
i2c_mcu.c(205) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 1 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no i2c_twl.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_twl.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no led.c "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no led.c
led.c(108) : CC78K0R warning W0745: Expected function prototype led.c(108) : CC78K0R warning W0745: Expected function prototype
led.c(248) : CC78K0R warning W0401: Conversion may lose significant digits led.c(246) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(253) : CC78K0R warning W0401: Conversion may lose significant digits led.c(251) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(315) : CC78K0R warning W0401: Conversion may lose significant digits led.c(313) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(374) : CC78K0R warning W0401: Conversion may lose significant digits led.c(372) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(400) : CC78K0R warning W0401: Conversion may lose significant digits led.c(398) : CC78K0R warning W0401: Conversion may lose significant digits
led.c(574) : CC78K0R warning W0401: Conversion may lose significant digits led.c(574) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 7 warning(s) found. Compilation complete, 0 error(s) and 7 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\led.asm "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\led.asm
Assembly complete, 0 error(s) and 0 warning(s) found. Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no rtc.c "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb0FEFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\rtc.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no vreg_ctr.c
vreg_ctr.c(110) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(119) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(128) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(138) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(142) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(149) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(160) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(162) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(165) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(265) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(270) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(275) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(305) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(321) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_ctr.c(431) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
Compilation complete, 0 error(s) and 17 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_ctr.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no vreg_twl.c
vreg_twl.c(52) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_twl.c(65) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 3 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no adc.c
adc.c(126) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(132) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
adc.c(213) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(240) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(332) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(356) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
adc.c(375) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(453) : CC78K0R warning W0745: Expected function prototype
adc.c(482) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(487) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 10 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\adc.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no renge\renge.c
renge\renge.c(149) : CC78K0R warning W0411: Illegal pointer combination
renge\renge.c(157) : CC78K0R warning W0412: Illegal pointer combination in conditional expression
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\renge.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no accero.c
accero.c(242) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
Compilation complete, 0 error(s) and 1 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no self_flash.c
self_flash.c(214) : CC78K0R warning W0401: Conversion may lose significant digits
self_flash.c(255) : CC78K0R warning W0401: Conversion may lose significant digits
self_flash.c(256) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 3 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no sw.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\sw.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_debug.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_debug.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_misc.c
task_misc.c(91) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
task_misc.c(105) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
task_misc.c(209) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
task_misc.c(319) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 4 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_misc.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_sys.c
task_sys.c(184) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(442) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(444) : CC78K0R warning W0510: Pointer mismatch in function 'renge_task_immed_add'
Compilation complete, 0 error(s) and 3 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_sys.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c
pedo_alg_thre_det2.c(58) : CC78K0R warning W0745: Expected function prototype
pedo_alg_thre_det2.c(73) : CC78K0R warning W0401: Conversion may lose significant digits
pedo_alg_thre_det2.c(140) : CC78K0R warning W0401: Conversion may lose significant digits
pedo_alg_thre_det2.c(153) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 4 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pedo_alg_thre_det2.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no ini_VECT.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\ini_VECT.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -qvjl2w -sainter_asm -zpb -no task_status.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_status.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb0FEFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel
Link complete, 0 error(s) and 0 warning(s) found. Link complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf
Object Conversion Complete, 0 error(s) and 0 warning(s) found. Object Conversion Complete, 0 error(s) and 0 warning(s) found.
@ -182,4 +24,4 @@ intel-HEX to bsr bin converter
file converted! file converted!
Build Total error(s) : 0 Total warning(s) : 81 Build Total error(s) : 0 Total warning(s) : 7

90
trunk/yav_mcu_bsr.pri
View File

@ -78,10 +78,10 @@ Symbol Type=OFF
Language=C Language=C
Kanji=SJIS Kanji=SJIS
[Source] [Source]
Geometry=341, 106, 757, 1043 Geometry=5, 10, 877, 1043
Window=Normal Window=Normal
DispStart=17 DispStart=70
CaretPos=75,0 CaretPos=109,0
Mode=Normal Mode=Normal
DispFile= DispFile=
Address1= Address1=
@ -140,26 +140,18 @@ SaveStart=
SaveEnd= SaveEnd=
Accumulative=ON Accumulative=ON
[Source1] [Source1]
Geometry=25, 25, 757, 775 Geometry=0, 0, 1215, 933
Window=Normal Window=Normal
DispStart=88 DispStart=273
CaretPos=1,0 CaretPos=274,0
Mode=Normal Mode=Normal
DispFile=pedo_alg_thre_det2.c DispFile=pm.c
Accumulative=ON
[Source2]
Geometry=50, 50, 757, 1043
Window=Normal
DispStart=220
CaretPos=236,22
Mode=Normal
DispFile=vreg_ctr.c
Accumulative=ON Accumulative=ON
[Assemble] [Assemble]
Geometry=280, 96, 968, 626 Geometry=14, 194, 968, 626
Window=Normal Window=Normal
DispStart=759 DispStart=13342
CaretPos=759,27 CaretPos=13342,27
Address1= Address1=
Address2= Address2=
Address3= Address3=
@ -976,43 +968,27 @@ Count=0
Geometry=821, 0, 441, 702 Geometry=821, 0, 441, 702
Window=Normal Window=Normal
Boundary=18088086 Boundary=18088086
0=+acc_norm,P,N,A,-,1 0=.system_status,.,N,A,+,1
1=.info_LED,.,N,A,+,1 1=.info_LED,.,N,A,+,1
2=.vreg_ctr,P,N,A,+,1 2=.time_to_next_frame,P,N,A,+,1
3=.TDR06,P,S,A,+,1 Line=3
4=.LED_dim_status_sleep,.,N,A,+,1
5=.pu20,B,S,A,+,1
6=.work_vr_vol,.,N,A,+,1
7=.vol_data_ctr_tmp,P,N,A,+,1
8=.vol_data_ctr,P,N,A,+,1
9=.last_modifyer,P,N,A,+,1
10=.sent_index,P,N,A,+,1
11=.vreg_ctr,P,N,A,+,1
12=.P1.5,P,S,A,+,1
13=.TDR07,P,S,A,+,1
14=.info_led_override,P,N,A,+,1
15=.P12.0,P,S,A,+,1
16=.going_to_sleep,P,N,A,+,1
17=.system_status,.,N,A,+,1
18=.battery_manufacturer,P,N,A,+,1
Line=19
[Quick Watch] [Quick Watch]
0=TDR07,P,A,1 0=P7.5,P,A,1
1=TDR05,P,A,1 1=PM4.2,P,A,1
2=TDR02,P,A,1 2=vreg_twl,P,A,1
3=P4.,P,A,1 3=vreg_ctr[35],P,A,1
4=P4.2,P,A,1 4=vreg_ctr[11],P,A,1
5=P7.5,P,A,1 5=vreg_ctr[5],P,A,1
6=PM4.2,P,A,1 6=info_LED,P,A,1
7=vreg_twl,P,A,1 7=going_to_sleep,P,A,1
8=vreg_ctr[35],P,A,1 8=P12.0,P,A,1
9=vreg_ctr[11],P,A,1 9=vreg_ctr,P,A,1
10=vreg_ctr[5],P,A,1 10=acc_norm,P,A,1
11=info_LED,P,A,1 11=chg_led_override,P,A,1
12=going_to_sleep,P,A,1 12=temp_pm_extdc,P,A,1
13=P12.0,P,A,1 13=pm_extdc_old,P,A,1
14=vreg_ctr,P,A,1 14=time_to_next_frame,P,A,1
15=acc_norm,P,A,1 15=system_status,P,A,1
[Software Break] [Software Break]
Geometry=709, 826, 445, 260 Geometry=709, 826, 445, 260
Window=Normal Window=Normal
@ -1030,10 +1006,14 @@ Address2=pedo_alg_thre_det2.c#_pedometer+0x156
Window2=ASM Window2=ASM
Status2=ON Status2=ON
Name3=Swb00004 Name3=Swb00004
Address3=vreg_ctr.c#_vreg_ctr_write+0x27e Address3=vreg_ctr.c#_vreg_ctr_write+0x27c
Window3=ASM Window3=ASM
Status3=ON Status3=ON
Count=4 Name4=Swb00005
Address4=pm.c#_BT_model_detect+0xaf
Window4=ASM
Status4=ON
Count=5
[Reset] [Reset]
Debugger=ON Debugger=ON
Symbol=OFF Symbol=OFF

2
trunk/yav_mcu_bsr.prj
View File

@ -838,7 +838,7 @@ G=1
E=0 E=0
E0=flash.elk E0=flash.elk
E1=a.elk E1=a.elk
GO=0 GO=1
GOValue=85 GOValue=85
GOStart=FC00 GOStart=FC00
GOSizeValue=1024 GOSizeValue=1024

12
trunk/yav_mcu_bsr.prk
View File

@ -4,13 +4,13 @@ FrameX=21
FrameY=37 FrameY=37
FrameCX=1299 FrameCX=1299
FrameCY=1044 FrameCY=1044
OpenFile1=ProjectWindow OpenFile1=user_define.h,0,338,558,1582,1315,18,1,49,0
PrjPos=0,2,754,3,253 OpenFile2=OutputWindow
OpenFile2=user_define.h,0,242,242,1486,999,0,4,26,0
OpenFile3=config.h,0,142,136,1386,893,0,1,0,0
OpenFile4=sw.c,0,132,132,1376,889,35,103,34,0
OpenFile5=OutputWindow
OutputPos=0,491,1000,330,1535 OutputPos=0,491,1000,330,1535
OpenFile3=ProjectWindow
PrjPos=0,2,754,3,253
OpenFile4=led.c,0,504,84,1559,996,20,560,31,0
OpenFile5=pm.h,0,198,198,1442,924,24,139,24,0
ActivePRJ=yav_mcu_bsr.prj ActivePRJ=yav_mcu_bsr.prj
[ProjectWindow] [ProjectWindow]
ProjectWindowDispType=0 ProjectWindowDispType=0

20
trunk/yav_mcu_bsr.sdb
View File

@ -12,7 +12,7 @@ T=4c59543c
8=reboot.h 8=reboot.h
9=magic.h 9=magic.h
[pm.c] [pm.c]
T=4c6b7f45 T=4c7c5674
1=incs.h 1=incs.h
2=adc.h 2=adc.h
3=led.h 3=led.h
@ -36,7 +36,7 @@ T=4c5a5ef2
7=adc.h 7=adc.h
8=pool.h 8=pool.h
[magic.c] [magic.c]
T=4c6a68c8 T=4c844411
1=config.h 1=config.h
[WDT.c] [WDT.c]
T=4bf0d1e1 T=4bf0d1e1
@ -52,14 +52,14 @@ T=4c29c700
3=i2c_twl_defs.h 3=i2c_twl_defs.h
4=i2c_twl.h 4=i2c_twl.h
[led.c] [led.c]
T=4c6a65d3 T=4c8443fd
1=incs.h 1=incs.h
2=led.h 2=led.h
[rtc.c] [rtc.c]
T=4c6a678e T=4c6a678e
1=incs.h 1=incs.h
[vreg_ctr.c] [vreg_ctr.c]
T=4c6a63de T=4c7c53de
1=incs.h 1=incs.h
2=vreg_ctr.h 2=vreg_ctr.h
3=rtc.h 3=rtc.h
@ -107,7 +107,7 @@ T=4c59540f
6=magic.h 6=magic.h
7=pm.h 7=pm.h
[sw.c] [sw.c]
T=4c6a6942 T=4c6cdcfe
1=incs.h 1=incs.h
2=i2c_twl.h 2=i2c_twl.h
3=i2c_ctr.h 3=i2c_ctr.h
@ -122,7 +122,7 @@ T=4c4698f9
3=pm.h 3=pm.h
4=accero.h 4=accero.h
[task_misc.c] [task_misc.c]
T=4c6b7f45 T=4c7c5674
1=incs.h 1=incs.h
2=renge\renge.h 2=renge\renge.h
3=pm.h 3=pm.h
@ -131,7 +131,7 @@ T=4c6b7f45
6=i2c_mcu.h 6=i2c_mcu.h
7=led.h 7=led.h
[task_sys.c] [task_sys.c]
T=4c6a65d3 T=4c7b4f79
1=incs.h 1=incs.h
2=i2c_twl.h 2=i2c_twl.h
3=i2c_ctr.h 3=i2c_ctr.h
@ -176,9 +176,9 @@ T=4c119cde
T=4c075832 T=4c075832
1=config.h 1=config.h
[config.h] [config.h]
T=4c6a68bd T=4c84440f
[user_define.h] [user_define.h]
T=4c5a5ee5 T=4c84442a
[bsr_system.h] [bsr_system.h]
T=4c6b7f45 T=4c6b7f45
[renge\renge.h] [renge\renge.h]
@ -206,7 +206,7 @@ T=4bf0d1e0
[i2c_ctr.h] [i2c_ctr.h]
T=4bf0d1e1 T=4bf0d1e1
[pm.h] [pm.h]
T=4c5a5ed1 T=4c7c5680
[rtc.h] [rtc.h]
T=4bf0d1e1 T=4bf0d1e1
[reboot.h] [reboot.h]