diff --git a/trunk/accero.c b/trunk/accero.c index 286b24b..a5a3353 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -24,8 +24,9 @@ #include "incs.h" +#ifndef _WIN32 #include - +#endif // ======================================================== // レジスタ名 #define ACC_REG_WHOAMI 0x0F diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 54ea4c7..d779fe4 100644 Binary files a/trunk/bsr.lmf and b/trunk/bsr.lmf differ diff --git a/trunk/bsr_k0r.map b/trunk/bsr_k0r.map index 0ccbe23..229ffe3 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,20 +1,20 @@ -78K0R Linker W1.33 Date: 8 Jun 2011 Page: 1 +78K0R Linker W1.33 Date:10 Jun 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C - C78K0R\W2.13\lib78k0r\s0rm.rel -go85h,0FC00h,1024 -gi1B339499 - E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -bC:\Program File - s (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib - -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -iC:\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.re - l i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_t - wl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel tas - k_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 + C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr + _k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro + nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r + m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T + ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w0 loader.rel pm + .rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_t + wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng + e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi + sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_ + status.rel led_cam.rel led_pow.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -23,8 +23,8 @@ Direc-file:bsr_mcu.dr *** Link information *** - 67 output segment(s) - 3DBDH byte(s) real data + 65 output segment(s) + 3DA7H byte(s) real data 5803 symbol(s) defined @@ -57,8 +57,7 @@ Direc-file:bsr_mcu.dr LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL task_status 00002H 00000H - ??NMIROM 00002H 00002H CSEG -* gap * 00004H 0000CH +* gap * 00002H 0000EH @@VECT10 00010H 00004H CSEG AT @@VECT10 ini_VECT 00010H 00004H * gap * 00014H 00008H @@ -99,54 +98,53 @@ Direc-file:bsr_mcu.dr LDR_CODL task_status 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - ?OCDSTAD 000CEH 0000AH CSEG - LDR_CODE 000D8H 00945H CSEG - LDR_CODE loader 000D8H 00218H - LDR_CODE main 002F0H 00042H - LDR_CODE WDT 00332H 00000H - LDR_CODE i2c_mcu 00332H 002F0H + LDR_CODE 000CEH 00945H CSEG + LDR_CODE loader 000CEH 00218H + LDR_CODE main 002E6H 00042H + LDR_CODE WDT 00328H 00000H + LDR_CODE i2c_mcu 00328H 002F0H LDR_CODE self_flash - 00622H 00373H + 00618H 00373H LDR_CODE task_debug - 00995H 00000H + 0098BH 00000H LDR_CODE task_status - 00995H 00088H - FSL_CODE 00A1DH 00322H CSEG + 0098BH 00088H + FSL_CODE 00A13H 00322H CSEG FSL_CODE fsl_block_cmd - 00A1DH 0002BH + 00A13H 0002BH FSL_CODE fsl_block_check - 00A48H 00013H + 00A3EH 00013H FSL_CODE fsl_common - 00A5BH 0014FH + 00A51H 0014FH FSL_CODE fsl_reset - 00BAAH 00001H + 00BA0H 00001H FSL_CODE fsl_si_ibf - 00BABH 00064H + 00BA1H 00064H FSL_CODE fsl_phySwap - 00C0FH 0004DH + 00C05H 0004DH FSL_CODE fsl_si_common - 00C5CH 00061H - FSL_CODE fsl_swap 00CBDH 00030H + 00C52H 00061H + FSL_CODE fsl_swap 00CB3H 00030H FSL_CODE fsl_write - 00CEDH 00052H - @@LCODE 00D3FH 00277H CSEG - @@LCODE @cstart 00D3FH 0006DH - @@LCODE @imul 00DACH 00011H - @@LCODE @lumul 00DBDH 0002BH - @@LCODE @isdiv 00DE8H 00022H - @@LCODE @iudiv 00E0AH 0002DH - @@LCODE @isrem 00E37H 00021H - @@LCODE @iurem 00E58H 0002FH - @@LCODE @lsdiv 00E87H 00039H - @@LCODE @ludiv 00EC0H 0003FH - @@LCODE @divuw 00EFFH 00034H - @@LCODE @ladd 00F33H 0000FH - @@LCODE @llsh 00F42H 0001BH - @@LCODE @lursh 00F5DH 0001FH - @@LCODE @iscmp 00F7CH 0000CH - @@LCODE @lband 00F88H 00014H - @@LCODE @bcdtob 00F9CH 0001AH -* gap * 00FB6H 00040H + 00CE3H 00052H + @@LCODE 00D35H 00277H CSEG + @@LCODE @cstart 00D35H 0006DH + @@LCODE @imul 00DA2H 00011H + @@LCODE @lumul 00DB3H 0002BH + @@LCODE @isdiv 00DDEH 00022H + @@LCODE @iudiv 00E00H 0002DH + @@LCODE @isrem 00E2DH 00021H + @@LCODE @iurem 00E4EH 0002FH + @@LCODE @lsdiv 00E7DH 00039H + @@LCODE @ludiv 00EB6H 0003FH + @@LCODE @divuw 00EF5H 00034H + @@LCODE @ladd 00F29H 0000FH + @@LCODE @llsh 00F38H 0001BH + @@LCODE @lursh 00F53H 0001FH + @@LCODE @iscmp 00F72H 0000CH + @@LCODE @lband 00F7EH 00014H + @@LCODE @bcdtob 00F92H 0001AH +* gap * 00FACH 0004AH MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -188,251 +186,251 @@ Direc-file:bsr_mcu.dr 0226CH 00000H @@CNST led_cam 0226CH 00000H @@CNST led_pow 0226CH 00020H - ROM_CODE 0228CH 026FBH CSEG - ROM_CODE pm 0228CH 00A03H - ROM_CODE i2c_ctr 02C8FH 00060H - ROM_CODE i2c_twl 02CEFH 0005EH - ROM_CODE led 02D4DH 00265H - ROM_CODE rtc 02FB2H 000E0H - ROM_CODE vreg_ctr 03092H 00486H - ROM_CODE vreg_twl 03518H 000FAH - ROM_CODE adc 03612H 002E7H - ROM_CODE renge 038F9H 00190H - ROM_CODE accero 03A89H 0013DH - ROM_CODE sw 03BC6H 00178H + ROM_CODE 0228CH 026F1H CSEG + ROM_CODE pm 0228CH 009F9H + ROM_CODE i2c_ctr 02C85H 00060H + ROM_CODE i2c_twl 02CE5H 0005EH + ROM_CODE led 02D43H 00265H + ROM_CODE rtc 02FA8H 000E0H + ROM_CODE vreg_ctr 03088H 00486H + ROM_CODE vreg_twl 0350EH 000FAH + ROM_CODE adc 03608H 002E7H + ROM_CODE renge 038EFH 00190H + ROM_CODE accero 03A7FH 0013DH + ROM_CODE sw 03BBCH 00178H ROM_CODE task_misc - 03D3EH 00177H - ROM_CODE task_sys 03EB5H 00373H + 03D34H 00177H + ROM_CODE task_sys 03EABH 00373H ROM_CODE pedo_alg_thre_det2 - 04228H 00502H - ROM_CODE led_cam 0472AH 000DBH - ROM_CODE led_pow 04805H 00182H - @@BASE 04987H 004C6H CSEG BASE - @@BASE loader 04987H 00000H - @@BASE pm 04987H 0003FH - @@BASE i2c_ctr 049C6H 0018DH - @@BASE main 04B53H 00000H - @@BASE magic 04B53H 00000H - @@BASE WDT 04B53H 00000H - @@BASE i2c_mcu 04B53H 0009CH - @@BASE i2c_twl 04BEFH 000CBH - @@BASE led 04CBAH 00000H - @@BASE rtc 04CBAH 0005EH - @@BASE vreg_ctr 04D18H 00000H - @@BASE vreg_twl 04D18H 00000H - @@BASE adc 04D18H 000B3H - @@BASE renge 04DCBH 00000H - @@BASE accero 04DCBH 0004AH + 0421EH 00502H + ROM_CODE led_cam 04720H 000DBH + ROM_CODE led_pow 047FBH 00182H + @@BASE 0497DH 004C6H CSEG BASE + @@BASE loader 0497DH 00000H + @@BASE pm 0497DH 0003FH + @@BASE i2c_ctr 049BCH 0018DH + @@BASE main 04B49H 00000H + @@BASE magic 04B49H 00000H + @@BASE WDT 04B49H 00000H + @@BASE i2c_mcu 04B49H 0009CH + @@BASE i2c_twl 04BE5H 000CBH + @@BASE led 04CB0H 00000H + @@BASE rtc 04CB0H 0005EH + @@BASE vreg_ctr 04D0EH 00000H + @@BASE vreg_twl 04D0EH 00000H + @@BASE adc 04D0EH 000B3H + @@BASE renge 04DC1H 00000H + @@BASE accero 04DC1H 0004AH @@BASE self_flash - 04E15H 00000H - @@BASE sw 04E15H 00000H + 04E0BH 00000H + @@BASE sw 04E0BH 00000H @@BASE task_debug - 04E15H 00000H + 04E0BH 00000H @@BASE task_misc - 04E15H 00000H - @@BASE task_sys 04E15H 00000H + 04E0BH 00000H + @@BASE task_sys 04E0BH 00000H @@BASE pedo_alg_thre_det2 - 04E15H 00000H - @@BASE ini_VECT 04E15H 00038H + 04E0BH 00000H + @@BASE ini_VECT 04E0BH 00038H @@BASE task_status - 04E4DH 00000H - @@BASE led_cam 04E4DH 00000H - @@BASE led_pow 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL @cstart 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL pm 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL led 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL rtc 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL adc 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL renge 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL accero 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL sw 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP + 04E43H 00000H + @@BASE led_cam 04E43H 00000H + @@BASE led_pow 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL @cstart 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL pm 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL led 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL rtc 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL adc 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL renge 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL accero 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL sw 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP @@CNSTL task_misc - 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL task_sys 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP + 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL task_sys 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL led_cam 04E4DH 00000H - @@CNSTL 04E4DH 00000H CSEG PAGE64KP - @@CNSTL led_pow 04E4DH 00000H - @@R_INIS 04E4DH 00000H CSEG UNIT64KP - @@R_INIS @cstart 04E4DH 00000H - @@R_INIS loader 04E4DH 00000H - @@R_INIS pm 04E4DH 00000H - @@R_INIS i2c_ctr 04E4DH 00000H - @@R_INIS main 04E4DH 00000H - @@R_INIS magic 04E4DH 00000H - @@R_INIS WDT 04E4DH 00000H - @@R_INIS i2c_mcu 04E4DH 00000H - @@R_INIS i2c_twl 04E4DH 00000H - @@R_INIS led 04E4DH 00000H - @@R_INIS rtc 04E4DH 00000H - @@R_INIS vreg_ctr 04E4DH 00000H - @@R_INIS vreg_twl 04E4DH 00000H - @@R_INIS adc 04E4DH 00000H - @@R_INIS renge 04E4DH 00000H - @@R_INIS accero 04E4DH 00000H + 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL led_cam 04E43H 00000H + @@CNSTL 04E43H 00000H CSEG PAGE64KP + @@CNSTL led_pow 04E43H 00000H + @@R_INIS 04E43H 00000H CSEG UNIT64KP + @@R_INIS @cstart 04E43H 00000H + @@R_INIS loader 04E43H 00000H + @@R_INIS pm 04E43H 00000H + @@R_INIS i2c_ctr 04E43H 00000H + @@R_INIS main 04E43H 00000H + @@R_INIS magic 04E43H 00000H + @@R_INIS WDT 04E43H 00000H + @@R_INIS i2c_mcu 04E43H 00000H + @@R_INIS i2c_twl 04E43H 00000H + @@R_INIS led 04E43H 00000H + @@R_INIS rtc 04E43H 00000H + @@R_INIS vreg_ctr 04E43H 00000H + @@R_INIS vreg_twl 04E43H 00000H + @@R_INIS adc 04E43H 00000H + @@R_INIS renge 04E43H 00000H + @@R_INIS accero 04E43H 00000H @@R_INIS self_flash - 04E4DH 00000H - @@R_INIS sw 04E4DH 00000H + 04E43H 00000H + @@R_INIS sw 04E43H 00000H @@R_INIS task_debug - 04E4DH 00000H + 04E43H 00000H @@R_INIS task_misc - 04E4DH 00000H - @@R_INIS task_sys 04E4DH 00000H + 04E43H 00000H + @@R_INIS task_sys 04E43H 00000H @@R_INIS pedo_alg_thre_det2 - 04E4DH 00000H - @@R_INIS ini_VECT 04E4DH 00000H + 04E43H 00000H + @@R_INIS ini_VECT 04E43H 00000H @@R_INIS task_status - 04E4DH 00000H - @@R_INIS led_cam 04E4DH 00000H - @@R_INIS led_pow 04E4DH 00000H - @@R_INIS @rom 04E4DH 00000H - @@CALT 04E4DH 00000H CSEG - @@CALT @cstart 04E4DH 00000H - @@CALT loader 04E4DH 00000H - @@CALT pm 04E4DH 00000H - @@CALT i2c_ctr 04E4DH 00000H - @@CALT main 04E4DH 00000H - @@CALT magic 04E4DH 00000H - @@CALT WDT 04E4DH 00000H - @@CALT i2c_mcu 04E4DH 00000H - @@CALT i2c_twl 04E4DH 00000H - @@CALT led 04E4DH 00000H - @@CALT rtc 04E4DH 00000H - @@CALT vreg_ctr 04E4DH 00000H - @@CALT vreg_twl 04E4DH 00000H - @@CALT adc 04E4DH 00000H - @@CALT renge 04E4DH 00000H - @@CALT accero 04E4DH 00000H + 04E43H 00000H + @@R_INIS led_cam 04E43H 00000H + @@R_INIS led_pow 04E43H 00000H + @@R_INIS @rom 04E43H 00000H + @@CALT 04E43H 00000H CSEG + @@CALT @cstart 04E43H 00000H + @@CALT loader 04E43H 00000H + @@CALT pm 04E43H 00000H + @@CALT i2c_ctr 04E43H 00000H + @@CALT main 04E43H 00000H + @@CALT magic 04E43H 00000H + @@CALT WDT 04E43H 00000H + @@CALT i2c_mcu 04E43H 00000H + @@CALT i2c_twl 04E43H 00000H + @@CALT led 04E43H 00000H + @@CALT rtc 04E43H 00000H + @@CALT vreg_ctr 04E43H 00000H + @@CALT vreg_twl 04E43H 00000H + @@CALT adc 04E43H 00000H + @@CALT renge 04E43H 00000H + @@CALT accero 04E43H 00000H @@CALT self_flash - 04E4DH 00000H - @@CALT sw 04E4DH 00000H + 04E43H 00000H + @@CALT sw 04E43H 00000H @@CALT task_debug - 04E4DH 00000H + 04E43H 00000H @@CALT task_misc - 04E4DH 00000H - @@CALT task_sys 04E4DH 00000H + 04E43H 00000H + @@CALT task_sys 04E43H 00000H @@CALT pedo_alg_thre_det2 - 04E4DH 00000H - @@CALT ini_VECT 04E4DH 00000H + 04E43H 00000H + @@CALT ini_VECT 04E43H 00000H @@CALT task_status - 04E4DH 00000H - @@CALT led_cam 04E4DH 00000H - @@CALT led_pow 04E4DH 00000H - @@RLINIT 04E4DH 00000H CSEG UNIT64KP - @@RLINIT loader 04E4DH 00000H - @@RLINIT pm 04E4DH 00000H - @@RLINIT i2c_ctr 04E4DH 00000H - @@RLINIT main 04E4DH 00000H - @@RLINIT magic 04E4DH 00000H - @@RLINIT WDT 04E4DH 00000H - @@RLINIT i2c_mcu 04E4DH 00000H - @@RLINIT i2c_twl 04E4DH 00000H - @@RLINIT led 04E4DH 00000H - @@RLINIT rtc 04E4DH 00000H - @@RLINIT vreg_ctr 04E4DH 00000H - @@RLINIT vreg_twl 04E4DH 00000H - @@RLINIT adc 04E4DH 00000H - @@RLINIT renge 04E4DH 00000H - @@RLINIT accero 04E4DH 00000H + 04E43H 00000H + @@CALT led_cam 04E43H 00000H + @@CALT led_pow 04E43H 00000H + @@RLINIT 04E43H 00000H CSEG UNIT64KP + @@RLINIT loader 04E43H 00000H + @@RLINIT pm 04E43H 00000H + @@RLINIT i2c_ctr 04E43H 00000H + @@RLINIT main 04E43H 00000H + @@RLINIT magic 04E43H 00000H + @@RLINIT WDT 04E43H 00000H + @@RLINIT i2c_mcu 04E43H 00000H + @@RLINIT i2c_twl 04E43H 00000H + @@RLINIT led 04E43H 00000H + @@RLINIT rtc 04E43H 00000H + @@RLINIT vreg_ctr 04E43H 00000H + @@RLINIT vreg_twl 04E43H 00000H + @@RLINIT adc 04E43H 00000H + @@RLINIT renge 04E43H 00000H + @@RLINIT accero 04E43H 00000H @@RLINIT self_flash - 04E4DH 00000H - @@RLINIT sw 04E4DH 00000H + 04E43H 00000H + @@RLINIT sw 04E43H 00000H @@RLINIT task_debug - 04E4DH 00000H + 04E43H 00000H @@RLINIT task_misc - 04E4DH 00000H - @@RLINIT task_sys 04E4DH 00000H + 04E43H 00000H + @@RLINIT task_sys 04E43H 00000H @@RLINIT pedo_alg_thre_det2 - 04E4DH 00000H - @@RLINIT ini_VECT 04E4DH 00000H + 04E43H 00000H + @@RLINIT ini_VECT 04E43H 00000H @@RLINIT task_status - 04E4DH 00000H - @@RLINIT led_cam 04E4DH 00000H - @@RLINIT led_pow 04E4DH 00000H - @@RLINIT @rom 04E4DH 00000H - @@CODEL 04E4DH 00000H CSEG - @@CODEL pm 04E4DH 00000H - @@CODEL i2c_ctr 04E4DH 00000H - @@CODEL magic 04E4DH 00000H - @@CODEL i2c_twl 04E4DH 00000H - @@CODEL led 04E4DH 00000H - @@CODEL rtc 04E4DH 00000H - @@CODEL vreg_ctr 04E4DH 00000H - @@CODEL vreg_twl 04E4DH 00000H - @@CODEL adc 04E4DH 00000H - @@CODEL renge 04E4DH 00000H - @@CODEL accero 04E4DH 00000H - @@CODEL sw 04E4DH 00000H + 04E43H 00000H + @@RLINIT led_cam 04E43H 00000H + @@RLINIT led_pow 04E43H 00000H + @@RLINIT @rom 04E43H 00000H + @@CODEL 04E43H 00000H CSEG + @@CODEL pm 04E43H 00000H + @@CODEL i2c_ctr 04E43H 00000H + @@CODEL magic 04E43H 00000H + @@CODEL i2c_twl 04E43H 00000H + @@CODEL led 04E43H 00000H + @@CODEL rtc 04E43H 00000H + @@CODEL vreg_ctr 04E43H 00000H + @@CODEL vreg_twl 04E43H 00000H + @@CODEL adc 04E43H 00000H + @@CODEL renge 04E43H 00000H + @@CODEL accero 04E43H 00000H + @@CODEL sw 04E43H 00000H @@CODEL task_misc - 04E4DH 00000H - @@CODEL task_sys 04E4DH 00000H + 04E43H 00000H + @@CODEL task_sys 04E43H 00000H @@CODEL pedo_alg_thre_det2 - 04E4DH 00000H - @@CODEL ini_VECT 04E4DH 00000H - @@CODEL led_cam 04E4DH 00000H - @@CODEL led_pow 04E4DH 00000H -* gap * 04E4DH 00001H - @@CNSTL 04E4EH 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04E4EH 0000AH - @@R_INIT 04E58H 00038H CSEG UNIT64KP - @@R_INIT @cstart 04E58H 00000H - @@R_INIT loader 04E58H 00000H - @@R_INIT pm 04E58H 00002H - @@R_INIT i2c_ctr 04E5AH 00002H - @@R_INIT main 04E5CH 00000H - @@R_INIT magic 04E5CH 00000H - @@R_INIT WDT 04E5CH 00000H - @@R_INIT i2c_mcu 04E5CH 00000H - @@R_INIT i2c_twl 04E5CH 00000H - @@R_INIT led 04E5CH 00000H - @@R_INIT rtc 04E5CH 00000H - @@R_INIT vreg_ctr 04E5CH 00000H - @@R_INIT vreg_twl 04E5CH 00000H - @@R_INIT adc 04E5CH 0000CH - @@R_INIT renge 04E68H 00014H - @@R_INIT accero 04E7CH 00000H + 04E43H 00000H + @@CODEL ini_VECT 04E43H 00000H + @@CODEL led_cam 04E43H 00000H + @@CODEL led_pow 04E43H 00000H +* gap * 04E43H 00001H + @@CNSTL 04E44H 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04E44H 0000AH + @@R_INIT 04E4EH 00038H CSEG UNIT64KP + @@R_INIT @cstart 04E4EH 00000H + @@R_INIT loader 04E4EH 00000H + @@R_INIT pm 04E4EH 00002H + @@R_INIT i2c_ctr 04E50H 00002H + @@R_INIT main 04E52H 00000H + @@R_INIT magic 04E52H 00000H + @@R_INIT WDT 04E52H 00000H + @@R_INIT i2c_mcu 04E52H 00000H + @@R_INIT i2c_twl 04E52H 00000H + @@R_INIT led 04E52H 00000H + @@R_INIT rtc 04E52H 00000H + @@R_INIT vreg_ctr 04E52H 00000H + @@R_INIT vreg_twl 04E52H 00000H + @@R_INIT adc 04E52H 0000CH + @@R_INIT renge 04E5EH 00014H + @@R_INIT accero 04E72H 00000H @@R_INIT self_flash - 04E7CH 00000H - @@R_INIT sw 04E7CH 00002H + 04E72H 00000H + @@R_INIT sw 04E72H 00002H @@R_INIT task_debug - 04E7EH 00000H + 04E74H 00000H @@R_INIT task_misc - 04E7EH 00000H - @@R_INIT task_sys 04E7EH 00002H + 04E74H 00000H + @@R_INIT task_sys 04E74H 00002H @@R_INIT pedo_alg_thre_det2 - 04E80H 00006H - @@R_INIT ini_VECT 04E86H 00000H + 04E76H 00006H + @@R_INIT ini_VECT 04E7CH 00000H @@R_INIT task_status - 04E86H 00002H - @@R_INIT led_cam 04E88H 00002H - @@R_INIT led_pow 04E8AH 00006H - @@R_INIT @rom 04E90H 00000H - @@LCODEL 04E90H 00008H CSEG - @@LCODEL abs 04E90H 00008H -* gap * 04E98H 0015EH + 04E7CH 00002H + @@R_INIT led_cam 04E7EH 00002H + @@R_INIT led_pow 04E80H 00006H + @@R_INIT @rom 04E86H 00000H + @@LCODEL 04E86H 00008H CSEG + @@LCODEL abs 04E86H 00008H +* gap * 04E8EH 00168H MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH diff --git a/trunk/bsr_system.h b/trunk/bsr_system.h index c15dfd4..6f5bb61 100644 --- a/trunk/bsr_system.h +++ b/trunk/bsr_system.h @@ -46,7 +46,6 @@ typedef struct _system_status_ enum poweron_reason_ poweron_reason; unsigned char reboot:1; // unsigned char info_fullcolor:1; - unsigned char force_off:1; unsigned char captureBox:1; // キャプチャ箱 SDKには実機と返す unsigned char taikendai:1; unsigned char taikendai_nbd:1; @@ -55,6 +54,7 @@ typedef struct _system_status_ enum family_ family; }system_status_; +extern bit force_off; extern system_status_ system_status; diff --git a/trunk/config.h b/trunk/config.h index bb8b5ac..32c3014 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -1,6 +1,9 @@ #ifndef __config__ #define __config__ + +// デバッグ向けスイッチ + //#define _debug_led_ //#define _ALLOW_NOBATT_ //#define _DEBUG_BT_FUEL_ @@ -12,13 +15,15 @@ //#define _ENABLE_WDT_TEST_ //#define _FORCE_TAIKENDAI_ //#define _FORCE_TAIKENDAI_NBD_ + + +// 特殊仕様ファーム +//#define _TAIKENDAI_ +// homeメニューに入れてしまうのを回避する特殊ファームをつくる。ROMが足りないので電池パラメータ周りをパスする //#define _TAIKENDAI_SEISAN_SPECIAL_ +// 生産中に体験台向け使用が発症すると、アダプタがないと電源が入らずに検査に支障があるので一時ファーム //#define _RVD_ - -// 生産中に体験台向け使用が発症すると、アダプタがないと電源が入らずに検査に支障があるので一時ファーム - -// #define _TAIKENDAI_ -// homeメニューに入れてしまうのを回避する特殊ファームをつくる。ROMが足りないので電池パラメータ周りをパスする +// デバッガアタッチ時にターゲットリセットで電源が切れてしまうのを回避 #define MCU_VER_MAJOR 0x01 diff --git a/trunk/hoge.bin b/trunk/hoge.bin index a252c7f..b52e71c 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/i2c_ctr.c b/trunk/i2c_ctr.c index b90d3ef..4d56ebf 100644 --- a/trunk/i2c_ctr.c +++ b/trunk/i2c_ctr.c @@ -104,9 +104,7 @@ __interrupt void int_iic_ctr( ) IRQ0_ast; } } - - // 歩数計読み出し終了 - hosu_read_end( ); + hosu_read_end( ); // 歩数計読み出し終了 rtc_unlock( ); iic_burst_state = 0; return; diff --git a/trunk/incs.h b/trunk/incs.h index 0dec58e..4ac3b15 100644 --- a/trunk/incs.h +++ b/trunk/incs.h @@ -5,8 +5,18 @@ #pragma stop #pragma halt +#ifndef _WIN32 #pragma section @@CODE ROM_CODE //#pragma section @@CNST ROM_CNST +#endif + +# ifdef _WIN32 +// VCの赤線をどうにかする +#include "sim/simOnWin.h" + +# endif + + //========================================================= #ifndef _incs_h_ diff --git a/trunk/jhl_defs.h b/trunk/jhl_defs.h index 77d17d3..b0b36c6 100644 --- a/trunk/jhl_defs.h +++ b/trunk/jhl_defs.h @@ -26,85 +26,4 @@ typedef signed short sx16; } \ } - -# ifdef _WIN32 -// VCの赤線をどうにかする - -#define bit bool - -void EI(){}; -void DI(){}; -void HALT(){}; -void NOP(){}; - -#define __interrupt -#define __far - - -typedef struct hoge -{ - unsigned _7 :1; - unsigned _6 :1; - unsigned _5 :1; - unsigned _4 :1; - unsigned _3 :1; - unsigned _2 :1; - unsigned _1 :1; - unsigned _0 :1; -}mcu_reg; - -mcu_reg P0; -mcu_reg PM0; -mcu_reg PM1; -mcu_reg P1; -mcu_reg P2; -mcu_reg PM2; -mcu_reg PM3; -mcu_reg P3; -mcu_reg P4; -mcu_reg P5; -mcu_reg PM5; -mcu_reg PU5; -mcu_reg P7; -mcu_reg PM7; -mcu_reg P14; -mcu_reg PM14; -mcu_reg PU20; -mcu_reg PM20; -mcu_reg P20; - -unsigned char PMK23; -unsigned char RTCIMK; -unsigned char WDTE; -unsigned char PM2; -unsigned char PU7; - -unsigned char WDTE; - -void EI(){;} -void DI(){;} - -unsigned char RWAIT; -unsigned char RWST; - -unsigned char bcdtob( unsigned char ); - -unsigned char HOUR; -unsigned char DAY; -unsigned char MONTH; -unsigned char YEAR; -unsigned char MIN; -unsigned char SEC; - -unsigned char TDR06 -unsigned char TDR03 - -unsigned char TDR01 -unsigned char TDR07 -unsigned char TDR05 -unsigned char TDR02 - - -# endif - #endif diff --git a/trunk/main.c b/trunk/main.c index 57bac84..4cb0b9c 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -21,6 +21,7 @@ // ======================================================== system_status_ system_status; uni_pool pool; +bit force_off; #ifdef i2c_timeout_test bit i2c_mcu_time_out_error; // I2Cが何らかで詰まった。結露など含む。 diff --git a/trunk/pedo_alg_thre_det2.c b/trunk/pedo_alg_thre_det2.c index b32a0cf..a17faf2 100644 --- a/trunk/pedo_alg_thre_det2.c +++ b/trunk/pedo_alg_thre_det2.c @@ -8,7 +8,10 @@ #pragma bcd #include "incs.h" + +#ifndef _WIN32 #include +#endif #include "accero.h" #include "pedometer.h" diff --git a/trunk/pm.c b/trunk/pm.c index cdcdaba..8fb1bec 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -22,7 +22,7 @@ // ======================================================== u8 raw_adc_temperature; BT_VENDER battery_manufacturer = BT_VENDER_NOT_CHECKED; -static u8 reg_shadow; // NTR PMIC レジスタミラー +static u8 ntr_pm_reg_shadow; // NTR PMIC レジスタミラー bit bt_authorized; // バッテリパラメータ送信済。充電開始許可 u8 chg_led_override; // アダプタ差したとき、充電するしないに関わらずしばらく点灯させる @@ -50,6 +50,9 @@ static void BT_mgic_init(); static void bt_chk_temparature(); static void bt_get_charge_status(); static void bt_param_select(); +static void bt_batt_update_twl(); +static void bt_batt_update_ntr(); + // ======================================================== @@ -136,6 +139,11 @@ void tsk_batt( ) } +#define RAW_TEMP_LH 75 +#define RAW_TEMP_LL 61 +#define RAW_TEMP_HL 184 +#define RAW_TEMP_HH 189 +#define AVG_COUNT 40 /* ******************************************************* 温度チェック @@ -145,10 +153,10 @@ void bt_chk_temparature() { static u8 heikinka_h,heikinka_l; - if(( 75 <= raw_adc_temperature ) - && ( raw_adc_temperature <= 184 )) + if(( RAW_TEMP_LH <= raw_adc_temperature ) + && ( raw_adc_temperature <= RAW_TEMP_HL )) { - if( heikinka_h < 40 ) + if( heikinka_h < AVG_COUNT ) { heikinka_h++; } @@ -157,10 +165,10 @@ void bt_chk_temparature() temp_zone_charge_disable = false; // 充電許可 } } - else if(( raw_adc_temperature <= 61 ) - || ( 189 <= raw_adc_temperature )) + else if(( raw_adc_temperature <= RAW_TEMP_LL ) + || ( RAW_TEMP_HH <= raw_adc_temperature )) { - if( heikinka_l < 40 ) + if( heikinka_l < AVG_COUNT ) { heikinka_l++; } @@ -438,30 +446,28 @@ static void BT_mgic_init() iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 4, origParam ); // 3. 一時的にOCVを変更 - send_cmd_mgic_2B( BT_GAUGE_REG_OCV, swap_endian_16( p_bt_param->ocv )); // マジックナンバー的なもの。メーカー指定 + send_cmd_mgic_2B( BT_GAUGE_REG_OCV, swap_endian_16( p_bt_param->ocv )); // マジックナンバー的なもの。メーカー指定 // 4. 一時的にRCOMPを変更 send_cmd_mgic_2B( BT_GAUGE_REG_RCOMP, swap_endian_16( 0xFF00 ) ); // 5.メーカー別パラメータのロード { - // 苦肉の策... 誤判定耐性が下がるわけではないし - BT_VENDER bt_manuf_temp = battery_manufacturer; - u8 loop; + u8 loop; // 16バイトごとに区切れとのこと　（ノイズ対策とか言うんだけど、意味あるんか？） - for( loop = 0; loop < 4; loop++ ) - { - iic_mcu_set_wo_dma( ); - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM + loop*16, 16, p_bt_param->mg_param + loop*16 ); - } + for( loop = 0; loop < 4; loop++ ) + { + iic_mcu_set_wo_dma( ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM + loop*16, 16, p_bt_param->mg_param + loop*16 ); + } } // 6. 150ms以上待つ wait_ms( 150 + 15 ); // 7. OCVに「とある値」を書く - send_cmd_mgic_2B( BT_GAUGE_REG_OCV, swap_endian_16( p_bt_param->ocv ) ); // マジックナンバー的なもの。メーカー指定 + send_cmd_mgic_2B( BT_GAUGE_REG_OCV, swap_endian_16( p_bt_param->ocv ) ); // マジックナンバー的なもの。メーカー指定 // 8. 150〜600ms待つ。600msは厳守 wait_ms( 150 + 15 ); @@ -469,7 +475,7 @@ static void BT_mgic_init() // 9. SOCを読む。ベリファイのため。 temp = iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC ); - if(( p_bt_param->verify.low <= temp ) && ( temp <= p_bt_param->verify.hi )) + if(( p_bt_param->verify.low <= temp ) && ( temp <= p_bt_param->verify.hi )) { // カスタムモデル書き込みOK！ }else{ @@ -524,13 +530,13 @@ task_status_immed tski_BT_temp_update( ) newrcomp = 0; if( temperature > 20 ) { - newrcomp = ( ( temperature - 20 ) * p_bt_param->rcomp.up )/256; + newrcomp = ( ( temperature - 20 ) * p_bt_param->rcomp.up )/256; } else { newrcomp = ( ( temperature - 20 ) * p_bt_param->rcomp.down )/256; } - newrcomp = p_bt_param->rcomp.rcomp + newrcomp; + newrcomp = p_bt_param->rcomp.rcomp + newrcomp; if( newrcomp > 255 ) { @@ -621,13 +627,13 @@ void BT_get_left(){ vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_MGIC_ERR; bt_authorized = false; vreg_ctr[ VREG_C_BT_REMAIN ] = 0; - system_status.force_off = true; + force_off = true; } else { // バッテリパラメータの関係でビットシフトが必要 bt_volt16 = temp_fuel[0] * 256 + temp_fuel[1]; - bt_volt16 /= p_bt_param->v_scale; + bt_volt16 /= p_bt_param->v_scale; temp_fuel[0] = (u8)(( bt_volt16 >> 8 ) & 0xFF); if( temp_fuel[0] == 0 ) { @@ -677,15 +683,15 @@ void BT_get_left(){ } else { - system_status.force_off = true; + force_off = true; hysteresis = 500; } } } // 充電許可（＝アダプタも刺さってる）のに充電してない - // かつ、（少なくとも）素の電池残量が60%以上（CCICバグ回避） - // = 充電完了。電池がへたってくるとMGICが100%を返さない + // かつ、（少なくとも）素の電池残量が60%以上（CCICバグ回避） + // = 充電完了。電池がへたってくるとMGICが100%を返さない if( !BT_CHG_Ena_n && BT_IN_CHG_delayed_n ){ vreg_ctr[ VREG_C_BT_REMAIN ] = 100; vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = 0; @@ -704,42 +710,15 @@ void BT_get_left(){ } } } - if( system_status.taikendai_nbd ) - { + if( system_status.taikendai_nbd ) + { vreg_ctr[ VREG_C_BT_REMAIN ] = 100; - } - } - - - // twlのレジスタ更新　(先にやらないと割り込みのタイミングがまずいかもしれない) - { - if (vreg_ctr[VREG_C_BT_REMAIN] > 80) - { - vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x0F; - } - else if (vreg_ctr[VREG_C_BT_REMAIN] > 50) - { - vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x0B; - } - else if (vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_LO) - { - vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x07; - } - else if (( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_EMPTY )|| - !BT_CHG_Ena_n ) - { // アダプタの有無で底上げ - vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x03; - } - else if (vreg_ctr[VREG_C_BT_REMAIN] > 0) - { - vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x01; - } - else - { - vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x00; } } + // twlのレジスタ更新　(CTRに割り込み入れる前に更新しないと割り込みのタイミングがまずいかもしれない) + bt_batt_update_twl(); + // 残量で割り込み。急激に減ると飛ぶことがある // { static u8 bt_remain_old_ctr; @@ -757,29 +736,8 @@ void BT_get_left(){ bt_remain_old_ctr = vreg_ctr[ VREG_C_BT_REMAIN ]; } - // PMIC-NTRに電池残量を教えてあげる - { - static bit initialized; - static bit flag; // あれ？staticでないとコンパイラに怒られる - - if( system_status.pwr_state == OFF_TRIG ) - { - initialized = false; - } - else - { - - flag = (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? NTR_PM_BT_EMPTY: NTR_PM_BT_ENOUGH ); // 1で電池切れ - - if(( ntr_pm_bt_low_old != flag ) || !initialized ) - { - initialized = true; - ntr_pm_bt_low_old = flag; - iic_mcu_write_a_byte_codec( CODEC_REG_BT, (u8)flag ); - } - } - } + bt_batt_update_ntr(); } @@ -798,10 +756,10 @@ err PM_LCD_on( ) PM_VDDLCD_on( ); - if( system_status.family == FAMILY_SPFL ) - { - SPFL_LCD_AMOL_HV_CONT = 1; - } + if( system_status.family == FAMILY_SPFL ) + { + SPFL_LCD_AMOL_HV_CONT = 1; + } wait_ms( DELAY_PM_TSS_50B_AND_TCOM ); @@ -849,18 +807,18 @@ void PM_LCD_off() } - // 液晶電源切る // - SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでも弊害ないし + // 液晶電源切る // + SPFL_LCD_AMOL_HV_CONT = 0; // 他のファミリでも弊害ないし - // 50msとか待つし、確認しましょうかね… + // 50msとか待つし、確認しましょうかね… if( read_pmic( PM_REG_ADRS_VDD_LCD ) != 0 ) { - if( system_status.family == FAMILY_SPFL ) - { - wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。数字は暫定 - } + if( system_status.family == FAMILY_SPFL ) + { + wait_ms( 10 ); // アモルファス15Vを切ったときのウェイト。数字は暫定 + } - PM_TCOM_off(); + PM_TCOM_off(); wait_ms( 1 ); PM_TCOM_VCS_off( ); wait_ms( DELAY_PM_LCD_OFF ); @@ -1020,7 +978,7 @@ err PM_sys_pow_on( ) RESET2_neg; codec_reg_init(); // CODEC 不定レジスタ初期化(reset2の後でないといけないので) - reg_shadow = 0; // 　〃　こんなところで... + ntr_pm_reg_shadow = 0; // 　〃　こんなところで... return ( ERR_SUCCESS ); } @@ -1101,8 +1059,8 @@ task_status_immed tski_ntr_pmic_comm( ) u8 reg1_old; u8 irq_work = 0; - reg1_old = reg_shadow; - reg_shadow = iic_mcu_read_a_byte( IIC_SLA_CODEC, CODEC_REG_PM ); + reg1_old = ntr_pm_reg_shadow; + ntr_pm_reg_shadow = iic_mcu_read_a_byte( IIC_SLA_CODEC, CODEC_REG_PM ); if( iic_mcu_result != ERR_SUCCESS ) { return ( ERR_FINISED ); @@ -1111,9 +1069,9 @@ task_status_immed tski_ntr_pmic_comm( ) // DI( ); // バックライト 上 //////////////////////////////////// - if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL_U ) != 0 ) + if( ( ( reg1_old ^ ntr_pm_reg_shadow ) & REG_BIT_TWL_REQ_BL_U ) != 0 ) { - if( ( reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 ) // 消えた + if( ( ntr_pm_reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 ) // 消えた { irq_work = REG_BIT_TWL_BL_U_OFF; } @@ -1124,9 +1082,9 @@ task_status_immed tski_ntr_pmic_comm( ) } // バックライト 下 - if( ( ( reg1_old ^ reg_shadow ) & REG_BIT_TWL_REQ_BL_L ) != 0 ) + if( ( ( reg1_old ^ ntr_pm_reg_shadow ) & REG_BIT_TWL_REQ_BL_L ) != 0 ) { - if( ( reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 ) // 消えた + if( ( ntr_pm_reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 ) // 消えた { irq_work |= REG_BIT_TWL_BL_L_OFF; } @@ -1138,7 +1096,7 @@ task_status_immed tski_ntr_pmic_comm( ) // EI(); - vreg_ctr[ VREG_C_STATUS_1 ] = ( vreg_ctr[ VREG_C_STATUS_1 ] & ~0x0C ) | ( reg_shadow & 0x0C ); // TWLバックライト情報のミラー + vreg_ctr[ VREG_C_STATUS_1 ] = ( vreg_ctr[ VREG_C_STATUS_1 ] & ~0x0C ) | ( ntr_pm_reg_shadow & 0x0C ); // TWLバックライト情報のミラー irq_work &= ~vreg_ctr[ VREG_C_IRQ_MASK2 ]; // set_irq 相当品 @@ -1157,7 +1115,7 @@ task_status_immed tski_ntr_pmic_comm( ) // バックライト設定 // 勝手に消しておく /// 今のところさらに細かくは分けないけど… - if( ( reg_shadow & ( REG_BIT_TWL_REQ_BL_U | REG_BIT_TWL_REQ_BL_U ) ) == 0 ) + if( ( ntr_pm_reg_shadow & ( REG_BIT_TWL_REQ_BL_U | REG_BIT_TWL_REQ_BL_U ) ) == 0 ) { vreg_ctr[ VREG_C_COMMAND2 ] = ( REG_BIT_CMD_BL_U_OFF | REG_BIT_CMD_BL_U_OFF ); renge_task_immed_add( tski_PM_BL_set ); @@ -1165,18 +1123,18 @@ task_status_immed tski_ntr_pmic_comm( ) #endif // offリクエスト ////////////////////////////////////// - if( ( reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 ) + if( ( ntr_pm_reg_shadow & REG_BIT_TWL_REQ_OFF_REQ ) != 0 ) { set_irq( VREG_C_IRQ2, REG_BIT_TWL_OFF_REQ ); } // リセットリクエスト ///////////////////////////////// - if( ( reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 ) + if( ( ntr_pm_reg_shadow & REG_BIT_TWL_REQ_RST_REQ ) != 0 ) { #if 0 // CODECバグ回避 // リセット単品でなかったら無視 - if( ( reg1_old ^ reg_shadow ) == REG_BIT_TWL_REQ_RST_REQ ) + if( ( reg1_old ^ ntr_pm_reg_shadow ) == REG_BIT_TWL_REQ_RST_REQ ) #endif { set_irq( VREG_C_IRQ2, REG_BIT_TWL_RESET_REQ ); @@ -1185,10 +1143,10 @@ task_status_immed tski_ntr_pmic_comm( ) // バックライトをマスクして書き戻す EI( ); - if( ( reg_shadow & ( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ )) != 0 ) + if( ( ntr_pm_reg_shadow & ( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ )) != 0 ) { - reg_shadow &= ~( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ ); - iic_mcu_write_a_byte_codec( CODEC_REG_PM, reg_shadow ); + ntr_pm_reg_shadow &= ~( REG_BIT_TWL_REQ_OFF_REQ | REG_BIT_TWL_REQ_RST_REQ ); + iic_mcu_write_a_byte_codec( CODEC_REG_PM, ntr_pm_reg_shadow ); } return ( ERR_FINISED ); } @@ -1275,24 +1233,85 @@ u8 read_pmic( u8 reg ) ============================================================ */ void bt_param_select() { - BT_TYPE bt_type_temp; - // 対応が増えてきたら分岐コード書き直すつもりで - if( battery_manufacturer <= BT_VENDER_3 ) - { - bt_type_temp = BT_PARAM_CTR_MAXELL; - } - else - { - bt_type_temp = BT_PARAM_CTR_PANA; - } + BT_TYPE bt_type_temp; + // 対応が増えてきたら分岐コード書き直すつもりで + if( battery_manufacturer <= BT_VENDER_3 ) + { + bt_type_temp = BT_PARAM_CTR_MAXELL; + } + else + { + bt_type_temp = BT_PARAM_CTR_PANA; + } - if( system_status.family == FAMILY_SPFL ) - { - bt_type_temp += BT_PARAM_SPFL_MAXELL; // オフセット 残念な実装で…。 - } - else if( system_status.family == FAMILY_SHRIMP ) - { - bt_type_temp += BT_PARAM_SHRIMP_MAXELL; - } - p_bt_param = &bt_param[ bt_type_temp ]; + if( system_status.family == FAMILY_SPFL ) + { + bt_type_temp += BT_PARAM_SPFL_MAXELL; // オフセット 残念な実装で…。 + } + else if( system_status.family == FAMILY_SHRIMP ) + { + bt_type_temp += BT_PARAM_SHRIMP_MAXELL; + } + p_bt_param = &bt_param[ bt_type_temp ]; +} + + + +/* ============================================================ + TWLに電池残量を教えてあげる + ============================================================ */ +static void bt_batt_update_twl() +{ + if (vreg_ctr[VREG_C_BT_REMAIN] > 80) + { + vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x0F; + } + else if (vreg_ctr[VREG_C_BT_REMAIN] > 50) + { + vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x0B; + } + else if (vreg_ctr[VREG_C_BT_REMAIN] > BATT_TH_LO) + { + vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x07; + } + else if (( vreg_ctr[ VREG_C_BT_REMAIN ] > BATT_TH_EMPTY )|| + !BT_CHG_Ena_n ) + { // アダプタの有無で底上げ + vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x03; + } + else if (vreg_ctr[VREG_C_BT_REMAIN] > 0) + { + vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x01; + } + else + { + vreg_twl[REG_TWL_INT_ADRS_POWER_INFO] = 0x00; + } +} + + +/* ============================================================ + NTRに電池残量を教えてあげる + ============================================================ */ +static void bt_batt_update_ntr() +{ + static bit initialized; + static bit flag; // あれ？staticでないとコンパイラに怒られる + + if( system_status.pwr_state == OFF_TRIG ) + { + initialized = false; + } + else + { + + flag = (( vreg_ctr[ VREG_C_BT_REMAIN ] <= BATT_TH_LO )? NTR_PM_BT_EMPTY: NTR_PM_BT_ENOUGH ); // 1で電池切れ + + if(( ntr_pm_bt_low_old != flag ) || !initialized ) + { + initialized = true; + ntr_pm_bt_low_old = flag; + iic_mcu_write_a_byte_codec( CODEC_REG_BT, (u8)flag ); + } + } } diff --git a/trunk/sw.c b/trunk/sw.c index 5ddb559..58b5b41 100644 --- a/trunk/sw.c +++ b/trunk/sw.c @@ -130,7 +130,7 @@ void tsk_sw( ) off_timeout_timer -= 1; if( off_timeout_timer == 1 ) { - system_status.force_off = true; + force_off = true; } } @@ -147,7 +147,7 @@ void tsk_sw( ) } else if( SW_pow_count == ( HOLD_THREASHOLD ) ) { - system_status.force_off = true; + force_off = true; } if( sw_pwsw_mukan_time != 0 ) diff --git a/trunk/sw.h b/trunk/sw.h index a520355..abe9715 100644 --- a/trunk/sw.h +++ b/trunk/sw.h @@ -15,6 +15,6 @@ extern bit SW_pow_mask; extern u16 off_timeout_timer; -#define clear_pow_off_countdown(){ off_timeout_timer = 0; system_status.force_off = false; } +#define clear_pow_off_countdown(){ off_timeout_timer = 0; force_off = false; } #endif diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 5c9edca..2356647 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -541,7 +541,7 @@ static void chk_emergencyExit(){ ======================================================== */ static void force_off_check() { - if( system_status.force_off ) + if( force_off ) { system_status.pwr_state = OFF_TRIG; renge_task_interval_run_force = true; diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index af75f32..edd788b 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=344, 62, 733, 655 +Geometry=28, 27, 1001, 770 Window=Normal -DispStart=40 -CaretPos=81,0 +DispStart=432 +CaretPos=433,0 Mode=Normal DispFile= Address1= @@ -139,18 +139,10 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON -[Source1] -Geometry=25, 25, 600, 750 -Window=Normal -DispStart=292 -CaretPos=281,5 -Mode=Normal -DispFile=\\Tsclient\c\78k_data\yav-mcu-basara\trunk\led.c -Accumulative=ON [Assemble] -Geometry=0, 0, 0, 0 +Geometry=43, 31, 727, 721 Window=Hide -DispStart=847627264 +DispStart=847754240 CaretPos=0,0 Address1= Address2= @@ -187,24 +179,24 @@ Data16= Case=ON Scan=OFF Direction=Down -FindStart= -FindEnd= +FindStart=0 +FindEnd=0 SaveRange=Screen SaveStart= SaveEnd= [Memory] -Geometry=0, 0, 0, 0 -Window=Hide -Boundary=0 +Geometry=244, 107, 550, 400 +Window=Normal +Boundary=163 Format=Hex Mode=Byte -Endian= +Endian=Little Ascii=OFF Idtag=OFF Address= -DispStart=FFFFFFFF -CaretPosData=0, 0 -CaretPosAscii=0, 0 +DispStart=000F2220 +CaretPosData=26, 62009 +CaretPosAscii=50176, 0 Address1= Address2= Address3= @@ -285,7 +277,7 @@ Address16= Boundary=0, 0 Mode=Hex Attribute=Show -Sort=Address +Sort=Unsort Pickup=OFF SelectSort=Address Last Name= @@ -822,9 +814,9 @@ L529=IICWL1 L530=IICWH1 L531=SVA1 [Local Variable] -Geometry=0, 0, 0, 0 -Window=Hide -Boundary=0 +Geometry=1032, 466, 400, 300 +Window=Normal +Boundary=13041851 Mode=Proper [Trace View] Geometry=0, 0, 0, 0 @@ -877,7 +869,7 @@ SaveEnd= Geometry=0, 0, 0, 0 Window=Hide Mode=Hex -Boundary=0 +Boundary=62 Pickup=OFF Name=Functional Register Bank=0 @@ -965,25 +957,26 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=981, 20, 440, 300 +Geometry=981, 20, 440, 451 Window=Normal Boundary=13762700 -0=+info_LED.info_LED,.,N,A,-,1 -1=+LED_dim_status_info_R,.,N,A,-,1 -Line=2 +0=.battery_manufacturer,P,N,A,+,1 +1=.temp_fuel,P,N,A,+,1 +2=.bt_volt16,P,N,A,+,1 +Line=3 [Quick Watch] 0=LED_dim_status_info_G,P,A,1 1=LED_dim_status_info_B,P,A,1 2=LED_dim_status_info_R,P,A,1 3=info_LED.info_LED,P,A,1 -4= -5= -6= -7= -8= -9= -10= -11= +4=temp,P,A,1 +5=p_batt_param,P,A,1 +6=loop,P,A,1 +7=system_status,P,A,1 +8=battery_manufacturer,P,A,1 +9=p_bt_param,P,A,1 +10=bt_volt16,P,A,1 +11=temp_fuel,P,A,1 12= 13= 14= @@ -993,13 +986,13 @@ Geometry=75, 75, 500, 200 Window=Normal Width=150 30 200 100 Name0=Swb00001 -Address0=led.c#_tsk_led_notify+0x84 +Address0=pm.c#_BT_get_left+0x13c Window0=ASM -Status0=OFF -Name1=Swb00002 -Address1=led.c#_tsk_led_notify+0x47 +Status0=ON +Name1=Swb00003 +Address1=pm.c#_BT_get_left+0x135 Window1=ASM -Status1=OFF +Status1=ON Count=2 [Reset] Debugger=ON diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 1283c52..ca010d2 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -36,289 +36,6 @@ TargetFile=0 [BuildMode5] BuildModeName=BSR_WM0 TargetFile=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.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\trunk\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.CC78K0R 0] Version=210 Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r @@ -1039,6 +756,295 @@ LT=8 Z=0 CommandFile=0 RA_OPT= +[ToolSet] +ToolSetName=(変更)78K0R Software Package V1.10 +Tool1=CC78K0R|W2.13 +Tool2=RA78K0R|W1.33 +Tool3=SK78K0R|V3.10 +Tool4=ID78K0R-QB|V3.61 +[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=0 +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\trunk\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 @@ -1049,9 +1055,3 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 -[ToolSet] -ToolSetName=(変更)78K0R Software Package V1.10 -Tool1=CC78K0R|W2.13 -Tool2=RA78K0R|W1.33 -Tool3=SK78K0R|V3.10 -Tool4=ID78K0R-QB|V3.61 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index ad49a0f..4ef0391 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,21 +1,22 @@ [ProjectManager] FrameMax=0 -FrameX=2124 -FrameY=181 -FrameCX=1323 -FrameCY=930 -OpenFile1=batt_params.h,0,596,19,1842,741,0,19,0,0 -OpenFile2=led.c,0,100,100,1295,581,2,168,45,0 -OpenFile3=ProjectWindow +FrameX=89 +FrameY=169 +FrameCX=1550 +FrameCY=921 +OpenFile1=led.c,0,100,100,1295,581,2,168,45,0 +OpenFile2=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile4=led_cam.c,0,125,125,1320,606,0,24,0,0 -OpenFile5=led_pow.c,0,150,150,1345,631,0,205,0,0 -OpenFile6=config.h,0,442,428,1557,1029,29,23,29,0 -OpenFile7=i2c_mcu.c,0,175,175,1766,882,0,303,0,0 -OpenFile8=i2c_mcu.h,0,200,200,1791,907,46,23,48,0 -OpenFile9=pm.c,0,225,225,1278,761,53,1274,57,0 -OpenFile10=OutputWindow -OutputPos=0,34,740,376,1323 +OpenFile3=led_cam.c,0,125,125,1320,606,0,24,0,0 +OpenFile4=led_pow.c,0,150,150,1345,631,0,205,0,0 +OpenFile5=config.h,0,442,428,1557,1029,29,23,29,0 +OpenFile6=i2c_mcu.c,0,175,175,1766,882,0,303,0,0 +OpenFile7=i2c_mcu.h,0,200,200,1791,907,46,23,48,0 +OpenFile8=self_flash.c,0,0,0,1195,481,21,290,12,0 +OpenFile9=batt_params.h,0,596,19,1842,741,0,31,0,0 +OpenFile10=pm.c,0,225,225,1278,761,33,54,32,0 +OpenFile11=OutputWindow +OutputPos=0,198,904,529,1655 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0