diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 7c3a118..dfd3959 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 cc14ec5..ff9b619 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:26 May 2011 Page: 1 +78K0R Linker W1.33 Date: 8 Jun 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C @@ -9,12 +9,14 @@ Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - _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 + ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w0 obj\loader.re + l obj\pm.rel obj\i2c_ctr.rel obj\main.rel obj\magic.rel obj\W + DT.rel obj\i2c_mcu.rel obj\i2c_twl.rel obj\led.rel obj\rtc.re + l obj\vreg_ctr.rel obj\vreg_twl.rel obj\adc.rel obj\renge.rel + obj\accero.rel obj\self_flash.rel obj\sw.rel obj\task_debug. + rel obj\task_misc.rel obj\task_sys.rel obj\pedo_alg_thre_det2 + .rel obj\ini_VECT.rel obj\task_status.rel obj\led_cam.rel obj + \led_pow.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -24,8 +26,8 @@ Direc-file:bsr_mcu.dr *** Link information *** 65 output segment(s) - 3E40H byte(s) real data - 5756 symbol(s) defined + 3E70H byte(s) real data + 5778 symbol(s) defined *** Memory map *** @@ -186,7 +188,7 @@ Direc-file:bsr_mcu.dr 02266H 00000H @@CNST led_cam 02266H 00000H @@CNST led_pow 02266H 00020H - ROM_CODE 02286H 02780H CSEG + ROM_CODE 02286H 027B0H CSEG ROM_CODE pm 02286H 00A93H ROM_CODE i2c_ctr 02D19H 00060H ROM_CODE i2c_twl 02D79H 0005EH @@ -197,239 +199,239 @@ Direc-file:bsr_mcu.dr ROM_CODE adc 03697H 002FCH ROM_CODE renge 03993H 00190H ROM_CODE accero 03B23H 0013DH - ROM_CODE sw 03C60H 0013DH + ROM_CODE sw 03C60H 00178H ROM_CODE task_misc - 03D9DH 0017FH - ROM_CODE task_sys 03F1CH 0038BH + 03DD8H 0017FH + ROM_CODE task_sys 03F57H 00380H ROM_CODE pedo_alg_thre_det2 - 042A7H 00502H - ROM_CODE led_cam 047A9H 000DBH - ROM_CODE led_pow 04884H 00182H - @@BASE 04A06H 004C6H CSEG BASE - @@BASE loader 04A06H 00000H - @@BASE pm 04A06H 0003FH - @@BASE i2c_ctr 04A45H 0018DH - @@BASE main 04BD2H 00000H - @@BASE magic 04BD2H 00000H - @@BASE WDT 04BD2H 00000H - @@BASE i2c_mcu 04BD2H 0009CH - @@BASE i2c_twl 04C6EH 000CBH - @@BASE led 04D39H 00000H - @@BASE rtc 04D39H 0005EH - @@BASE vreg_ctr 04D97H 00000H - @@BASE vreg_twl 04D97H 00000H - @@BASE adc 04D97H 000B3H - @@BASE renge 04E4AH 00000H - @@BASE accero 04E4AH 0004AH + 042D7H 00502H + ROM_CODE led_cam 047D9H 000DBH + ROM_CODE led_pow 048B4H 00182H + @@BASE 04A36H 004C6H CSEG BASE + @@BASE loader 04A36H 00000H + @@BASE pm 04A36H 0003FH + @@BASE i2c_ctr 04A75H 0018DH + @@BASE main 04C02H 00000H + @@BASE magic 04C02H 00000H + @@BASE WDT 04C02H 00000H + @@BASE i2c_mcu 04C02H 0009CH + @@BASE i2c_twl 04C9EH 000CBH + @@BASE led 04D69H 00000H + @@BASE rtc 04D69H 0005EH + @@BASE vreg_ctr 04DC7H 00000H + @@BASE vreg_twl 04DC7H 00000H + @@BASE adc 04DC7H 000B3H + @@BASE renge 04E7AH 00000H + @@BASE accero 04E7AH 0004AH @@BASE self_flash - 04E94H 00000H - @@BASE sw 04E94H 00000H + 04EC4H 00000H + @@BASE sw 04EC4H 00000H @@BASE task_debug - 04E94H 00000H + 04EC4H 00000H @@BASE task_misc - 04E94H 00000H - @@BASE task_sys 04E94H 00000H + 04EC4H 00000H + @@BASE task_sys 04EC4H 00000H @@BASE pedo_alg_thre_det2 - 04E94H 00000H - @@BASE ini_VECT 04E94H 00038H + 04EC4H 00000H + @@BASE ini_VECT 04EC4H 00038H @@BASE task_status - 04ECCH 00000H - @@BASE led_cam 04ECCH 00000H - @@BASE led_pow 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL @cstart 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL pm 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL led 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL rtc 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL adc 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL renge 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL accero 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL sw 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP + 04EFCH 00000H + @@BASE led_cam 04EFCH 00000H + @@BASE led_pow 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL @cstart 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL pm 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL i2c_ctr 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL i2c_twl 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL led 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL rtc 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL vreg_ctr 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL vreg_twl 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL adc 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL renge 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL accero 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL sw 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP @@CNSTL task_misc - 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL task_sys 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP + 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL task_sys 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL led_cam 04ECCH 00000H - @@CNSTL 04ECCH 00000H CSEG PAGE64KP - @@CNSTL led_pow 04ECCH 00000H - @@CNSTL 04ECCH 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04ECCH 0000AH - @@R_INIT 04ED6H 00038H CSEG UNIT64KP - @@R_INIT @cstart 04ED6H 00000H - @@R_INIT loader 04ED6H 00000H - @@R_INIT pm 04ED6H 00002H - @@R_INIT i2c_ctr 04ED8H 00002H - @@R_INIT main 04EDAH 00000H - @@R_INIT magic 04EDAH 00000H - @@R_INIT WDT 04EDAH 00000H - @@R_INIT i2c_mcu 04EDAH 00000H - @@R_INIT i2c_twl 04EDAH 00000H - @@R_INIT led 04EDAH 00000H - @@R_INIT rtc 04EDAH 00000H - @@R_INIT vreg_ctr 04EDAH 00000H - @@R_INIT vreg_twl 04EDAH 00000H - @@R_INIT adc 04EDAH 0000CH - @@R_INIT renge 04EE6H 00014H - @@R_INIT accero 04EFAH 00000H + 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL ini_VECT 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL led_cam 04EFCH 00000H + @@CNSTL 04EFCH 00000H CSEG PAGE64KP + @@CNSTL led_pow 04EFCH 00000H + @@CNSTL 04EFCH 0000AH CSEG PAGE64KP + @@CNSTL @bcdtob 04EFCH 0000AH + @@R_INIT 04F06H 00038H CSEG UNIT64KP + @@R_INIT @cstart 04F06H 00000H + @@R_INIT loader 04F06H 00000H + @@R_INIT pm 04F06H 00002H + @@R_INIT i2c_ctr 04F08H 00002H + @@R_INIT main 04F0AH 00000H + @@R_INIT magic 04F0AH 00000H + @@R_INIT WDT 04F0AH 00000H + @@R_INIT i2c_mcu 04F0AH 00000H + @@R_INIT i2c_twl 04F0AH 00000H + @@R_INIT led 04F0AH 00000H + @@R_INIT rtc 04F0AH 00000H + @@R_INIT vreg_ctr 04F0AH 00000H + @@R_INIT vreg_twl 04F0AH 00000H + @@R_INIT adc 04F0AH 0000CH + @@R_INIT renge 04F16H 00014H + @@R_INIT accero 04F2AH 00000H @@R_INIT self_flash - 04EFAH 00000H - @@R_INIT sw 04EFAH 00002H + 04F2AH 00000H + @@R_INIT sw 04F2AH 00002H @@R_INIT task_debug - 04EFCH 00000H + 04F2CH 00000H @@R_INIT task_misc - 04EFCH 00000H - @@R_INIT task_sys 04EFCH 00002H + 04F2CH 00000H + @@R_INIT task_sys 04F2CH 00002H @@R_INIT pedo_alg_thre_det2 - 04EFEH 00006H - @@R_INIT ini_VECT 04F04H 00000H + 04F2EH 00006H + @@R_INIT ini_VECT 04F34H 00000H @@R_INIT task_status - 04F04H 00002H - @@R_INIT led_cam 04F06H 00002H - @@R_INIT led_pow 04F08H 00006H - @@R_INIT @rom 04F0EH 00000H - @@R_INIS 04F0EH 00000H CSEG UNIT64KP - @@R_INIS @cstart 04F0EH 00000H - @@R_INIS loader 04F0EH 00000H - @@R_INIS pm 04F0EH 00000H - @@R_INIS i2c_ctr 04F0EH 00000H - @@R_INIS main 04F0EH 00000H - @@R_INIS magic 04F0EH 00000H - @@R_INIS WDT 04F0EH 00000H - @@R_INIS i2c_mcu 04F0EH 00000H - @@R_INIS i2c_twl 04F0EH 00000H - @@R_INIS led 04F0EH 00000H - @@R_INIS rtc 04F0EH 00000H - @@R_INIS vreg_ctr 04F0EH 00000H - @@R_INIS vreg_twl 04F0EH 00000H - @@R_INIS adc 04F0EH 00000H - @@R_INIS renge 04F0EH 00000H - @@R_INIS accero 04F0EH 00000H + 04F34H 00002H + @@R_INIT led_cam 04F36H 00002H + @@R_INIT led_pow 04F38H 00006H + @@R_INIT @rom 04F3EH 00000H + @@R_INIS 04F3EH 00000H CSEG UNIT64KP + @@R_INIS @cstart 04F3EH 00000H + @@R_INIS loader 04F3EH 00000H + @@R_INIS pm 04F3EH 00000H + @@R_INIS i2c_ctr 04F3EH 00000H + @@R_INIS main 04F3EH 00000H + @@R_INIS magic 04F3EH 00000H + @@R_INIS WDT 04F3EH 00000H + @@R_INIS i2c_mcu 04F3EH 00000H + @@R_INIS i2c_twl 04F3EH 00000H + @@R_INIS led 04F3EH 00000H + @@R_INIS rtc 04F3EH 00000H + @@R_INIS vreg_ctr 04F3EH 00000H + @@R_INIS vreg_twl 04F3EH 00000H + @@R_INIS adc 04F3EH 00000H + @@R_INIS renge 04F3EH 00000H + @@R_INIS accero 04F3EH 00000H @@R_INIS self_flash - 04F0EH 00000H - @@R_INIS sw 04F0EH 00000H + 04F3EH 00000H + @@R_INIS sw 04F3EH 00000H @@R_INIS task_debug - 04F0EH 00000H + 04F3EH 00000H @@R_INIS task_misc - 04F0EH 00000H - @@R_INIS task_sys 04F0EH 00000H + 04F3EH 00000H + @@R_INIS task_sys 04F3EH 00000H @@R_INIS pedo_alg_thre_det2 - 04F0EH 00000H - @@R_INIS ini_VECT 04F0EH 00000H + 04F3EH 00000H + @@R_INIS ini_VECT 04F3EH 00000H @@R_INIS task_status - 04F0EH 00000H - @@R_INIS led_cam 04F0EH 00000H - @@R_INIS led_pow 04F0EH 00000H - @@R_INIS @rom 04F0EH 00000H - @@CALT 04F0EH 00000H CSEG - @@CALT @cstart 04F0EH 00000H - @@CALT loader 04F0EH 00000H - @@CALT pm 04F0EH 00000H - @@CALT i2c_ctr 04F0EH 00000H - @@CALT main 04F0EH 00000H - @@CALT magic 04F0EH 00000H - @@CALT WDT 04F0EH 00000H - @@CALT i2c_mcu 04F0EH 00000H - @@CALT i2c_twl 04F0EH 00000H - @@CALT led 04F0EH 00000H - @@CALT rtc 04F0EH 00000H - @@CALT vreg_ctr 04F0EH 00000H - @@CALT vreg_twl 04F0EH 00000H - @@CALT adc 04F0EH 00000H - @@CALT renge 04F0EH 00000H - @@CALT accero 04F0EH 00000H + 04F3EH 00000H + @@R_INIS led_cam 04F3EH 00000H + @@R_INIS led_pow 04F3EH 00000H + @@R_INIS @rom 04F3EH 00000H + @@CALT 04F3EH 00000H CSEG + @@CALT @cstart 04F3EH 00000H + @@CALT loader 04F3EH 00000H + @@CALT pm 04F3EH 00000H + @@CALT i2c_ctr 04F3EH 00000H + @@CALT main 04F3EH 00000H + @@CALT magic 04F3EH 00000H + @@CALT WDT 04F3EH 00000H + @@CALT i2c_mcu 04F3EH 00000H + @@CALT i2c_twl 04F3EH 00000H + @@CALT led 04F3EH 00000H + @@CALT rtc 04F3EH 00000H + @@CALT vreg_ctr 04F3EH 00000H + @@CALT vreg_twl 04F3EH 00000H + @@CALT adc 04F3EH 00000H + @@CALT renge 04F3EH 00000H + @@CALT accero 04F3EH 00000H @@CALT self_flash - 04F0EH 00000H - @@CALT sw 04F0EH 00000H + 04F3EH 00000H + @@CALT sw 04F3EH 00000H @@CALT task_debug - 04F0EH 00000H + 04F3EH 00000H @@CALT task_misc - 04F0EH 00000H - @@CALT task_sys 04F0EH 00000H + 04F3EH 00000H + @@CALT task_sys 04F3EH 00000H @@CALT pedo_alg_thre_det2 - 04F0EH 00000H - @@CALT ini_VECT 04F0EH 00000H + 04F3EH 00000H + @@CALT ini_VECT 04F3EH 00000H @@CALT task_status - 04F0EH 00000H - @@CALT led_cam 04F0EH 00000H - @@CALT led_pow 04F0EH 00000H - @@RLINIT 04F0EH 00000H CSEG UNIT64KP - @@RLINIT loader 04F0EH 00000H - @@RLINIT pm 04F0EH 00000H - @@RLINIT i2c_ctr 04F0EH 00000H - @@RLINIT main 04F0EH 00000H - @@RLINIT magic 04F0EH 00000H - @@RLINIT WDT 04F0EH 00000H - @@RLINIT i2c_mcu 04F0EH 00000H - @@RLINIT i2c_twl 04F0EH 00000H - @@RLINIT led 04F0EH 00000H - @@RLINIT rtc 04F0EH 00000H - @@RLINIT vreg_ctr 04F0EH 00000H - @@RLINIT vreg_twl 04F0EH 00000H - @@RLINIT adc 04F0EH 00000H - @@RLINIT renge 04F0EH 00000H - @@RLINIT accero 04F0EH 00000H + 04F3EH 00000H + @@CALT led_cam 04F3EH 00000H + @@CALT led_pow 04F3EH 00000H + @@RLINIT 04F3EH 00000H CSEG UNIT64KP + @@RLINIT loader 04F3EH 00000H + @@RLINIT pm 04F3EH 00000H + @@RLINIT i2c_ctr 04F3EH 00000H + @@RLINIT main 04F3EH 00000H + @@RLINIT magic 04F3EH 00000H + @@RLINIT WDT 04F3EH 00000H + @@RLINIT i2c_mcu 04F3EH 00000H + @@RLINIT i2c_twl 04F3EH 00000H + @@RLINIT led 04F3EH 00000H + @@RLINIT rtc 04F3EH 00000H + @@RLINIT vreg_ctr 04F3EH 00000H + @@RLINIT vreg_twl 04F3EH 00000H + @@RLINIT adc 04F3EH 00000H + @@RLINIT renge 04F3EH 00000H + @@RLINIT accero 04F3EH 00000H @@RLINIT self_flash - 04F0EH 00000H - @@RLINIT sw 04F0EH 00000H + 04F3EH 00000H + @@RLINIT sw 04F3EH 00000H @@RLINIT task_debug - 04F0EH 00000H + 04F3EH 00000H @@RLINIT task_misc - 04F0EH 00000H - @@RLINIT task_sys 04F0EH 00000H + 04F3EH 00000H + @@RLINIT task_sys 04F3EH 00000H @@RLINIT pedo_alg_thre_det2 - 04F0EH 00000H - @@RLINIT ini_VECT 04F0EH 00000H + 04F3EH 00000H + @@RLINIT ini_VECT 04F3EH 00000H @@RLINIT task_status - 04F0EH 00000H - @@RLINIT led_cam 04F0EH 00000H - @@RLINIT led_pow 04F0EH 00000H - @@RLINIT @rom 04F0EH 00000H - @@CODEL 04F0EH 00000H CSEG - @@CODEL pm 04F0EH 00000H - @@CODEL i2c_ctr 04F0EH 00000H - @@CODEL magic 04F0EH 00000H - @@CODEL i2c_twl 04F0EH 00000H - @@CODEL led 04F0EH 00000H - @@CODEL rtc 04F0EH 00000H - @@CODEL vreg_ctr 04F0EH 00000H - @@CODEL vreg_twl 04F0EH 00000H - @@CODEL adc 04F0EH 00000H - @@CODEL renge 04F0EH 00000H - @@CODEL accero 04F0EH 00000H - @@CODEL sw 04F0EH 00000H + 04F3EH 00000H + @@RLINIT led_cam 04F3EH 00000H + @@RLINIT led_pow 04F3EH 00000H + @@RLINIT @rom 04F3EH 00000H + @@CODEL 04F3EH 00000H CSEG + @@CODEL pm 04F3EH 00000H + @@CODEL i2c_ctr 04F3EH 00000H + @@CODEL magic 04F3EH 00000H + @@CODEL i2c_twl 04F3EH 00000H + @@CODEL led 04F3EH 00000H + @@CODEL rtc 04F3EH 00000H + @@CODEL vreg_ctr 04F3EH 00000H + @@CODEL vreg_twl 04F3EH 00000H + @@CODEL adc 04F3EH 00000H + @@CODEL renge 04F3EH 00000H + @@CODEL accero 04F3EH 00000H + @@CODEL sw 04F3EH 00000H @@CODEL task_misc - 04F0EH 00000H - @@CODEL task_sys 04F0EH 00000H + 04F3EH 00000H + @@CODEL task_sys 04F3EH 00000H @@CODEL pedo_alg_thre_det2 - 04F0EH 00000H - @@CODEL ini_VECT 04F0EH 00000H - @@CODEL led_cam 04F0EH 00000H - @@CODEL led_pow 04F0EH 00000H - @@LCODEL 04F0EH 00008H CSEG - @@LCODEL abs 04F0EH 00008H -* gap * 04F16H 000E0H + 04F3EH 00000H + @@CODEL ini_VECT 04F3EH 00000H + @@CODEL led_cam 04F3EH 00000H + @@CODEL led_pow 04F3EH 00000H + @@LCODEL 04F3EH 00008H CSEG + @@LCODEL abs 04F3EH 00008H +* gap * 04F46H 000B0H MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH diff --git a/trunk/config.h b/trunk/config.h index 157b419..bb8b5ac 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -13,6 +13,8 @@ //#define _FORCE_TAIKENDAI_ //#define _FORCE_TAIKENDAI_NBD_ //#define _TAIKENDAI_SEISAN_SPECIAL_ +//#define _RVD_ + // 生産中に体験台向け使用が発症すると、アダプタがないと電源が入らずに検査に支障があるので一時ファーム // #define _TAIKENDAI_ @@ -20,7 +22,7 @@ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x36 +#define MCU_VER_MINOR 0x37 // ↑改訂の時は↓気をつけないと体験台の生産できないからね！ #ifdef _TAIKENDAI_SEISAN_SPECIAL_ diff --git a/trunk/hoge.bin b/trunk/hoge.bin index 9ffe93c..88bb8ab 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/led.c b/trunk/led.c index 36b52b1..aa78b7d 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -341,7 +341,7 @@ void tsk_led_notify( ) } } - led_fade_to2( LED_duty_notify_blu, &LED_dim_status_info_B ); led_fade_to2( LED_duty_notify_red, &LED_dim_status_info_R ); led_fade_to2( LED_duty_notify_grn, &LED_dim_status_info_G ); + led_fade_to2( LED_duty_notify_blu, &LED_dim_status_info_B ); } diff --git a/trunk/loader.c b/trunk/loader.c index e805c83..f7361a6 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -171,30 +171,30 @@ void chk_platform_type() // ●CTR＆その開発機材 // // 一応初期化 - system_status.is_dev = 0; - system_status.taikendai = 0; - system_status.taikendai_nbd = 0; + system_status.is_dev = false; + system_status.taikendai = false; + system_status.taikendai_nbd = false; switch( DIPSW ) { case DIPSW_TAIKENDAI: - system_status.taikendai = 1; + system_status.taikendai = true; break; case DIPSW_TAIKENDAI_NBD: - system_status.taikendai_nbd = 1; + system_status.taikendai_nbd = true; break; case DIPSW_ISDEV: - system_status.is_dev = 1; + system_status.is_dev = true; break; } #ifdef _FORCE_TAIKENDAI_ - system_status.taikendai = 1; + system_status.taikendai = true; #endif #ifdef _FORCE_TAIKENDAI_NBD_ - system_status.taikendai_nbd = 1; + system_status.taikendai_nbd = true; #endif } diff --git a/trunk/pm.c b/trunk/pm.c index 3095951..0e0cc14 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -1132,7 +1132,6 @@ __interrupt void intp6_PM_irq( ) } -#define _type1_ /* ======================================================== PMICからの割り込みを受けて、NTR PMIC互換レジスタからリード ======================================================== */ @@ -1155,19 +1154,11 @@ task_status_immed tski_ntr_pmic_comm( ) { if( ( reg_shadow & REG_BIT_TWL_REQ_BL_U ) == 0 ) // 消えた { -#ifdef _type1_ irq_work = REG_BIT_TWL_BL_U_OFF; -#else - set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_U_OFF ); -#endif } else { -#ifdef _type1_ irq_work = REG_BIT_TWL_BL_U_ON; -#else - set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_U_ON ); -#endif } } @@ -1176,19 +1167,11 @@ task_status_immed tski_ntr_pmic_comm( ) { if( ( reg_shadow & REG_BIT_TWL_REQ_BL_L ) == 0 ) // 消えた { -#ifdef _type1_ irq_work |= REG_BIT_TWL_BL_L_OFF; -#else - set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_L_OFF ); -#endif } else { -#ifdef _type1_ irq_work |= REG_BIT_TWL_BL_L_ON; -#else - set_irq( VREG_C_IRQ2, REG_BIT_TWL_BL_L_ON ); -#endif } } @@ -1196,7 +1179,6 @@ task_status_immed tski_ntr_pmic_comm( ) vreg_ctr[ VREG_C_STATUS_1 ] = ( vreg_ctr[ VREG_C_STATUS_1 ] & ~0x0C ) | ( reg_shadow & 0x0C ); // TWLバックライト情報のミラー -#ifdef _type1_ irq_work &= ~vreg_ctr[ VREG_C_IRQ_MASK2 ]; // set_irq 相当品 if( irq_work != 0 ) @@ -1209,7 +1191,6 @@ task_status_immed tski_ntr_pmic_comm( ) while( !IRQ0 && ( ++tot != 0 ) ){;} // O.Dなのでちゃんとあがるのを待つ ＆ IRQ_mcu がLに縛られてると困る(基板不良) IRQ0_ast; } -#endif #if 0 // バックライト設定 @@ -1297,6 +1278,6 @@ void codec_reg_init() iic_mcu_write_a_byte_codec( CODEC_REG_BT, (u8)ntr_pm_bt_low_old ); // SoC から書けず vol_reset(); -// renge_task_immed_add( tski_vol_update ); +// renge_task_immed_add( tski_vol_update ); ポーリングするので。 vol_polling = 3; } diff --git a/trunk/reboot.c b/trunk/reboot.c index 2d19e8c..b784f15 100644 --- a/trunk/reboot.c +++ b/trunk/reboot.c @@ -15,7 +15,7 @@ void my_reboot(){ #asm MOV PSW,#06H ; ダミーのPSWをセット - MOVW AX,#000d0h ; リセットのベクタ値を取り込んでいます。 + MOVW AX,#000d0h ; リセットのベクタ値を取り込んでいます。 PUSH PSW PUSH AX ; これでRETIのためのスタックを準備 RETI ; これでリセット・ベクタに分岐 diff --git a/trunk/sw.c b/trunk/sw.c index fac1132..5ddb559 100644 --- a/trunk/sw.c +++ b/trunk/sw.c @@ -107,57 +107,56 @@ void tsk_sw( ) case ( SLEEP ): case ( OFF ): case ( ON_CHECK ): -#ifndef _TAIKENDAI_ - // 電源スイッチの監視 // - if( SW_pow_count == ( TIME_PWSW_CLICK ) ) // クリック時間に到達 + // 実機の場合 + if( ! system_status.taikendai ) { - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); - } - else if( SW_pow_count == ( HOLD_THREASHOLD ) ) // 長押しに到達 - { - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD ); - if( off_timeout_timer == 0 ) // 強制電源断カウントダウン開始、何度も発動しないように。 + + // 電源スイッチの監視 // + if( SW_pow_count == ( TIME_PWSW_CLICK ) ) // クリック時間に到達 { - off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16; + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); + } + else if( SW_pow_count == ( HOLD_THREASHOLD ) ) // 長押しに到達 + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_HOLD ); + if( off_timeout_timer == 0 ) // 強制電源断カウントダウン開始、何度も発動しないように。 + { + off_timeout_timer = vreg_ctr[ VREG_C_OFF_DELAY ] * 16; + } } - } - if( off_timeout_timer != 0 ) // 長押し割り込み後、タイムアウトで強制オフ。 - { - off_timeout_timer -= 1; - if( off_timeout_timer == 1 ) + if( off_timeout_timer != 0 ) // 長押し割り込み後、タイムアウトで強制オフ。 + { + off_timeout_timer -= 1; + if( off_timeout_timer == 1 ) + { + system_status.force_off = true; + } + } + + }else{ + // 電源スイッチの監視 // + if( SW_pow_count == ( TIME_PWSW_CLICK ) ) + { + if( sw_pwsw_mukan_time == 0 ) + { + set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); + // いやなタイミングでPWSWを押すとHOMEメニューに入れてしまうのを回避するためのマスクタイマー + sw_pwsw_mukan_time = TIME_MUKAN_PWSW; + } + } + else if( SW_pow_count == ( HOLD_THREASHOLD ) ) { system_status.force_off = true; } - } - - { - count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント - } - -#else // 試遊台の場合 // - // 電源スイッチの監視 // - if( SW_pow_count == ( TIME_PWSW_CLICK ) ) - { - if( sw_pwsw_mukan_time == 0 ) + + if( sw_pwsw_mukan_time != 0 ) { - set_irq( VREG_C_IRQ0, REG_BIT_SW_POW_CLICK ); - // いやなタイミングでPWSWを押すとHOMEメニューに入れてしまうのを回避するためのマスクタイマー - sw_pwsw_mukan_time = TIME_MUKAN_PWSW; + sw_pwsw_mukan_time--; } } - else if( SW_pow_count == ( HOLD_THREASHOLD ) ) - { - system_status.force_off = true; - } - if( sw_pwsw_mukan_time != 0 ) - { - sw_pwsw_mukan_time--; - } count_sw_n( SW_POW_n, SW_pow_count, SW_pow_mask ); // ボタン押し時間のカウント -#endif - // HOME スイッチ // switch( system_status.model ) @@ -177,7 +176,7 @@ void tsk_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 // + // wifi sw // /// 最悪な実装なのはわかっているが、メモリ不足と、市場に出てしまった不良スイッチを救うため if( sw_wifi_mukan_time != 0 ) { diff --git a/trunk/task_misc.c b/trunk/task_misc.c index a2f4bbe..750c834 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -96,10 +96,12 @@ void tsk_misc( ) set_irq( VREG_C_IRQ2, REG_BIT_TWL_VER_READ ); } - check_twl_vol_irq(); // TWL の音量変化割り込みチェック + // TWL の音量変化割り込みチェック // + check_twl_vol_irq(); } - update_LED_3D(); // 3D ランプ更新 + // 3D ランプ更新 // + update_LED_3D(); } @@ -225,7 +227,7 @@ task_status_immed tski_do_command0( ) PM_reset_neg(); RESET2_neg; - // CODEC 不定レジスタ初期化 + // CODEC 不定レジスタ初期化 // codec_reg_init(); } } diff --git a/trunk/task_status.c b/trunk/task_status.c index e81c844..03f74e5 100644 --- a/trunk/task_status.c +++ b/trunk/task_status.c @@ -57,9 +57,10 @@ void tsk_status( ) { if( diff & REG_BIT_BATT_CHARGE ) { - BT_CHG_STAT_Change = true; - // 充電状態に以下略 - if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BATT_CHARGE ) + BT_CHG_STAT_Change = true; + + // 充電状態に以下略 + if( vreg_ctr[VREG_C_STATUS] & REG_BIT_BATT_CHARGE ) { set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_START ); } @@ -67,7 +68,7 @@ void tsk_status( ) { set_irq( VREG_C_IRQ1, REG_BIT_BT_CHG_STOP ); } - } + } } if(( system_status.pwr_state == ON ) || diff --git a/trunk/task_sys.c b/trunk/task_sys.c index 93e316e..d43ae7a 100644 --- a/trunk/task_sys.c +++ b/trunk/task_sys.c @@ -504,20 +504,18 @@ static void chk_emergencyExit(){ else if( shirobako_power_control_count == 200 ) // * (sys_tick)[ms] // デバッガが何かしたいらしい { -// #ifdef _RVD_ +#ifndef _RVD_ // 白箱は電源を切りたいらしい system_status.pwr_state = OFF_TRIG; renge_task_interval_run_force = true; shirobako_power_control_count = WAIT_SHIROBAKO_POW_CONTROL; -// #endif +#endif } else { if( !RESET1_n ) { -// #ifdef _RVD_ if( shirobako_power_control_count != 255 ) -// #endif shirobako_power_control_count += 1; } else diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 4c3e9f2..2ae9629 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -308,7 +308,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) switch ( data ) { case ( 'r' ): - // 割り込みルーチンからFSLライブラリを呼ぶのは禁止のため + // 割り込みルーチンからFSLライブラリを呼ぶのは禁止 // マイコンを再起動。　レジスタ類も初期化される。 renge_task_immed_add( tski_mcu_reset ); break; diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index b2461ce..452762a 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -112,584 +112,9 @@ ZF=0 S=1 E=0 CommandFile=0 -[Options.RA78K0R 0] -Version=100 -G=1 -GA=1 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[Options.RA78K0R 1] -Version=100 -G=0 -GA=0 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[Options.RA78K0R 2] -Version=100 -G=1 -GA=1 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[Options.RA78K0R 3] -Version=100 -G=1 -GA=1 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[Options.RA78K0R 4] -Version=100 -G=1 -GA=1 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= -[Options.RA78K0R 5] -Version=100 -G=1 -GA=1 -E=0 -COMMON=0 -COMPATI=0 -P=1 -KA=1 -KS=0 -KX=0 -LF=0 -LW=132 -LL=0 -LT=8 -Z=0 -CommandFile=0 -RA_OPT= [BuildBefore-AfterCmd] Before1=c:\cygwin\bin\touch magic.c After1=ruby nec_s_2_bsrbin2.rb bsr.hex -[Options.CC78K0R 0] -Version=210 -Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Memorymodel=1 -Flashobj=0 -FlashStartadr= -FlashBranchStartadr= -Mirror=0 -Saddrglobalchk=0 -Saddrglobal=1066 -Saddrstaticchk=0 -Saddrstatic=1072 -Bitfieldmsb=0 -Onebytechk=0 -Pacstructchk=0 -AssignROMchk=0 -AssignROM=0 -Maxoptimizechk=0 -Maxoptimize=1104 -Charunexpandchk=1 -Unsignedchar=0 -Usesaddrchk=0 -Autoallocationchk=1 -Jumpoptimize=1 -Librarycallchk=0 -Librarycall=1129 -Aggressivechk=1 -Relativebranchchk=1 -Debugoptchk=0 -Outdebugchk=1 -Outdebug=1153 -Outasmsrccmb0=inter_asm -Outasmsrccmb1=bsr.asm -Outasmsrcchk=1 -Outasmsrc=1158 -Outasmoptall=1 -Common=0 -Outerrlistchk=0 -Outerrlist=1174 -Xreference=0 -Preprocess=0 -Prenocomment=0 -Predefine=0 -Preifdef=1 -Preinclude=0 -Preline=1 -Prenumber=1 -Formfeed=0 -Columns=132 -Lines=0 -Tablength=8 -Ansi=0 -Cpraspras=1 -Commentnest=0 -Intunexpand=0 -Kanjicode=1210 -Verbose=0 -CommandFile=0 -Warninglevel=0 -Startupchk=1 -Fixation=1 -FarROMization=0 -Objectsel=1305 -Librarychk=1 -Floatingpoint=0 -Muldivunit=1 -Mulunit=1 -Startup=s0rml.rel -Library1=cl0rdm.lib -Library2=cl0rm.lib -Library3=cl0rmf.lib -VfiFileBoot0= -VfiFileBoot1=boot.vfi -VF78K0Rchk=0 -VF78K0Rvs= -[Options.CC78K0R 1] -Version=210 -Memorymodel=2 -Flashobj=0 -FlashStartadr= -FlashBranchStartadr= -Mirror=0 -Saddrglobalchk=0 -Saddrglobal=1066 -Saddrstaticchk=0 -Saddrstatic=1072 -Bitfieldmsb=0 -Onebytechk=0 -Pacstructchk=0 -AssignROMchk=0 -AssignROM=0 -Maxoptimizechk=0 -Maxoptimize=1104 -Charunexpandchk=1 -Unsignedchar=0 -Usesaddrchk=0 -Autoallocationchk=1 -Jumpoptimize=1 -Librarycallchk=1 -Librarycall=1128 -Aggressivechk=1 -Relativebranchchk=0 -Debugoptchk=0 -Outdebugchk=0 -Outdebug=1153 -Outasmsrcchk=0 -Outasmsrc=1157 -Outasmoptall=1 -Common=0 -Outerrlistchk=0 -Outerrlist=1173 -Xreference=0 -Preprocess=0 -Prenocomment=0 -Predefine=0 -Preifdef=1 -Preinclude=0 -Preline=1 -Prenumber=1 -Formfeed=0 -Columns=132 -Lines=0 -Tablength=8 -Ansi=0 -Cpraspras=0 -Commentnest=0 -Intunexpand=0 -Kanjicode=1210 -Verbose=0 -CommandFile=0 -Warninglevel=1 -Startupchk=1 -Fixation=1 -FarROMization=1 -Objectsel=1305 -Librarychk=1 -Floatingpoint=0 -Muldivunit=1 -Mulunit=1 -Startup=s0rll.rel -Library1=cl0rdm.lib -Library2=cl0rm.lib -Library3=cl0rmf.lib -VF78K0Rchk=0 -VF78K0Rvs= -[Options.CC78K0R 2] -Version=210 -Define0= -Define1=_debug_,_TEG_,proc_is_ke3 -Define2=_debug_,_TEG_,proc_is_ke3,%time% -Define3=_TEG_,proc_is_ke3 -Define4=proc_is_ke3 -Include0=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r -Include1=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Include2=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Memorymodel=1 -Flashobj=0 -FlashStartadr= -FlashBranchStartadr= -Mirror=0 -Saddrglobalchk=0 -Saddrglobal=1066 -Saddrstaticchk=0 -Saddrstatic=1072 -Bitfieldmsb=0 -Onebytechk=0 -Pacstructchk=0 -AssignROMchk=0 -AssignROM=0 -Maxoptimizechk=0 -Maxoptimize=1104 -Charunexpandchk=0 -Unsignedchar=0 -Usesaddrchk=0 -Autoallocationchk=1 -Jumpoptimize=1 -Librarycallchk=1 -Librarycall=1129 -Aggressivechk=1 -Relativebranchchk=0 -Debugoptchk=0 -Outdebugchk=1 -Outdebug=1153 -Outasmsrccmb0=inter_asm -Outasmsrccmb1=bsr.asm -Outasmsrcchk=1 -Outasmsrc=1158 -Outasmoptall=1 -Common=0 -Outerrlistchk=0 -Outerrlist=1174 -Xreference=0 -Preprocess=0 -Prenocomment=0 -Predefine=0 -Preifdef=1 -Preinclude=1 -Preline=1 -Prenumber=1 -Formfeed=0 -Columns=132 -Lines=0 -Tablength=8 -Ansi=0 -Cpraspras=1 -Commentnest=0 -Intunexpand=1 -Kanjicode=1210 -Verbose=0 -CommandFile=0 -Warninglevel=1 -Startupchk=1 -Fixation=0 -FarROMization=0 -Objectsel=1305 -Librarychk=1 -Floatingpoint=0 -Muldivunit=1 -Mulunit=1 -Startup=s0rm.rel -Library1=cl0rdm.lib -Library2=cl0rm.lib -Library3=cl0rmf.lib -VfiFileBoot0= -VfiFileBoot1=boot.vfi -VF78K0Rchk=0 -VF78K0Rvs= -[Options.CC78K0R 3] -Version=210 -Define0=_debug_,proc_is_bsr,_TEG_ -Define1=_debug_,proc_is_bsr -Define2=proc_is_bsr -Define3=_TEG_,proc_is_ke3 -Define4=proc_is_ke3 -Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Memorymodel=1 -Flashobj=0 -FlashStartadr= -FlashBranchStartadr= -Mirror=0 -Saddrglobalchk=0 -Saddrglobal=1066 -Saddrstaticchk=0 -Saddrstatic=1072 -Bitfieldmsb=0 -Onebytechk=0 -Pacstructchk=0 -AssignROMchk=0 -AssignROM=0 -Maxoptimizechk=0 -Maxoptimize=1104 -Charunexpandchk=1 -Unsignedchar=0 -Usesaddrchk=0 -Autoallocationchk=1 -Jumpoptimize=1 -Librarycallchk=0 -Librarycall=1129 -Aggressivechk=1 -Relativebranchchk=1 -Debugoptchk=0 -Outdebugchk=1 -Outdebug=1153 -Outasmsrccmb0=inter_asm -Outasmsrccmb1=bsr.asm -Outasmsrcchk=1 -Outasmsrc=1158 -Outasmoptall=1 -Common=0 -Outerrlistchk=0 -Outerrlist=1174 -Xreference=0 -Preprocess=0 -Prenocomment=0 -Predefine=0 -Preifdef=1 -Preinclude=0 -Preline=1 -Prenumber=1 -Formfeed=0 -Columns=132 -Lines=0 -Tablength=8 -Ansi=0 -Cpraspras=1 -Commentnest=0 -Intunexpand=0 -Kanjicode=1210 -Verbose=0 -CommandFile=0 -Warninglevel=0 -Startupchk=1 -Fixation=1 -FarROMization=0 -Objectsel=1305 -Librarychk=1 -Floatingpoint=0 -Muldivunit=1 -Mulunit=1 -Startup=s0rml.rel -Library1=cl0rdm.lib -Library2=cl0rm.lib -Library3=cl0rmf.lib -VfiFileBoot0= -VfiFileBoot1=boot.vfi -VF78K0Rchk=0 -VF78K0Rvs= -[Options.CC78K0R 4] -Version=210 -Define0=proc_is_bsr -Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Memorymodel=1 -Flashobj=0 -FlashStartadr= -FlashBranchStartadr= -Mirror=0 -Saddrglobalchk=0 -Saddrglobal=1066 -Saddrstaticchk=0 -Saddrstatic=1072 -Bitfieldmsb=0 -Onebytechk=0 -Pacstructchk=0 -AssignROMchk=0 -AssignROM=0 -Maxoptimizechk=0 -Maxoptimize=1104 -Charunexpandchk=1 -Unsignedchar=0 -Usesaddrchk=0 -Autoallocationchk=1 -Jumpoptimize=1 -Librarycallchk=0 -Librarycall=1129 -Aggressivechk=1 -Relativebranchchk=1 -Debugoptchk=0 -Outdebugchk=1 -Outdebug=1153 -Outasmsrccmb0=inter_asm -Outasmsrccmb1=bsr.asm -Outasmsrcchk=1 -Outasmsrc=1158 -Outasmoptall=1 -Common=0 -Outerrlistchk=0 -Outerrlist=1174 -Xreference=0 -Preprocess=0 -Prenocomment=0 -Predefine=0 -Preifdef=1 -Preinclude=0 -Preline=1 -Prenumber=1 -Formfeed=0 -Columns=132 -Lines=0 -Tablength=8 -Ansi=0 -Cpraspras=1 -Commentnest=0 -Intunexpand=0 -Kanjicode=1210 -Verbose=0 -CommandFile=0 -Warninglevel=0 -Startupchk=1 -Fixation=1 -FarROMization=0 -Objectsel=1305 -Librarychk=1 -Floatingpoint=0 -Muldivunit=1 -Mulunit=1 -Startup=s0rml.rel -Library1=cl0rdm.lib -Library2=cl0rm.lib -Library3=cl0rmf.lib -VfiFileBoot0= -VfiFileBoot1=boot.vfi -VF78K0Rchk=0 -VF78K0Rvs= -[Options.CC78K0R 5] -Version=210 -Define0= -Define1=_debug_,proc_is_bsr,_TEG_,_WM0_ -Define2=_debug_,proc_is_bsr,_TEG_,_WM0 -Define3=_debug_,proc_is_bsr,_TEG_ -Define4=_debug_,proc_is_bsr -Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r -Memorymodel=1 -Flashobj=0 -FlashStartadr= -FlashBranchStartadr= -Mirror=0 -Saddrglobalchk=0 -Saddrglobal=1066 -Saddrstaticchk=0 -Saddrstatic=1072 -Bitfieldmsb=0 -Onebytechk=0 -Pacstructchk=0 -AssignROMchk=0 -AssignROM=0 -Maxoptimizechk=0 -Maxoptimize=1104 -Charunexpandchk=1 -Unsignedchar=0 -Usesaddrchk=0 -Autoallocationchk=1 -Jumpoptimize=1 -Librarycallchk=0 -Librarycall=1129 -Aggressivechk=1 -Relativebranchchk=1 -Debugoptchk=0 -Outdebugchk=1 -Outdebug=1153 -Outasmsrccmb0=inter_asm -Outasmsrccmb1=bsr.asm -Outasmsrcchk=1 -Outasmsrc=1158 -Outasmoptall=1 -Common=0 -Outerrlistchk=0 -Outerrlist=1174 -Xreference=0 -Preprocess=0 -Prenocomment=0 -Predefine=0 -Preifdef=1 -Preinclude=0 -Preline=1 -Prenumber=1 -Formfeed=0 -Columns=132 -Lines=0 -Tablength=8 -Ansi=0 -Cpraspras=1 -Commentnest=0 -Intunexpand=0 -Kanjicode=1210 -Verbose=0 -CommandFile=0 -Warninglevel=0 -Startupchk=1 -Fixation=1 -FarROMization=0 -Objectsel=1305 -Librarychk=1 -Floatingpoint=0 -Muldivunit=1 -Mulunit=1 -Startup=s0rml.rel -Library1=cl0rdm.lib -Library2=cl0rm.lib -Library3=cl0rmf.lib -VfiFileBoot0= -VfiFileBoot1=boot.vfi -VF78K0Rchk=0 -VF78K0Rvs= [ToolSet] ToolSetName=(変更)78K0R Software Package V1.10 Tool1=CC78K0R|W2.13 @@ -1041,6 +466,115 @@ Version=100 LCNV_GO=0 E=0 CommandFile=0 +[Options.RA78K0R 0] +Version=100 +G=1 +GA=1 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= +[Options.RA78K0R 1] +Version=100 +G=0 +GA=0 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= +[Options.RA78K0R 2] +Version=100 +O0=obj +G=1 +GA=1 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT=-oobj +[Options.RA78K0R 3] +Version=100 +G=1 +GA=1 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= +[Options.RA78K0R 4] +Version=100 +G=1 +GA=1 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= +[Options.RA78K0R 5] +Version=100 +G=1 +GA=1 +E=0 +COMMON=0 +COMPATI=0 +P=1 +KA=1 +KS=0 +KX=0 +LF=0 +LW=132 +LL=0 +LT=8 +Z=0 +CommandFile=0 +RA_OPT= [Options.78K0R] BuildMode=2 BuildMode2=K0R_dbg @@ -1051,3 +585,471 @@ 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 +Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Memorymodel=1 +Flashobj=0 +FlashStartadr= +FlashBranchStartadr= +Mirror=0 +Saddrglobalchk=0 +Saddrglobal=1066 +Saddrstaticchk=0 +Saddrstatic=1072 +Bitfieldmsb=0 +Onebytechk=0 +Pacstructchk=0 +AssignROMchk=0 +AssignROM=0 +Maxoptimizechk=0 +Maxoptimize=1104 +Charunexpandchk=1 +Unsignedchar=0 +Usesaddrchk=0 +Autoallocationchk=1 +Jumpoptimize=1 +Librarycallchk=0 +Librarycall=1129 +Aggressivechk=1 +Relativebranchchk=1 +Debugoptchk=0 +Outdebugchk=1 +Outdebug=1153 +Outasmsrccmb0=inter_asm +Outasmsrccmb1=bsr.asm +Outasmsrcchk=1 +Outasmsrc=1158 +Outasmoptall=1 +Common=0 +Outerrlistchk=0 +Outerrlist=1174 +Xreference=0 +Preprocess=0 +Prenocomment=0 +Predefine=0 +Preifdef=1 +Preinclude=0 +Preline=1 +Prenumber=1 +Formfeed=0 +Columns=132 +Lines=0 +Tablength=8 +Ansi=0 +Cpraspras=1 +Commentnest=0 +Intunexpand=0 +Kanjicode=1210 +Verbose=0 +CommandFile=0 +Warninglevel=0 +Startupchk=1 +Fixation=1 +FarROMization=0 +Objectsel=1305 +Librarychk=1 +Floatingpoint=0 +Muldivunit=1 +Mulunit=1 +Startup=s0rml.rel +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib +VfiFileBoot0= +VfiFileBoot1=boot.vfi +VF78K0Rchk=0 +VF78K0Rvs= +[Options.CC78K0R 1] +Version=210 +Memorymodel=2 +Flashobj=0 +FlashStartadr= +FlashBranchStartadr= +Mirror=0 +Saddrglobalchk=0 +Saddrglobal=1066 +Saddrstaticchk=0 +Saddrstatic=1072 +Bitfieldmsb=0 +Onebytechk=0 +Pacstructchk=0 +AssignROMchk=0 +AssignROM=0 +Maxoptimizechk=0 +Maxoptimize=1104 +Charunexpandchk=1 +Unsignedchar=0 +Usesaddrchk=0 +Autoallocationchk=1 +Jumpoptimize=1 +Librarycallchk=1 +Librarycall=1128 +Aggressivechk=1 +Relativebranchchk=0 +Debugoptchk=0 +Outdebugchk=0 +Outdebug=1153 +Outasmsrcchk=0 +Outasmsrc=1157 +Outasmoptall=1 +Common=0 +Outerrlistchk=0 +Outerrlist=1173 +Xreference=0 +Preprocess=0 +Prenocomment=0 +Predefine=0 +Preifdef=1 +Preinclude=0 +Preline=1 +Prenumber=1 +Formfeed=0 +Columns=132 +Lines=0 +Tablength=8 +Ansi=0 +Cpraspras=0 +Commentnest=0 +Intunexpand=0 +Kanjicode=1210 +Verbose=0 +CommandFile=0 +Warninglevel=1 +Startupchk=1 +Fixation=1 +FarROMization=1 +Objectsel=1305 +Librarychk=1 +Floatingpoint=0 +Muldivunit=1 +Mulunit=1 +Startup=s0rll.rel +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib +VF78K0Rchk=0 +VF78K0Rvs= +[Options.CC78K0R 2] +Version=210 +Define0= +Define1=_debug_,_TEG_,proc_is_ke3 +Define2=_debug_,_TEG_,proc_is_ke3,%time% +Define3=_TEG_,proc_is_ke3 +Define4=proc_is_ke3 +Include0=renge,C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r +Include1=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Include2=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Memorymodel=1 +Flashobj=0 +FlashStartadr= +FlashBranchStartadr= +Mirror=0 +Saddrglobalchk=0 +Saddrglobal=1066 +Saddrstaticchk=0 +Saddrstatic=1072 +Bitfieldmsb=0 +Onebytechk=0 +Pacstructchk=0 +AssignROMchk=0 +AssignROM=0 +Maxoptimizechk=0 +Maxoptimize=1104 +Charunexpandchk=0 +Unsignedchar=0 +Usesaddrchk=0 +Autoallocationchk=1 +Jumpoptimize=1 +Librarycallchk=1 +Librarycall=1129 +Aggressivechk=1 +Relativebranchchk=0 +Debugoptchk=0 +Outdebugchk=1 +Outdebug=1153 +Outobjectcmb0=obj +Outasmsrccmb0=inter_asm +Outasmsrccmb1=bsr.asm +Outasmsrcchk=1 +Outasmsrc=1158 +Outasmoptall=1 +Common=0 +Outerrlistchk=0 +Outerrlist=1174 +Xreference=0 +Preprocess=0 +Prenocomment=0 +Predefine=0 +Preifdef=1 +Preinclude=1 +Preline=1 +Prenumber=1 +Formfeed=0 +Columns=132 +Lines=0 +Tablength=8 +Ansi=0 +Cpraspras=1 +Commentnest=0 +Intunexpand=1 +Kanjicode=1210 +Verbose=0 +CommandFile=0 +Warninglevel=1 +Startupchk=1 +Fixation=0 +FarROMization=0 +Objectsel=1305 +Librarychk=1 +Floatingpoint=0 +Muldivunit=1 +Mulunit=1 +Startup=s0rm.rel +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib +VfiFileBoot0= +VfiFileBoot1=boot.vfi +VF78K0Rchk=0 +VF78K0Rvs= +[Options.CC78K0R 3] +Version=210 +Define0=_debug_,proc_is_bsr,_TEG_ +Define1=_debug_,proc_is_bsr +Define2=proc_is_bsr +Define3=_TEG_,proc_is_ke3 +Define4=proc_is_ke3 +Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Memorymodel=1 +Flashobj=0 +FlashStartadr= +FlashBranchStartadr= +Mirror=0 +Saddrglobalchk=0 +Saddrglobal=1066 +Saddrstaticchk=0 +Saddrstatic=1072 +Bitfieldmsb=0 +Onebytechk=0 +Pacstructchk=0 +AssignROMchk=0 +AssignROM=0 +Maxoptimizechk=0 +Maxoptimize=1104 +Charunexpandchk=1 +Unsignedchar=0 +Usesaddrchk=0 +Autoallocationchk=1 +Jumpoptimize=1 +Librarycallchk=0 +Librarycall=1129 +Aggressivechk=1 +Relativebranchchk=1 +Debugoptchk=0 +Outdebugchk=1 +Outdebug=1153 +Outasmsrccmb0=inter_asm +Outasmsrccmb1=bsr.asm +Outasmsrcchk=1 +Outasmsrc=1158 +Outasmoptall=1 +Common=0 +Outerrlistchk=0 +Outerrlist=1174 +Xreference=0 +Preprocess=0 +Prenocomment=0 +Predefine=0 +Preifdef=1 +Preinclude=0 +Preline=1 +Prenumber=1 +Formfeed=0 +Columns=132 +Lines=0 +Tablength=8 +Ansi=0 +Cpraspras=1 +Commentnest=0 +Intunexpand=0 +Kanjicode=1210 +Verbose=0 +CommandFile=0 +Warninglevel=0 +Startupchk=1 +Fixation=1 +FarROMization=0 +Objectsel=1305 +Librarychk=1 +Floatingpoint=0 +Muldivunit=1 +Mulunit=1 +Startup=s0rml.rel +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib +VfiFileBoot0= +VfiFileBoot1=boot.vfi +VF78K0Rchk=0 +VF78K0Rvs= +[Options.CC78K0R 4] +Version=210 +Define0=proc_is_bsr +Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Memorymodel=1 +Flashobj=0 +FlashStartadr= +FlashBranchStartadr= +Mirror=0 +Saddrglobalchk=0 +Saddrglobal=1066 +Saddrstaticchk=0 +Saddrstatic=1072 +Bitfieldmsb=0 +Onebytechk=0 +Pacstructchk=0 +AssignROMchk=0 +AssignROM=0 +Maxoptimizechk=0 +Maxoptimize=1104 +Charunexpandchk=1 +Unsignedchar=0 +Usesaddrchk=0 +Autoallocationchk=1 +Jumpoptimize=1 +Librarycallchk=0 +Librarycall=1129 +Aggressivechk=1 +Relativebranchchk=1 +Debugoptchk=0 +Outdebugchk=1 +Outdebug=1153 +Outasmsrccmb0=inter_asm +Outasmsrccmb1=bsr.asm +Outasmsrcchk=1 +Outasmsrc=1158 +Outasmoptall=1 +Common=0 +Outerrlistchk=0 +Outerrlist=1174 +Xreference=0 +Preprocess=0 +Prenocomment=0 +Predefine=0 +Preifdef=1 +Preinclude=0 +Preline=1 +Prenumber=1 +Formfeed=0 +Columns=132 +Lines=0 +Tablength=8 +Ansi=0 +Cpraspras=1 +Commentnest=0 +Intunexpand=0 +Kanjicode=1210 +Verbose=0 +CommandFile=0 +Warninglevel=0 +Startupchk=1 +Fixation=1 +FarROMization=0 +Objectsel=1305 +Librarychk=1 +Floatingpoint=0 +Muldivunit=1 +Mulunit=1 +Startup=s0rml.rel +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib +VfiFileBoot0= +VfiFileBoot1=boot.vfi +VF78K0Rchk=0 +VF78K0Rvs= +[Options.CC78K0R 5] +Version=210 +Define0= +Define1=_debug_,proc_is_bsr,_TEG_,_WM0_ +Define2=_debug_,proc_is_bsr,_TEG_,_WM0 +Define3=_debug_,proc_is_bsr,_TEG_ +Define4=_debug_,proc_is_bsr +Include0=renge,C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Include1=C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r +Memorymodel=1 +Flashobj=0 +FlashStartadr= +FlashBranchStartadr= +Mirror=0 +Saddrglobalchk=0 +Saddrglobal=1066 +Saddrstaticchk=0 +Saddrstatic=1072 +Bitfieldmsb=0 +Onebytechk=0 +Pacstructchk=0 +AssignROMchk=0 +AssignROM=0 +Maxoptimizechk=0 +Maxoptimize=1104 +Charunexpandchk=1 +Unsignedchar=0 +Usesaddrchk=0 +Autoallocationchk=1 +Jumpoptimize=1 +Librarycallchk=0 +Librarycall=1129 +Aggressivechk=1 +Relativebranchchk=1 +Debugoptchk=0 +Outdebugchk=1 +Outdebug=1153 +Outasmsrccmb0=inter_asm +Outasmsrccmb1=bsr.asm +Outasmsrcchk=1 +Outasmsrc=1158 +Outasmoptall=1 +Common=0 +Outerrlistchk=0 +Outerrlist=1174 +Xreference=0 +Preprocess=0 +Prenocomment=0 +Predefine=0 +Preifdef=1 +Preinclude=0 +Preline=1 +Prenumber=1 +Formfeed=0 +Columns=132 +Lines=0 +Tablength=8 +Ansi=0 +Cpraspras=1 +Commentnest=0 +Intunexpand=0 +Kanjicode=1210 +Verbose=0 +CommandFile=0 +Warninglevel=0 +Startupchk=1 +Fixation=1 +FarROMization=0 +Objectsel=1305 +Librarychk=1 +Floatingpoint=0 +Muldivunit=1 +Mulunit=1 +Startup=s0rml.rel +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib +VfiFileBoot0= +VfiFileBoot1=boot.vfi +VF78K0Rchk=0 +VF78K0Rvs= diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 6914776..e8fb67d 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,7 +1,7 @@ [ProjectManager] FrameMax=1 -FrameX=75 -FrameY=75 +FrameX=100 +FrameY=100 FrameCX=1440 FrameCY=850 OpenFile1=batt_params.h,0,596,19,1842,741,0,19,0,0 @@ -11,7 +11,9 @@ 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=OutputWindow +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=OutputWindow OutputPos=0,34,740,376,1323 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow]