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

HAL 電源アダプタ有無　論理間違い

Browse Source 
HWレジスタ初期化誤り修正
HAL 初期化忘れ　これにアップデートしてきたときに電源が切れるなど
アダプタを刺した瞬間に電源を切ると、充電LED5sec強制点灯の間、電源投入できなかったのを修正(この場合はLEDを消してしまう事に
電源投入したいとき、数回押さなくてはならない件、修正に問題があった
PINモニタ(拡張レジスタ） RBR追加
電源off時、ポート設定ミスを確認するコード追加 #define _DBG_CHK_OFF_LEAK_ で有効
SPFL MAXELLバッテリパラメータ追加
I2C_m のプルアップon/off 修正


git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@354 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2011-07-28 06:54:54 +00:00
parent a740ba6dd1
commit 3775d247c2
22 changed files with 1721 additions and 1795 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
branches/sim/batt_params.h
View File

@ -53,6 +53,7 @@ typedef struct
======================================================== */
const bt_param_ bt_param[ _BT_PARAM_NUM_ ] =
{
// ctr ////////////////////////////////////////////////
// BT_PARAM_CTR_MAXELL
{
{
@ -89,22 +90,23 @@ const bt_param_ bt_param[ _BT_PARAM_NUM_ ] =
{ 0x69, 0x67 },
},
// BT_PARAM_SPFL_MAXELL !!dummy!!
// spfl ///////////////////////////////////////////////
// BT_PARAM_SPFL_MAXELL
{
{
0xAE, 0xF0, 0xB4, 0x30, 0xB7, 0x40, 0xBA, 0x30,
0xBB, 0x50, 0xBB, 0xB0, 0xBC, 0x50, 0xBD, 0x10,
0xBD, 0x60, 0xBD, 0xB0, 0xBF, 0xE0, 0xC2, 0xB0,
0xC4, 0x20, 0xC7, 0xB0, 0xCA, 0xE0, 0xCE, 0x10,
0x01, 0xF0, 0x14, 0x10, 0x14, 0x20, 0x06, 0x30,
0x63, 0x90, 0x49, 0x00, 0x6E, 0x00, 0x77, 0x70,
0x7B, 0x00, 0x19, 0x00, 0x19, 0x00, 0x17, 0xF0,
0x1C, 0x60, 0x12, 0x00, 0x12, 0x00, 0x12, 0x00
0xA1, 0x20, 0xB7, 0x50, 0xB9, 0xD0, 0xBB, 0x00,
0xBC, 0x30, 0xBC, 0x60, 0xBC, 0xA0, 0xBD, 0x10,
0xBD, 0xC0, 0xBE, 0x70, 0xBF, 0xD0, 0xC2, 0xA0,
0xC4, 0x00, 0xC8, 0x50, 0xCC, 0x80, 0xD0, 0xB0,
0x01, 0xA0, 0x25, 0x10, 0x18, 0xB0, 0x17, 0xC0,
0x95, 0x20, 0x6F, 0xE0, 0x7C, 0x60, 0x35, 0x10,
0x35, 0x00, 0x37, 0xF0, 0x16, 0xF0, 0x1C, 0xA0,
0x17, 0x30, 0x11, 0xD0, 0x11, 0xF0, 0x11, 0xF0
},
2,
{ 92, (u8)(-256* 0.79), (u8)(-256* 4.35) },
0xD800,
{ 0xEA, 0xE8 }
{ 94, (u8)(-256* 0.35), (u8)(-256* 3.85) },
0xDAB0,
{ 0xF5, 0xF3 }
},
// BT_PARAM_SPFL_PANA !!dummy!!

1903
branches/sim/bsr.hex
View File

File diff suppressed because it is too large Load Diff

BIN
branches/sim/bsr.lmf
View File

Binary file not shown.

600
branches/sim/bsr_k0r.map
View File

@ -1,7 +1,7 @@
78K0R Linker W1.33 Date:20 Jul 2011 Page: 1
78K0R Linker W1.33 Date:27 Jul 2011 Page: 1
Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff -
obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool
@ -25,8 +25,8 @@ Direc-file:bsr_mcu.dr
*** Link information ***
69 output segment(s)
3D9AH byte(s) real data
6098 symbol(s) defined
3DE4H byte(s) real data
6164 symbol(s) defined
*** Memory map ***
@ -104,54 +104,54 @@ Direc-file:bsr_mcu.dr
LDR_CODL hal 000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG
?OCDSTAD 000CEH 0000AH CSEG
LDR_CODE 000D8H 00979H CSEG
LDR_CODE loader 000D8H 00193H
LDR_CODE main 0026BH 00042H
LDR_CODE WDT 002ADH 00000H
LDR_CODE i2c_mcu 002ADH 002ECH
LDR_CODE 000D8H 00976H CSEG
LDR_CODE loader 000D8H 00196H
LDR_CODE main 0026EH 00054H
LDR_CODE WDT 002C2H 00000H
LDR_CODE i2c_mcu 002C2H 002D4H
LDR_CODE self_flash
00599H 00373H
00596H 00373H
LDR_CODE task_debug
0090CH 00000H
00909H 00000H
LDR_CODE task_status
0090CH 00077H
LDR_CODE hal 00983H 000CEH
FSL_CODE 00A51H 00322H CSEG
00909H 00077H
LDR_CODE hal 00980H 000CEH
FSL_CODE 00A4EH 00322H CSEG
FSL_CODE fsl_block_cmd
00A51H 0002BH
00A4EH 0002BH
FSL_CODE fsl_block_check
00A7CH 00013H
00A79H 00013H
FSL_CODE fsl_common
00A8FH 0014FH
00A8CH 0014FH
FSL_CODE fsl_reset
00BDEH 00001H
00BDBH 00001H
FSL_CODE fsl_si_ibf
00BDFH 00064H
00BDCH 00064H
FSL_CODE fsl_phySwap
00C43H 0004DH
00C40H 0004DH
FSL_CODE fsl_si_common
00C90H 00061H
FSL_CODE fsl_swap 00CF1H 00030H
00C8DH 00061H
FSL_CODE fsl_swap 00CEEH 00030H
FSL_CODE fsl_write
00D21H 00052H
@@LCODE 00D73H 00277H CSEG
@@LCODE @cstart 00D73H 0006DH
@@LCODE @imul 00DE0H 00011H
@@LCODE @lumul 00DF1H 0002BH
@@LCODE @isdiv 00E1CH 00022H
@@LCODE @iudiv 00E3EH 0002DH
@@LCODE @isrem 00E6BH 00021H
@@LCODE @iurem 00E8CH 0002FH
@@LCODE @lsdiv 00EBBH 00039H
@@LCODE @ludiv 00EF4H 0003FH
@@LCODE @divuw 00F33H 00034H
@@LCODE @ladd 00F67H 0000FH
@@LCODE @llsh 00F76H 0001BH
@@LCODE @lursh 00F91H 0001FH
@@LCODE @iscmp 00FB0H 0000CH
@@LCODE @lband 00FBCH 00014H
@@LCODE @bcdtob 00FD0H 0001AH
* gap * 00FEAH 0000CH
00D1EH 00052H
@@LCODE 00D70H 00277H CSEG
@@LCODE @cstart 00D70H 0006DH
@@LCODE @imul 00DDDH 00011H
@@LCODE @lumul 00DEEH 0002BH
@@LCODE @isdiv 00E19H 00022H
@@LCODE @iudiv 00E3BH 0002DH
@@LCODE @isrem 00E68H 00021H
@@LCODE @iurem 00E89H 0002FH
@@LCODE @lsdiv 00EB8H 00039H
@@LCODE @ludiv 00EF1H 0003FH
@@LCODE @divuw 00F30H 00034H
@@LCODE @ladd 00F64H 0000FH
@@LCODE @llsh 00F73H 0001BH
@@LCODE @lursh 00F8EH 0001FH
@@LCODE @iscmp 00FADH 0000CH
@@LCODE @lband 00FB9H 00014H
@@LCODE @bcdtob 00FCDH 0001AH
* gap * 00FE7H 0000FH
MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH
@ -194,255 +194,257 @@ Direc-file:bsr_mcu.dr
@@CNST led_cam 0226CH 00000H
@@CNST led_pow 0226CH 00020H
@@CNST hal 0228CH 00000H
ROM_CODE 0228CH 026C1H CSEG
ROM_CODE pm 0228CH 009D8H
ROM_CODE i2c_ctr 02C64H 00062H
ROM_CODE i2c_twl 02CC6H 0005EH
ROM_CODE led 02D24H 00265H
ROM_CODE rtc 02F89H 000E0H
ROM_CODE vreg_ctr 03069H 0049AH
ROM_CODE vreg_twl 03503H 000F9H
ROM_CODE adc 035FCH 002B7H
ROM_CODE renge 038B3H 0018DH
ROM_CODE accero 03A40H 00147H
ROM_CODE sw 03B87H 00127H
ROM_CODE 0228CH 026F6H CSEG
ROM_CODE pm 0228CH 009DCH
ROM_CODE i2c_ctr 02C68H 00062H
ROM_CODE i2c_twl 02CCAH 0005EH
ROM_CODE led 02D28H 00265H
ROM_CODE rtc 02F8DH 000E0H
ROM_CODE vreg_ctr 0306DH 0049AH
ROM_CODE vreg_twl 03507H 000F9H
ROM_CODE adc 03600H 002B7H
ROM_CODE renge 038B7H 0018DH
ROM_CODE accero 03A44H 00158H
ROM_CODE sw 03B9CH 00127H
ROM_CODE task_misc
03CAEH 001EFH
ROM_CODE task_sys 03E9DH 0039AH
03CC3H 00213H
ROM_CODE task_sys 03ED6H 00396H
ROM_CODE pedo_alg_thre_det2
04237H 004DEH
ROM_CODE led_cam 04715H 000C1H
ROM_CODE led_pow 047D6H 00177H
@@BASE 0494DH 004A7H CSEG BASE
@@BASE loader 0494DH 00000H
@@BASE pm 0494DH 0003FH
@@BASE i2c_ctr 0498CH 00170H
@@BASE main 04AFCH 00000H
@@BASE magic 04AFCH 00000H
@@BASE WDT 04AFCH 00000H
@@BASE i2c_mcu 04AFCH 00098H
@@BASE i2c_twl 04B94H 000CBH
@@BASE led 04C5FH 00000H
@@BASE rtc 04C5FH 0005DH
@@BASE vreg_ctr 04CBCH 00000H
@@BASE vreg_twl 04CBCH 00000H
@@BASE adc 04CBCH 000B6H
@@BASE renge 04D72H 00000H
@@BASE accero 04D72H 0004AH
0426CH 004DEH
ROM_CODE led_cam 0474AH 000C1H
ROM_CODE led_pow 0480BH 00177H
@@BASE 04982H 004A7H CSEG BASE
@@BASE loader 04982H 00000H
@@BASE pm 04982H 0003FH
@@BASE i2c_ctr 049C1H 00170H
@@BASE main 04B31H 00000H
@@BASE magic 04B31H 00000H
@@BASE WDT 04B31H 00000H
@@BASE i2c_mcu 04B31H 00098H
@@BASE i2c_twl 04BC9H 000CBH
@@BASE led 04C94H 00000H
@@BASE rtc 04C94H 0005DH
@@BASE vreg_ctr 04CF1H 00000H
@@BASE vreg_twl 04CF1H 00000H
@@BASE adc 04CF1H 000B6H
@@BASE renge 04DA7H 00000H
@@BASE accero 04DA7H 0004AH
@@BASE self_flash
04DBCH 00000H
@@BASE sw 04DBCH 00000H
04DF1H 00000H
@@BASE sw 04DF1H 00000H
@@BASE task_debug
04DBCH 00000H
04DF1H 00000H
@@BASE task_misc
04DBCH 00000H
@@BASE task_sys 04DBCH 00000H
04DF1H 00000H
@@BASE task_sys 04DF1H 00000H
@@BASE pedo_alg_thre_det2
04DBCH 00000H
@@BASE ini_VECT 04DBCH 00038H
04DF1H 00000H
@@BASE ini_VECT 04DF1H 00038H
@@BASE task_status
04DF4H 00000H
@@BASE led_cam 04DF4H 00000H
@@BASE led_pow 04DF4H 00000H
@@BASE hal 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL @cstart 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL pm 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL led 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL rtc 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL adc 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL renge 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL accero 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL sw 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
04E29H 00000H
@@BASE led_cam 04E29H 00000H
@@BASE led_pow 04E29H 00000H
@@BASE hal 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL @cstart 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL pm 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL i2c_twl 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL led 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL rtc 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL adc 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL renge 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL accero 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL sw 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL task_misc
04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL task_sys 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL task_sys 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2
04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL led_cam 04DF4H 00000H
@@CNSTL 04DF4H 00000H CSEG PAGE64KP
@@CNSTL led_pow 04DF4H 00000H
@@CNSTL 04DF4H 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04DF4H 0000AH
@@R_INIT 04DFEH 00030H CSEG UNIT64KP
@@R_INIT @cstart 04DFEH 00000H
@@R_INIT loader 04DFEH 00000H
@@R_INIT pm 04DFEH 00002H
@@R_INIT i2c_ctr 04E00H 00000H
@@R_INIT main 04E00H 00000H
@@R_INIT magic 04E00H 00000H
@@R_INIT WDT 04E00H 00000H
@@R_INIT i2c_mcu 04E00H 00000H
@@R_INIT i2c_twl 04E00H 00000H
@@R_INIT led 04E00H 00000H
@@R_INIT rtc 04E00H 00000H
@@R_INIT vreg_ctr 04E00H 00000H
@@R_INIT vreg_twl 04E00H 00000H
@@R_INIT adc 04E00H 0000CH
@@R_INIT renge 04E0CH 00014H
@@R_INIT accero 04E20H 00000H
@@R_INIT self_flash
04E20H 00000H
@@R_INIT sw 04E20H 00002H
@@R_INIT task_debug
04E22H 00000H
@@R_INIT task_misc
04E22H 00000H
@@R_INIT task_sys 04E22H 00002H
@@R_INIT pedo_alg_thre_det2
04E24H 00006H
@@R_INIT ini_VECT 04E2AH 00000H
@@R_INIT task_status
04E2AH 00000H
@@R_INIT led_cam 04E2AH 00000H
@@R_INIT led_pow 04E2AH 00004H
@@R_INIT hal 04E2EH 00000H
@@R_INIT @rom 04E2EH 00000H
@@R_INIS 04E2EH 00008H CSEG UNIT64KP
@@R_INIS @cstart 04E2EH 00000H
@@R_INIS loader 04E2EH 00000H
@@R_INIS pm 04E2EH 00002H
@@R_INIS i2c_ctr 04E30H 00002H
@@R_INIS main 04E32H 00000H
@@R_INIS magic 04E32H 00000H
@@R_INIS WDT 04E32H 00000H
@@R_INIS i2c_mcu 04E32H 00000H
@@R_INIS i2c_twl 04E32H 00000H
@@R_INIS led 04E32H 00000H
@@R_INIS rtc 04E32H 00000H
@@R_INIS vreg_ctr 04E32H 00000H
@@R_INIS vreg_twl 04E32H 00000H
@@R_INIS adc 04E32H 00000H
@@R_INIS renge 04E32H 00000H
@@R_INIS accero 04E32H 00000H
@@R_INIS self_flash
04E32H 00000H
@@R_INIS sw 04E32H 00000H
@@R_INIS task_debug
04E32H 00000H
@@R_INIS task_misc
04E32H 00000H
@@R_INIS task_sys 04E32H 00000H
@@R_INIS pedo_alg_thre_det2
04E32H 00000H
@@R_INIS ini_VECT 04E32H 00000H
@@R_INIS task_status
04E32H 00000H
@@R_INIS led_cam 04E32H 00002H
@@R_INIS led_pow 04E34H 00002H
@@R_INIS hal 04E36H 00000H
@@R_INIS @rom 04E36H 00000H
@@CALT 04E36H 00000H CSEG
@@CALT @cstart 04E36H 00000H
@@CALT loader 04E36H 00000H
@@CALT pm 04E36H 00000H
@@CALT i2c_ctr 04E36H 00000H
@@CALT main 04E36H 00000H
@@CALT magic 04E36H 00000H
@@CALT WDT 04E36H 00000H
@@CALT i2c_mcu 04E36H 00000H
@@CALT i2c_twl 04E36H 00000H
@@CALT led 04E36H 00000H
@@CALT rtc 04E36H 00000H
@@CALT vreg_ctr 04E36H 00000H
@@CALT vreg_twl 04E36H 00000H
@@CALT adc 04E36H 00000H
@@CALT renge 04E36H 00000H
@@CALT accero 04E36H 00000H
04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL led_cam 04E29H 00000H
@@CNSTL 04E29H 00000H CSEG PAGE64KP
@@CNSTL led_pow 04E29H 00000H
@@CALT 04E29H 00000H CSEG
@@CALT @cstart 04E29H 00000H
@@CALT loader 04E29H 00000H
@@CALT pm 04E29H 00000H
@@CALT i2c_ctr 04E29H 00000H
@@CALT main 04E29H 00000H
@@CALT magic 04E29H 00000H
@@CALT WDT 04E29H 00000H
@@CALT i2c_mcu 04E29H 00000H
@@CALT i2c_twl 04E29H 00000H
@@CALT led 04E29H 00000H
@@CALT rtc 04E29H 00000H
@@CALT vreg_ctr 04E29H 00000H
@@CALT vreg_twl 04E29H 00000H
@@CALT adc 04E29H 00000H
@@CALT renge 04E29H 00000H
@@CALT accero 04E29H 00000H
@@CALT self_flash
04E36H 00000H
@@CALT sw 04E36H 00000H
04E29H 00000H
@@CALT sw 04E29H 00000H
@@CALT task_debug
04E36H 00000H
04E29H 00000H
@@CALT task_misc
04E36H 00000H
@@CALT task_sys 04E36H 00000H
04E29H 00000H
@@CALT task_sys 04E29H 00000H
@@CALT pedo_alg_thre_det2
04E36H 00000H
@@CALT ini_VECT 04E36H 00000H
04E29H 00000H
@@CALT ini_VECT 04E29H 00000H
@@CALT task_status
04E36H 00000H
@@CALT led_cam 04E36H 00000H
@@CALT led_pow 04E36H 00000H
@@CALT hal 04E36H 00000H
@@RLINIT 04E36H 00000H CSEG UNIT64KP
@@RLINIT loader 04E36H 00000H
@@RLINIT pm 04E36H 00000H
@@RLINIT i2c_ctr 04E36H 00000H
@@RLINIT main 04E36H 00000H
@@RLINIT magic 04E36H 00000H
@@RLINIT WDT 04E36H 00000H
@@RLINIT i2c_mcu 04E36H 00000H
@@RLINIT i2c_twl 04E36H 00000H
@@RLINIT led 04E36H 00000H
@@RLINIT rtc 04E36H 00000H
@@RLINIT vreg_ctr 04E36H 00000H
@@RLINIT vreg_twl 04E36H 00000H
@@RLINIT adc 04E36H 00000H
@@RLINIT renge 04E36H 00000H
@@RLINIT accero 04E36H 00000H
04E29H 00000H
@@CALT led_cam 04E29H 00000H
@@CALT led_pow 04E29H 00000H
@@CALT hal 04E29H 00000H
@@RLINIT 04E29H 00000H CSEG UNIT64KP
@@RLINIT loader 04E29H 00000H
@@RLINIT pm 04E29H 00000H
@@RLINIT i2c_ctr 04E29H 00000H
@@RLINIT main 04E29H 00000H
@@RLINIT magic 04E29H 00000H
@@RLINIT WDT 04E29H 00000H
@@RLINIT i2c_mcu 04E29H 00000H
@@RLINIT i2c_twl 04E29H 00000H
@@RLINIT led 04E29H 00000H
@@RLINIT rtc 04E29H 00000H
@@RLINIT vreg_ctr 04E29H 00000H
@@RLINIT vreg_twl 04E29H 00000H
@@RLINIT adc 04E29H 00000H
@@RLINIT renge 04E29H 00000H
@@RLINIT accero 04E29H 00000H
@@RLINIT self_flash
04E36H 00000H
@@RLINIT sw 04E36H 00000H
04E29H 00000H
@@RLINIT sw 04E29H 00000H
@@RLINIT task_debug
04E36H 00000H
04E29H 00000H
@@RLINIT task_misc
04E36H 00000H
@@RLINIT task_sys 04E36H 00000H
04E29H 00000H
@@RLINIT task_sys 04E29H 00000H
@@RLINIT pedo_alg_thre_det2
04E36H 00000H
@@RLINIT ini_VECT 04E36H 00000H
04E29H 00000H
@@RLINIT ini_VECT 04E29H 00000H
@@RLINIT task_status
04E36H 00000H
@@RLINIT led_cam 04E36H 00000H
@@RLINIT led_pow 04E36H 00000H
@@RLINIT hal 04E36H 00000H
@@RLINIT @rom 04E36H 00000H
@@CODEL 04E36H 00000H CSEG
@@CODEL pm 04E36H 00000H
@@CODEL i2c_ctr 04E36H 00000H
@@CODEL magic 04E36H 00000H
@@CODEL i2c_twl 04E36H 00000H
@@CODEL led 04E36H 00000H
@@CODEL rtc 04E36H 00000H
@@CODEL vreg_ctr 04E36H 00000H
@@CODEL vreg_twl 04E36H 00000H
@@CODEL adc 04E36H 00000H
@@CODEL renge 04E36H 00000H
@@CODEL accero 04E36H 00000H
@@CODEL sw 04E36H 00000H
04E29H 00000H
@@RLINIT led_cam 04E29H 00000H
@@RLINIT led_pow 04E29H 00000H
@@RLINIT hal 04E29H 00000H
@@RLINIT @rom 04E29H 00000H
@@CODEL 04E29H 00000H CSEG
@@CODEL pm 04E29H 00000H
@@CODEL i2c_ctr 04E29H 00000H
@@CODEL magic 04E29H 00000H
@@CODEL i2c_twl 04E29H 00000H
@@CODEL led 04E29H 00000H
@@CODEL rtc 04E29H 00000H
@@CODEL vreg_ctr 04E29H 00000H
@@CODEL vreg_twl 04E29H 00000H
@@CODEL adc 04E29H 00000H
@@CODEL renge 04E29H 00000H
@@CODEL accero 04E29H 00000H
@@CODEL sw 04E29H 00000H
@@CODEL task_misc
04E36H 00000H
@@CODEL task_sys 04E36H 00000H
04E29H 00000H
@@CODEL task_sys 04E29H 00000H
@@CODEL pedo_alg_thre_det2
04E36H 00000H
@@CODEL ini_VECT 04E36H 00000H
@@CODEL led_cam 04E36H 00000H
@@CODEL led_pow 04E36H 00000H
@@LCODEL 04E36H 00008H CSEG
@@LCODEL abs 04E36H 00008H
* gap * 04E3EH 001B6H
04E29H 00000H
@@CODEL ini_VECT 04E29H 00000H
@@CODEL led_cam 04E29H 00000H
@@CODEL led_pow 04E29H 00000H
* gap * 04E29H 00001H
@@CNSTL 04E2AH 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04E2AH 0000AH
@@R_INIT 04E34H 0002EH CSEG UNIT64KP
@@R_INIT @cstart 04E34H 00000H
@@R_INIT loader 04E34H 00000H
@@R_INIT pm 04E34H 00002H
@@R_INIT i2c_ctr 04E36H 00000H
@@R_INIT main 04E36H 00000H
@@R_INIT magic 04E36H 00000H
@@R_INIT WDT 04E36H 00000H
@@R_INIT i2c_mcu 04E36H 00000H
@@R_INIT i2c_twl 04E36H 00000H
@@R_INIT led 04E36H 00000H
@@R_INIT rtc 04E36H 00000H
@@R_INIT vreg_ctr 04E36H 00000H
@@R_INIT vreg_twl 04E36H 00000H
@@R_INIT adc 04E36H 0000CH
@@R_INIT renge 04E42H 00014H
@@R_INIT accero 04E56H 00000H
@@R_INIT self_flash
04E56H 00000H
@@R_INIT sw 04E56H 00000H
@@R_INIT task_debug
04E56H 00000H
@@R_INIT task_misc
04E56H 00000H
@@R_INIT task_sys 04E56H 00002H
@@R_INIT pedo_alg_thre_det2
04E58H 00006H
@@R_INIT ini_VECT 04E5EH 00000H
@@R_INIT task_status
04E5EH 00000H
@@R_INIT led_cam 04E5EH 00000H
@@R_INIT led_pow 04E5EH 00004H
@@R_INIT hal 04E62H 00000H
@@R_INIT @rom 04E62H 00000H
@@R_INIS 04E62H 00008H CSEG UNIT64KP
@@R_INIS @cstart 04E62H 00000H
@@R_INIS loader 04E62H 00000H
@@R_INIS pm 04E62H 00002H
@@R_INIS i2c_ctr 04E64H 00002H
@@R_INIS main 04E66H 00000H
@@R_INIS magic 04E66H 00000H
@@R_INIS WDT 04E66H 00000H
@@R_INIS i2c_mcu 04E66H 00000H
@@R_INIS i2c_twl 04E66H 00000H
@@R_INIS led 04E66H 00000H
@@R_INIS rtc 04E66H 00000H
@@R_INIS vreg_ctr 04E66H 00000H
@@R_INIS vreg_twl 04E66H 00000H
@@R_INIS adc 04E66H 00000H
@@R_INIS renge 04E66H 00000H
@@R_INIS accero 04E66H 00000H
@@R_INIS self_flash
04E66H 00000H
@@R_INIS sw 04E66H 00000H
@@R_INIS task_debug
04E66H 00000H
@@R_INIS task_misc
04E66H 00000H
@@R_INIS task_sys 04E66H 00000H
@@R_INIS pedo_alg_thre_det2
04E66H 00000H
@@R_INIS ini_VECT 04E66H 00000H
@@R_INIS task_status
04E66H 00000H
@@R_INIS led_cam 04E66H 00002H
@@R_INIS led_pow 04E68H 00002H
@@R_INIS hal 04E6AH 00000H
@@R_INIS @rom 04E6AH 00000H
@@LCODEL 04E6AH 00022H CSEG
@@LCODEL abs 04E6AH 00008H
@@LCODEL memcpy_n 04E72H 0001AH
* gap * 04E8CH 00168H
MGC_VER 04FF4H 00002H CSEG AT
MGC_VER magic 04FF4H 00002H
MGC_TAIL 04FF6H 0000AH CSEG AT
@ -452,7 +454,7 @@ Direc-file:bsr_mcu.dr
BASE ADDRESS=FF900H SIZE=00500H
OUTPUT INPUT INPUT BASE SIZE
SEGMENT SEGMENT MODULE ADDRESS
@@DATA FF900H 003F2H DSEG BASEP
@@DATA FF900H 003F4H DSEG BASEP
@@DATA @cstart FF900H 00002H
@@DATA loader FF902H 00000H
@@DATA pm FF902H 0000CH
@ -471,41 +473,41 @@ Direc-file:bsr_mcu.dr
@@DATA accero FFC40H 00002H
@@DATA self_flash
FFC42H 00002H
@@DATA sw FFC44H 00000H
@@DATA sw FFC44H 00002H
@@DATA task_debug
FFC44H 00000H
FFC46H 00000H
@@DATA task_misc
FFC44H 00002H
@@DATA task_sys FFC46H 00002H
FFC46H 00002H
@@DATA task_sys FFC48H 00002H
@@DATA pedo_alg_thre_det2
FFC48H 000A0H
@@DATA ini_VECT FFCE8H 00000H
FFC4AH 000A0H
@@DATA ini_VECT FFCEAH 00000H
@@DATA task_status
FFCE8H 00002H
@@DATA led_cam FFCEAH 00000H
@@DATA led_pow FFCEAH 00008H
@@DATA hal FFCF2H 00000H
@@DATA @rom FFCF2H 00000H
@@INIT FFCF2H 00030H DSEG BASEP
@@INIT @cstart FFCF2H 00000H
@@INIT loader FFCF2H 00000H
@@INIT pm FFCF2H 00002H
@@INIT i2c_ctr FFCF4H 00000H
@@INIT main FFCF4H 00000H
@@INIT magic FFCF4H 00000H
@@INIT WDT FFCF4H 00000H
@@INIT i2c_mcu FFCF4H 00000H
@@INIT i2c_twl FFCF4H 00000H
@@INIT led FFCF4H 00000H
@@INIT rtc FFCF4H 00000H
@@INIT vreg_ctr FFCF4H 00000H
@@INIT vreg_twl FFCF4H 00000H
@@INIT adc FFCF4H 0000CH
@@INIT renge FFD00H 00014H
@@INIT accero FFD14H 00000H
FFCEAH 00002H
@@DATA led_cam FFCECH 00000H
@@DATA led_pow FFCECH 00008H
@@DATA hal FFCF4H 00000H
@@DATA @rom FFCF4H 00000H
@@INIT FFCF4H 0002EH DSEG BASEP
@@INIT @cstart FFCF4H 00000H
@@INIT loader FFCF4H 00000H
@@INIT pm FFCF4H 00002H
@@INIT i2c_ctr FFCF6H 00000H
@@INIT main FFCF6H 00000H
@@INIT magic FFCF6H 00000H
@@INIT WDT FFCF6H 00000H
@@INIT i2c_mcu FFCF6H 00000H
@@INIT i2c_twl FFCF6H 00000H
@@INIT led FFCF6H 00000H
@@INIT rtc FFCF6H 00000H
@@INIT vreg_ctr FFCF6H 00000H
@@INIT vreg_twl FFCF6H 00000H
@@INIT adc FFCF6H 0000CH
@@INIT renge FFD02H 00014H
@@INIT accero FFD16H 00000H
@@INIT self_flash
FFD14H 00000H
@@INIT sw FFD14H 00002H
FFD16H 00000H
@@INIT sw FFD16H 00000H
@@INIT task_debug
FFD16H 00000H
@@INIT task_misc

6
branches/sim/bsr_system.h
View File

@ -17,7 +17,11 @@ enum pwr_state_
enum poweron_reason_
{
NONE = 0,
PWSW
RSN_PWSW,
RSN_RTC_ALARM,
RSN_RSV3,
RSN_RSV4,
RSN_RSV5
};

18
branches/sim/config.h
View File

@ -3,24 +3,24 @@
#define MCU_VER_MAJOR 0x01
#define MCU_VER_MINOR 0x37
#define MCU_VER_MINOR 0x38
// デバッグ向けスイッチ
//#define _debug_led_
//#define _ALLOW_NOBATT_
//#define _DBG_PEDO_AUTO_ENABLE_
//#define _DBG_LED_PRINT_
//#define _DBG_FORCE_FULLCOLOR_
//#define _PMIC_TEST_
//#define _debug_led_ // LED print デバッグをしたいとき
//#define _ALLOW_NOBATT_ // 実機電池なし（=アダプタのみ）での起動を許可
//#define _DBG_PEDO_AUTO_ENABLE_ // 電源投入の瞬間から歩数計on
//#define _DBG_LED_PRINT_ // LED print デバッグをしたいとき(自己アップデート用)
//#define _ENABLE_WDT_TEST_
//#define _FORCE_TAIKENDAI_
//#define _FORCE_TAIKENDAI_NBD_
#define _JHL_DEBUG_
//#define _DBG_CHK_OFF_LEAK_ // OFF時リーク電流のチェック(デバッガで確認)
#define _DBG_NOP_ // ブレークを貼るためにNOP()を有効にしたいとき
#ifdef _JHL_DEBUG_
#ifdef _DBG_NOP_
# define dbg_nop() NOP()
#else
# define dbg_nop() ;

2
branches/sim/hal.c
View File

@ -45,7 +45,7 @@ void hal_update()
if( temp_conf & REG_BIT_HAL0_PM_EXTDC_n )
{
// 三項式はなんだか大きくなりがち
if(( temp_dat & REG_BIT_HAL0_PM_EXTDC_n ) == 0 ) // ロンリガー
if(( temp_dat & REG_BIT_HAL0_PM_EXTDC_n ) == 0 )
{
PM_EXTDC_n = 0;
}

6
branches/sim/loader.c
View File

@ -248,7 +248,7 @@ void hdwinit2( )
else
{
// P0 = bits8(0,0,0,0, 0,0,0,0); // -,-,-,-, -,-,/reset2,/reset1
P3 = bits8(0,0,0,0, 0,1,1,0); // -,-,-,-, i2c_pu,scl_m,sda_m,/fcr_rst // 簡易I2Cは出力ラッチを1にする
P3 = bits8(0,0,0,0, 1,1,1,0); // -,-,-,-, i2c_pu,scl_m,sda_m,/fcr_rst // 簡易I2Cは出力ラッチを1にする
}
// PM0 = bits8(1,1,1,1, 1,1,1,1); // BSRマイコンでは、reset1は監視のみになる。
@ -260,7 +260,7 @@ void hdwinit2( )
// P1 = bits8(0,0,0,0, 0,0,0,0); // bt_temp_p,bt_det_p,led_info_r,led_pow_b led_info_g,32khz_o,led_wifi,led_info_b
// P2 = bits8(0,0,0,0, 0,0,0,0); // ad_vol,ad_3d,acc_int1,led_chg, (sw_sel),(rbr_flight),(/rbr_rst),(ext_vdd33)
P4 = bits8(0,0,0,0, 1,0,0,0); // -,-,-,-, /chg_en, led_pow_r, dipsw[1,0]
// P5 = bits8(0,0,0,0, 0,0,0,0); // -,-,-,-, i2c_pu,led_3d,/chg,/gyro_cs
P5 = bits8(0,0,0,0, 1,0,0,0); // -,-,-,-, i2c_pu,led_3d,/chg,/gyro_cs
// P6 = bits8(0,0,0,0, 0,0,0,0); // -,-,-,-, -,-,sda2,scl2
// P7 = bits8(0,0,0,0, 0,0,0,0); // slp_o,/irq,led_cam,sw_wifi, sw_pow,pm_irw,shell_close,/extdc
// P12 = bits8(0,0,0,0, 0,0,0,0); // -,-,-,xtal, xtal,dip(機種判定)[1,0],slp_i
@ -290,7 +290,7 @@ void hdwinit2( )
PM2 = bits8(1,1,1,0, 1,0,0,1);
PM4 = bits8(1,1,1,1, 0,0,1,1);
PM5 = bits8(1,1,1,1, 0,0,1,0);
PM5 = bits8(1,1,1,1, 1,0,1,0);
PM6 = bits8(1,1,1,1, 1,1,0,0); // I2CのラインがL出力になってしまうが、システムがOFFなのでかまわない
PM7 = bits8(0,1,0,1, 1,1,1,1);
// PM12 = bits8(1,1,1,1, 1,1,1,1); // 32kHzクロックのピン設定はどっちでもよい

11
branches/sim/main.c
View File

@ -28,6 +28,7 @@ bit i2c_mcu_time_out_error; // I2C
extern void i2c_mcu_error_monitor();
#endif
/* ========================================================
本当のエントリ関数は loader.c にあります
======================================================== */
@ -37,7 +38,15 @@ void main_loop( void )
i2c_mcu_time_out_error = false;
#endif
// 電池投入時、ファームアップデート後のみ
// HALデバッグリセット
vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = 0;
vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0;
vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] = 0xFF;
vreg_ctr[ VREG_C_HAL_OVW_BT_FUEL ] = 0xFF;
vreg_ctr[ VREG_C_HAL_OVW_BT_VOLTAGE ] = 0xFF;
// 電池投入時、ファームアップデート後のみ
RTC_init( ); // 内部でリブートか判定しています
renge_init( );

10
branches/sim/pm.c
View File

@ -99,8 +99,12 @@ void tsk_batt( )
{
static u8 task_interval = 0;
if( system_status.pwr_state != OFF_TRIG )
{
if( system_status.pwr_state == OFF_TRIG ) // OFF_TRIGは一回しかこないので
{ // 満充電のに刺した瞬間電源切ると、5sec電源再投入できず不便。消しちゃう
chg_led_override = 0;
}
else
{
if( task_interval -- != 0 )
{
return;
@ -249,7 +253,7 @@ void pm_chk_adapter()
if( pm_extdc_old != PM_EXTDC_n ) // HAL を通すため、 PM_EXTDC_n の volatile にする心配なし
{
pm_extdc_old = PM_EXTDC_n;
if( PM_EXTDC_n )
if( !PM_EXTDC_n )
{
// 刺さった
set_bit( 1, vreg_ctr[VREG_C_STATUS], REG_BIT_POW_SUPPLY );

3
branches/sim/rtc.c
View File

@ -32,8 +32,11 @@ void RTC_init( void )
// RTC設定
RTCC0 = bits8(0,0,0,0, 1,0,0,0); /* 動作停止、24時間制、32k出力「まだなし」、定周期割り込みなし */
// (RTCE 0 RCLOE1 RCLOE0 AMPM CT2 CT1 CT0)
RTCC1 = bits8(1,1,0,0, 0,0,0,0); /* アラーム割り込み有効＆動作開始 */
// (WALE WALIE 0 WAFG RIFG 0 RWST RWAIT)
RTCC2 = bits8(1,0,0,0, 0,0,0,0); /* インターバル:32k/2^6=2ms、RTCDIV出力なし */
// (RINTE RCLOE2 RCKDIV 0 0 ICT2 ICT1 ICT0)
HOUR = 0x00;
MIN = 0x00;

4
branches/sim/sim/sfrAlias.h
View File

@ -130,8 +130,8 @@
#ifdef _MODEL_CTR_
// mcuRegP[ _P5_3 ] に加え、mcuRegP[ _P5_5 ], P140 P141
// P140が出力専用なので...
#define I2C_PU_on() { mcuRegPM[ _P5_3 ] = 1; mcuRegPM[ _P3_3 ] = 1; P14 |= 0x03; mcuRegP[ _P5_3 ] = 1; mcuRegPM[ _P5_3 ] = 0; mcuRegP[ _P3_3 ] = 1; mcuRegPM[ _P3_3 ] = 0; }
#define I2C_PU_off() { mcuRegPM[ _P5_3 ] = 1; mcuRegPM[ _P3_3 ] = 1; P14 &= ~0x03; mcuRegP[ _P5_3 ] = 0; mcuRegPM[ _P5_3 ] = 0; mcuRegP[ _P3_3 ] = 0; mcuRegPM[ _P3_3 ] = 0; }
#define I2C_PU_on() { P14 |= 0x03; mcuRegPM[ _P5_3 ] = 0; mcuRegPM[ _P3_3 ] = 0; }
#define I2C_PU_off() { mcuRegPM[ _P5_3 ] = 1; mcuRegPM[ _P3_3 ] = 1; P14 &= ~0x03; }
#endif
#define GYRO_ENABLE() mcuRegP[ _P5_0 ] = 0

30
branches/sim/sw.c
View File

@ -26,8 +26,8 @@
#define HOLD_THREASHOLD (u8)( 2000 / INTERVAL_TSK_SW )
#define FORCEOFF_THREASHOLD (u8)( 4000 / INTERVAL_TSK_SW )
*/
#define TIME_MUKAN (u8)( 300 / INTERVAL_TSK_SW )
#define TIME_MUKAN_PWSW (u16)( 8000 / INTERVAL_TSK_SW )
#define TIME_MUKAN (u8)( 300 / INTERVAL_TSK_SW )
#define TIME_MUKAN_PWSW_RED_TRIAL (u16)( 15000 / INTERVAL_TSK_SW ) // 試遊台、homeマスク時間
//=========================================================
u16 SW_pow_count;
@ -85,22 +85,22 @@ u16 sw_pwsw_mukan_time;
======================================================== */
void tsk_sw( )
{
static u8 task_interval = 1;
static u8 task_interval;
if( system_status.pwr_state == ON_TRIG )
if( system_status.pwr_state == OFF_TRIG )
{
SW_pow_count = 0; // カウントクリア
SW_pow_count = 0; // 電源投入に備えてクリア
task_interval = 0;
}
if( -- task_interval != 0 )
if( task_interval != 0 )
{
task_interval--;
return;
}
else
{
task_interval = (u8)( INTERVAL_TSK_SW / SYS_INTERVAL_TICK );
// おしまい
}
task_interval = (u8)( INTERVAL_TSK_SW / SYS_INTERVAL_TICK );// プリスケーラ代わりに使ってますね…
// 8ms 毎にきます
switch ( system_status.pwr_state )
@ -137,6 +137,7 @@ void tsk_sw( )
}
}else{
// スタンドアロン試遊台
// 電源スイッチの監視 //
if( SW_pow_count == ( TIME_PWSW_CLICK ) )
{
@ -144,7 +145,7 @@ void tsk_sw( )
{
set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK );
// いやなタイミングでPWSWを押すとHOMEメニューに入れてしまうのを回避するためのマスクタイマー
sw_pwsw_mukan_time = TIME_MUKAN_PWSW;
sw_pwsw_mukan_time = TIME_MUKAN_PWSW_RED_TRIAL;
}
}
else if( SW_pow_count == ( HOLD_THREASHOLD ) )
@ -160,13 +161,12 @@ void tsk_sw( )
count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント
// HOME スイッチ //
chk_clicked( SW_HOME_n, SW_home_count, REG_BIT_SW_HOME_CLICK );
// HOME sw //
chk_clicked( SW_HOME_n, SW_home_count, REG_BIT_SW_HOME_CLICK );
chk_clicked( !SW_HOME_n, SW_home_count_rel, REG_BIT_SW_HOME_RELEASE );
// wifi sw //
/// 最悪な実装なのはわかっているが、メモリ不足と、市場に出てしまった不良スイッチを救うため
/// 最悪な実装なのはわかっているが、市場に出てしまった不良スイッチを救うため
if( sw_wifi_mukan_time != 0 )
{
sw_wifi_mukan_time--;

7
branches/sim/task_debug.c
View File

@ -50,13 +50,6 @@ void tsk_debug( )
}
*/
#ifdef _PMIC_TEST_
if( ( system_status.pwr_state == ON ) || ( system_status.pwr_state == SLEEP ) )
{
iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 0x03, 0 );
}
#endif
// iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 2, vreg_ctr[ VREG_C_IRQ1 ] );
// iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, boot_ura );
// iic_mcu_write_a_byte( IIC_SLA_DBG_MONITOR, 1, vreg_ctr[ VREG_C_SND_VOL ] );

14
branches/sim/task_misc.c
View File

@ -308,17 +308,19 @@ u8 extinfo_read()
infos[15] = LED_duty_notify_blu;
infos[16] = LED_CAM;
infos[17] = LED_duty_WiFi;
infos[18] =
// ( PM_EXTDC_n ? REG_BIT_HAL0_PM_EXTDC_n : 0 ) // status0にある
0
infos[18] = 0
// | ( PM_EXTDC_n ? REG_BIT_HAL0_PM_EXTDC_n : 0 ) // status0にある
| ( RBR_RESET_n ? REG_BIT_HAL0_PM_EXTDC_n : 0 ) // ↑空きを使わせてもらう
| ( BT_IN_CHG_n ? REG_BIT_HAL0_BT_IN_CHG_n : 0 )
// | ( SHELL_OPEN ? REG_BIT_HAL0_SHELL_OPEN : 0 ) // status0にある
| ( BT_CHG_Ena_n ? REG_BIT_HAL0_RSV_5 : 0 ) // 空きビット使用,out pin
| 0
| ( BT_CHG_Ena_n ? REG_BIT_HAL0_RSV_5 : 0 ) // 空きビット使用,out pin
| 0 // WL_TX 使えない
// | ( SHELL_OPEN ? REG_BIT_HAL0_SHELL_OPEN : 0 ) // status0にある
| ( RBR_FLIGHT ? REG_BIT_HAL0_SHELL_OPEN : 0 ) // ↑空きを使わせてもらう
| ( SW_WIFI_n ? REG_BIT_HAL0_SW_WIFI_n : 0 )
| ( SW_HOME_n ? REG_BIT_HAL0_SW_HOME_n : 0 )
| ( SW_POW_n ? REG_BIT_HAL0_SW_POW_n : 0 );
// 項目足すときは気をつけてね!! //
iic_burst_state ++;

138
branches/sim/task_sys.c
View File

@ -47,7 +47,7 @@ extern bit i2c_mcu_time_out_error;
//=========================================================
#define PWSW_POWON_TIME (u8)( 20 / SYS_INTERVAL_TICK )
#define PWSW_POWON_TIME (u8)( 50 / INTERVAL_TSK_SW ) // [ms]
/* ========================================================
マイコン内部で必要なもの
@ -64,9 +64,9 @@ void tsk_sys( )
switch ( system_status.pwr_state )
{
case ON_CHECK: //-------------------------------------------------------
// スイッチ操作などで割り込みが発生し、スリープが解除されるとここに来ます。
// pwswか、他の割り込みでスリープが解除されると来ます。
if( system_status.poweron_reason == NONE )
if( system_status.poweron_reason == RSN_PWSW ) // アダプタなしで電源スイッチ押したときしか回らない
{
// スイッチで電源on
if( SW_pow_count != 0 )
@ -80,7 +80,8 @@ void tsk_sys( )
if( pwsw_timeout > 100 )
{
system_status.pwr_state = OFF; // スイッチはノイズだった。寝る。
SW_pow_count = 0;
system_status.pwr_state = OFF_TRIG; // スイッチはノイズだった。寝る。
renge_task_interval_run_force = true;
return;
}
@ -90,18 +91,10 @@ void tsk_sys( )
// もう少しスイッチの様子を見る
return;
}
// 電源投入
system_status.poweron_reason = PWSW;
}
SW_pow_mask = true;
// for debug
#ifdef _DEBUG_BT_FUEL_
vreg_ctr[ VREG_C_DBG01 ] = 99;
#endif
vreg_ctr[ VREG_C_COMMAND3 ] = 0;
// 電源投入 //
iic_mcu_start( );
@ -152,7 +145,7 @@ void tsk_sys( )
PU7 = bits8(0,0,0,1, 1,1,0,1); // 4:SW_WIFI 3:SW_PWSW 2:PM_IRQ 0:PM_EXTDC_n
PU_SW_HOME_n_JIKKI = 1; // SW_HOME
if( system_status.poweron_reason == PWSW )
if( system_status.poweron_reason == RSN_PWSW )
{
// 電源ボタンでのonの時は、LEDを点灯させる
vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO;
@ -338,7 +331,7 @@ void tsk_sys( )
KRM = ( KR_SW_POW ); // Mask ではなく、Modeなのだそうだ。紛らわしい
MK0 = ~( INT_MSK0_EXTDC );
MK1 = ~( INT_MSK1_KR | INT_MSK1_RTCALARM | INT_MSK1_RTCINTVAL );
MK1 = ~( INT_MSK1_KR | INT_MSK1_RTCINTVAL ); // INT_MSK1_RTCALARM | RTCアラーム封印中
MK2L = 0xFF;
// PU5 そのまま
@ -371,13 +364,11 @@ void tsk_sys( )
ACC_VALID = 0;
PM_ACC_VALID = 0;
iic_mcu_stop( );
system_status.pwr_state = OFF;
SW_pow_mask = true;
SW_pow_count = 0;
// HALデバッグリセット
// HALデバッグリセット　忘れると電源on出来なくなることが…
vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = 0;
vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0;
vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] = 0xFF;
@ -391,7 +382,7 @@ void tsk_sys( )
if( !PM_EXTDC_n )
{
// アダプタが刺さってるときはこのブロックを繰り返す。
// アダプタ有り ///////////////////////////////
BT_chk(); // 要ポーリング（電池抜かれ検出のため）
// ↑の中で必要だったらI2C_m_init呼んでます
@ -402,24 +393,26 @@ void tsk_sys( )
system_status.pwr_state = ON_CHECK; // 直ちに押し時間チェックは合格して電源投入に入る
}
if( system_status.model != MODEL_JIKKI )
if( system_status.model != MODEL_JIKKI )
{
iic_mcu_stop( );
}
if( system_status.taikendai )
{
vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0;
vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0;
// 電源投入
wait_ms(46);
system_status.poweron_reason = PWSW;
wait_ms(46); // pmicの電源再投入仕様のため
system_status.poweron_reason = RSN_PWSW;
system_status.pwr_state = ON_CHECK;
}
}
else
{
// アダプタなし
if( chg_led_override != 0 ) // これがゼロになるまで待つ
// アダプタなし ///////////////////////////////
u8 irq_mask_original_1; // RTCアラームで起動しないように。　現状、他の割り込みでは起きない
if( chg_led_override != 0 ) // これがゼロになるまで待つ todo
{
return;
};
@ -434,46 +427,81 @@ void tsk_sys( )
{;}
// 割り込み待ちで寝る //
RTCIMK = 1;
RTCIMK = 1; // systick用インターバルタイマー割り込みマスク
CKC = bits8(0,0,0,0, 1,0,0,1);
OSMC = 0x00;
if( PM_EXTDC_n ) // きわどいタイミングで挿抜が起きることがある
#ifdef _DBG_CHK_OFF_LEAK_
{
/*
vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] = 0;
vreg_ctr[ VREG_C_HAL_OVW_CONT1 ] = 0;
vreg_ctr[ VREG_C_HAL_OVW_TEMPERATURE ] = 0xFF;
vreg_ctr[ VREG_C_HAL_OVW_BT_FUEL ] = 0xFF;
vreg_ctr[ VREG_C_HAL_OVW_BT_VOLTAGE ] = 0xFF;
*/
if( vreg_ctr[ VREG_C_HAL_OVW_CONT0 ] != 0 ||
vreg_ctr[ VREG_C_HAL_OVW_BT_FUEL ] == 0xFF )
{
dbg_nop();
}
// off中のpin設定ミスチェック
volatile u8 ports_i[12];
volatile u8 ports_o[12];
STOP( );
ports_i[0] = ( PM0 & PU0 & ~P0 ); // プルアップ切り忘れ？
ports_i[1] = ( PM1 & PU1 & ~P1 );
ports_i[2] = 0;
ports_i[3] = ( PM3 & PU3 & ~P3 );
ports_i[4] = ( PM4 & PU4 & ~P4 );
ports_i[5] = ( PM5 & PU5 & ~P5 );
ports_i[6] = 0;
ports_i[7] = ( PM7 & PU7 & ~P7 );
ports_i[8] = ( PM12 & PU12 & ~P12 );
ports_i[9] = ( PM14 & PU14 & ~P14 );
ports_i[10] = 0;
ports_i[11] = ( PM20 & PU20 & ~P20 );
ports_o[0] = ( ~PM0 & P0 ); // H 出力しちゃってるかも
ports_o[1] = ( ~PM1 & P1 );
ports_o[2] = ( ~PM2 & P2 );
ports_o[3] = ( ~PM3 & P3 & ~POM3 );
ports_o[4] = ( ~PM4 & P4 ); // bit3はchg_enなので1でもよい
ports_o[5] = ( ~PM5 & P5 );
ports_o[6] = ( ~PM6 & P6 );
ports_o[7] = ( ~PM7 & P7 );
ports_o[8] = ( ~PM12 & P12 );
ports_o[9] = ( ~PM14 & P14 );
ports_o[10] = ( ~PM15 & P15 );
ports_o[11] = ( ~PM20 & P20 );
NOP(); // ←ブレーク置くため
}
// 起きる //
#endif
if( PM_EXTDC_n ) // きわどいタイミングで挿抜が起きることがある
{
STOP();
}
// 起きる //
// 起きる条件は
// ・KeyReturn割り込み（電源ボタン）
// ・アダプタ挿抜
// ・RTCアラーム（現在封印）
OSMC = 0x01;
renge_flg_interval = 0;
hal_update();
OSMC = 0x01;
CKC = bits8(0,0,0,0, 1,0,0,0);
if( PM_EXTDC_n )
{
// 電源ボタンで起きたとき
SW_pow_mask = false;
system_status.pwr_state = ON_CHECK;
}
// else{
// アダプタで起きたときは OFF の中をぐるぐるまわる
// 起きた理由は？
if( !PM_EXTDC_n ){
system_status.pwr_state = OFF; // OFFを回って充電監視
}
/* // RTCアラーム。封印中
else if( vreg_ctr[ VREG_C_IRQ1 ] & REG_BIT_RTC_ALARM )
{
system_status.poweron_reason = RSN_RTC_ALARM;
system_status.pwr_state = ON_CHECK;
}
// else if( 他の割り込みで電源on ){
// これ以外の許可割り込みで起きないんだけど、いいんですよね
// }
*/
else // if( !SW_POW_n ) // （それ以外なら）電源ボタンで起きた
{
SW_pow_mask = false;
system_status.poweron_reason = RSN_PWSW;
system_status.pwr_state = ON_CHECK;
}
RTCIMK = 0;
if( system_status.taikendai )
@ -546,8 +574,8 @@ static void chk_emergencyExit(){
{
if( !RESET1_n )
{
if( shirobako_power_control_count != 255 )
shirobako_power_control_count ++;
if( shirobako_power_control_count != 255 )
shirobako_power_control_count ++;
}
else
{
@ -599,9 +627,9 @@ void send_getup_to_soc()
/*******************************************************//**
/* ========================================================
firm_update()を task_status_immed型 を返すようにすればいいのですが...
**********************************************************/
======================================================== */
task_status_immed tski_firm_update(){
firm_update();
return( ERR_SUCCESS );

4
branches/sim/user_define.h
View File

@ -139,8 +139,8 @@
// P5.3 に加え、P5.5, P140 P141
// P140が出力専用なので...
#define I2C_PU_on() { PM5.3 = 1; PM3.3 = 1; P14 |= 0x03; P5.3 = 1; PM5.3 = 0; P3.3 = 1; PM3.3 = 0; }
#define I2C_PU_off() { PM5.3 = 1; PM3.3 = 1; P14 &= ~0x03; P5.3 = 0; PM5.3 = 0; P3.3 = 0; PM3.3 = 0; }
#define I2C_PU_on() { P14 |= 0x03; PM5.3 = 0; PM3.3 = 0; }
#define I2C_PU_off() { PM5.3 = 1; PM3.3 = 1; P14 &= ~0x03; }
#define GYRO_ENABLE() P5.0 = 0
#define GYRO_DISABLE() P5.0 = 1

2
branches/sim/vreg_ctr.c
View File

@ -547,7 +547,7 @@ void vreg_ctr_after_read( u8 adrs, u8 data )
}
#endif
// マスクされてたら、フラグも立てず、割り込みも入れない。
// マスクされてたら、フラグ「立てない」、割り込み入れない。
void set_irq( u8 irqreg, u8 irq_flg )
{
u8 tot;

128
branches/sim/yav_mcu_bsr.plg
View File

@ -1,135 +1,13 @@
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 -rd2 -qvjl2w -sainter_asm -zpb -no loader.c
loader.c(141) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(142) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(174) : 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 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 -rd2 -qvjl2w -sainter_asm -zpb -no pm.c
pm.c(488) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(785) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(789) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(819) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(840) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(906) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(915) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1118) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1120) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 9 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\pm.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 -rd2 -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 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 -rd2 -qvjl2w -sainter_asm -zpb -no main.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 inter_asm\main.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 -rd2 -qvjl2w -sainter_asm -zpb -no magic.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 inter_asm\magic.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 -rd2 -qvjl2w -sainter_asm -zpb -no i2c_twl.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 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 -rd2 -qvjl2w -sainter_asm -zpb -no led.c
led.c(82) : CC78K0R warning W0745: Expected function prototype
led.c(332) : 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 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 -rd2 -qvjl2w -sainter_asm -zpb -no rtc.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 inter_asm\rtc.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 -rd2 -qvjl2w -sainter_asm -zpb -no vreg_ctr.c
vreg_ctr.c(163) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(168) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(169) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(217) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(217) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(222) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(222) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(234) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 14 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 inter_asm\vreg_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 -rd2 -qvjl2w -sainter_asm -zpb -no vreg_twl.c
vreg_twl.c(55) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_twl.c(59) : 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 inter_asm\vreg_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 -rd2 -qvjl2w -sainter_asm -zpb -no adc.c
adc.c(101) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(182) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(228) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(352) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(474) : CC78K0R warning W0745: Expected function prototype
adc.c(503) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(508) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 7 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff inter_asm\adc.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 -rd2 -qvjl2w -sainter_asm -zpb -no accero.c
Compilation complete, 0 error(s) and 0 warning(s) found.
accero.c(105) : CC78K0R warning W0745: Expected function prototype
Compilation complete, 0 error(s) and 1 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 inter_asm\accero.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 -rd2 -qvjl2w -sainter_asm -zpb -no sw.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 inter_asm\sw.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 -rd2 -qvjl2w -sainter_asm -zpb -no task_debug.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 inter_asm\task_debug.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -sainter_asm -zpb -no task_misc.c
task_misc.c(292) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(299) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(304) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(305) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(306) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(307) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(308) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(310) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(320) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 9 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff 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 -rd2 -qvjl2w -sainter_asm -zpb -no task_sys.c
task_sys.c(215) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(556) : 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 inter_asm\task_sys.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 -rd2 -qvjl2w -sainter_asm -zpb -no pedo_alg_thre_det2.c
pedo_alg_thre_det2.c(94) : CC78K0R warning W0745: Expected function prototype
pedo_alg_thre_det2.c(109) : 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 inter_asm\pedo_alg_thre_det2.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 -rd2 -qvjl2w -sainter_asm -zpb -no led_cam.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 inter_asm\led_cam.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 -rd2 -qvjl2w -sainter_asm -zpb -no led_pow.c
led_pow.c(99) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(104) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(155) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(215) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(244) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 5 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 inter_asm\led_pow.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -obsr.lmf "..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -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 -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 led_cam.rel led_pow.rel hal.rel
Link complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf
@ -137,4 +15,4 @@ Object Conversion Complete, 0 error(s) and 0 warning(s) found.
C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex
133
!E debug enable!!
Build Total error(s) : 0 Total warning(s) : 55
Build Total error(s) : 0 Total warning(s) : 1

587
branches/sim/yav_mcu_bsr.prj
View File

@ -297,6 +297,300 @@ Include35=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\in
Include36=sim\simOnWin.h
Include37=sim\sfrAlias.h
Include38=hal.h
Include39=sim\sim_interrupt_decrare.c
[Options.LCNV78K0R 0]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 1]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 2]
Version=100
LCNV_GO=0
O0=inter_asm
E=0
CommandFile=0
[Options.LCNV78K0R 3]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 4]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 5]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LK78K0R 0]
Version=100
O0=bsr_k0r.lmf
O1=bsr.lmf
O2=flash.lmf
O3=a.lmf
G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GOValue=85
GOStart=FC00
GOSizeValue=1024
GI=1
GIValue=FFFFFFFFFFFFFFFFFFFF
CCZA=0
MemInfoCheck=1
P=1
P0=bsr_k0r.map
P1=bsr.map
P2=flash.map
P3=a.map
MI=0
GB=1
GBValue=6EFBFF
KM=1
KD=0
KP=1
KL=0
LF=0
LL=0
B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
W=0
SELFCheck=1
SELF=0
ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
[Options.LK78K0R 1]
Version=100
O0=a.lmf
G=0
E=0
E0=a.elk
GO=0
GOValue=
GOStart=FC00
GOSizeValue=1024
GI=0
GIValue=FFFFFFFFFFFFFFFFFFFF
CCZA=1
MemInfoCheck=0
P=1
P0=a.map
MI=0
GB=0
GBValue=
KM=1
KD=1
KP=0
KL=0
LF=0
LL=0
S=0
W=1
SELFCheck=0
SELF=0
ZB=
CommandFile=0
[Options.LK78K0R 2]
Version=100
O0=bsr.lmf
O1=bsr_k0r.lmf
O2=flash.lmf
O3=a.lmf
G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GOValue=85
GOStart=FC00
GOSizeValue=1024
GI=1
GIValue=1B339499E033F240BFAA
CCZA=0
MemInfoCheck=1
P=1
P0=bsr_k0r.map
P1=bsr.map
P2=flash.map
P3=a.map
MI=0
GB=1
GBValue=7EFBFF
KM=1
KD=0
KP=0
KL=0
LF=0
LL=0
B0=C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib
B1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
W=0
SELFCheck=0
SELF=0
ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
OFILE=C:\78k_data\yav-mcu-basara\branches\sim\bsr.lmf
[Options.LK78K0R 3]
Version=100
O0=bsr_bsr.lmf
O1=bsr_k0r.lmf
O2=bsr.lmf
O3=flash.lmf
O4=a.lmf
G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GOValue=85
GOStart=FC00
GOSizeValue=1024
GI=1
GIValue=FFFFFFFFFFFFFFFFFFFF
CCZA=0
MemInfoCheck=1
P=1
P0=bsr_bsr.map
P1=bsr_k0r.map
P2=bsr.map
P3=flash.map
P4=a.map
MI=0
GB=1
GBValue=6EFBFF
KM=1
KD=0
KP=1
KL=0
LF=0
LL=0
B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
W=2
SELFCheck=0
SELF=0
ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
[Options.LK78K0R 4]
Version=100
O0=bsr_k0r.lmf
O1=bsr.lmf
O2=flash.lmf
O3=a.lmf
G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GOValue=85
GOStart=FC00
GOSizeValue=1024
GI=1
GIValue=FFFFFFFFFFFFFFFFFFFF
CCZA=0
MemInfoCheck=1
P=1
P0=bsr_k0r.map
P1=bsr.map
P2=flash.map
P3=a.map
MI=0
GB=1
GBValue=6EFBFF
KM=1
KD=0
KP=1
KL=0
LF=0
LL=0
B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
W=0
SELFCheck=1
SELF=0
ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
[Options.LK78K0R 5]
Version=100
O0=bsr_bsr.lmf
O1=bsr_k0r.lmf
O2=bsr.lmf
O3=flash.lmf
O4=a.lmf
G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GOValue=85
GOStart=FC00
GOSizeValue=1024
GI=1
GIValue=FFFFFFFFFFFFFFFFFFFF
CCZA=0
MemInfoCheck=1
P=1
P0=bsr_bsr.map
P1=bsr_k0r.map
P2=bsr.map
P3=flash.map
P4=a.map
MI=0
GB=1
GBValue=6EFBFF
KM=1
KD=0
KP=1
KL=0
LF=0
LL=0
B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
W=2
SELFCheck=0
SELF=0
ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
[Options.78K0R]
BuildMode=2
BuildMode2=K0R_dbg
BuildMode3=BSR_dbg
BuildMode4=BSR_rel
BuildMode5=BSR_WM0
DefaultMode2=1
DefaultMode3=1
DefaultMode4=1
DefaultMode5=1
[Options.CC78K0R 0]
Version=210
Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r
@ -766,296 +1060,3 @@ VfiFileBoot0=
VfiFileBoot1=boot.vfi
VF78K0Rchk=0
VF78K0Rvs=
[Options.LK78K0R 0]
Version=100
O0=bsr_k0r.lmf
O1=bsr.lmf
O2=flash.lmf
O3=a.lmf
G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GOValue=85
GOStart=FC00
GOSizeValue=1024
GI=1
GIValue=FFFFFFFFFFFFFFFFFFFF
CCZA=0
MemInfoCheck=1
P=1
P0=bsr_k0r.map
P1=bsr.map
P2=flash.map
P3=a.map
MI=0
GB=1
GBValue=6EFBFF
KM=1
KD=0
KP=1
KL=0
LF=0
LL=0
B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
W=0
SELFCheck=1
SELF=0
ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
[Options.LK78K0R 1]
Version=100
O0=a.lmf
G=0
E=0
E0=a.elk
GO=0
GOValue=
GOStart=FC00
GOSizeValue=1024
GI=0
GIValue=FFFFFFFFFFFFFFFFFFFF
CCZA=1
MemInfoCheck=0
P=1
P0=a.map
MI=0
GB=0
GBValue=
KM=1
KD=1
KP=0
KL=0
LF=0
LL=0
S=0
W=1
SELFCheck=0
SELF=0
ZB=
CommandFile=0
[Options.LK78K0R 2]
Version=100
O0=bsr.lmf
O1=bsr_k0r.lmf
O2=flash.lmf
O3=a.lmf
G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GOValue=85
GOStart=FC00
GOSizeValue=1024
GI=1
GIValue=1B339499E033F240BFAA
CCZA=0
MemInfoCheck=1
P=1
P0=bsr_k0r.map
P1=bsr.map
P2=flash.map
P3=a.map
MI=0
GB=1
GBValue=7EFBFF
KM=1
KD=0
KP=0
KL=0
LF=0
LL=0
B0=C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib
B1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
W=0
SELFCheck=0
SELF=0
ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
OFILE=C:\78k_data\yav-mcu-basara\branches\sim\bsr.lmf
[Options.LK78K0R 3]
Version=100
O0=bsr_bsr.lmf
O1=bsr_k0r.lmf
O2=bsr.lmf
O3=flash.lmf
O4=a.lmf
G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GOValue=85
GOStart=FC00
GOSizeValue=1024
GI=1
GIValue=FFFFFFFFFFFFFFFFFFFF
CCZA=0
MemInfoCheck=1
P=1
P0=bsr_bsr.map
P1=bsr_k0r.map
P2=bsr.map
P3=flash.map
P4=a.map
MI=0
GB=1
GBValue=6EFBFF
KM=1
KD=0
KP=1
KL=0
LF=0
LL=0
B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
W=2
SELFCheck=0
SELF=0
ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
[Options.LK78K0R 4]
Version=100
O0=bsr_k0r.lmf
O1=bsr.lmf
O2=flash.lmf
O3=a.lmf
G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GOValue=85
GOStart=FC00
GOSizeValue=1024
GI=1
GIValue=FFFFFFFFFFFFFFFFFFFF
CCZA=0
MemInfoCheck=1
P=1
P0=bsr_k0r.map
P1=bsr.map
P2=flash.map
P3=a.map
MI=0
GB=1
GBValue=6EFBFF
KM=1
KD=0
KP=1
KL=0
LF=0
LL=0
B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
W=0
SELFCheck=1
SELF=0
ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
[Options.LK78K0R 5]
Version=100
O0=bsr_bsr.lmf
O1=bsr_k0r.lmf
O2=bsr.lmf
O3=flash.lmf
O4=a.lmf
G=1
E=0
E0=flash.elk
E1=a.elk
GO=1
GOValue=85
GOStart=FC00
GOSizeValue=1024
GI=1
GIValue=FFFFFFFFFFFFFFFFFFFF
CCZA=0
MemInfoCheck=1
P=1
P0=bsr_bsr.map
P1=bsr_k0r.map
P2=bsr.map
P3=flash.map
P4=a.map
MI=0
GB=1
GBValue=6EFBFF
KM=1
KD=0
KP=1
KL=0
LF=0
LL=0
B0=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib
D0=bsr_mcu.dr
D1=user_area.dr
S=1
W=2
SELFCheck=0
SELF=0
ZB=
Etcetera0=
Etcetera1=boot.lmf
CommandFile=0
[Options.LCNV78K0R 0]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 1]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 2]
Version=100
LCNV_GO=0
O0=inter_asm
E=0
CommandFile=0
[Options.LCNV78K0R 3]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 4]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.LCNV78K0R 5]
Version=100
LCNV_GO=0
E=0
CommandFile=0
[Options.78K0R]
BuildMode=2
BuildMode2=K0R_dbg
BuildMode3=BSR_dbg
BuildMode4=BSR_rel
BuildMode5=BSR_WM0
DefaultMode2=1
DefaultMode3=1
DefaultMode4=1
DefaultMode5=1

17
branches/sim/yav_mcu_bsr.prk
View File

@ -1,19 +1,14 @@
[ProjectManager]
FrameMax=0
FrameX=1244
FrameY=196
FrameX=402
FrameY=228
FrameCX=1440
FrameCY=895
OpenFile1=i2c_ctr.c,0,150,150,1469,736,0,40,0,0
OpenFile2=hal.c,0,200,200,1395,681,14,13,13,0
OpenFile3=sw.c,0,127,86,1322,567,0,138,0,0
OpenFile4=task_status.c,0,25,25,1220,506,23,30,23,0
OpenFile5=pm.c,0,225,225,1420,706,15,471,15,0
OpenFile6=i2c_twl.c,0,50,50,1245,531,38,129,47,0
OpenFile7=main.c,0,200,200,1370,701,0,1,0,0
OpenFile8=ProjectWindow
OpenFile1=ProjectWindow
PrjPos=0,0,706,0,291
OpenFile9=OutputWindow
OpenFile2=task_sys.c,0,225,225,1395,726,0,369,0,0
OpenFile3=config.h,0,0,0,1170,501,24,24,24,0
OpenFile4=OutputWindow
OutputPos=0,16,707,587,1440
ActivePRJ=yav_mcu_bsr.prj
[ProjectWindow]

BIN
branches/sim/ベースからの変更.xls
View File

Binary file not shown.