diff --git a/trunk/batt_params.h b/trunk/batt_params.h index 31d565d..e4fd0d0 100644 --- a/trunk/batt_params.h +++ b/trunk/batt_params.h @@ -1,6 +1,7 @@ #ifndef _bt_params_h_ #define _bt_params_h_ + /* ======================================================== 各社バッテリーパラメータ ======================================================== */ @@ -102,29 +103,28 @@ const st_bt_comp BT_COMP[] = { { 92, (u8)(-256* 0.79), (u8)(-256* 4.35) }, // dummy(M ) { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, // dummy( P) { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, // dummy( P) - { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) }, // panasonic - { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) } // dummy( P) + { 171, (u8)(-256* 1.00), (u8)(-256* 2.60) } // panasonic }; const u16 BT_OCV[] = { - { 0xD800 }, { 0xD800 }, { 0xD800 }, // maxell, dummy, dummy, - { 0xDA20 }, { 0xDA20 }, { 0xDA20 }, { 0xDA20 } // dummy, dummy, panaso, dummy + { 0xD800 }, { 0xD800 }, { 0xD800 }, // maxell, dummy, dummy, + { 0xDA20 }, { 0xDA20 }, { 0xDA20 } // dummy, dummy, pana }; const u8 BT_VERIFY_H[] = { - 0xEA, 0xEA, 0xEA, // maxell, dummy, dummy, - 0x69, 0x69, 0x69, 0x69 // dummy, dummy, panaso, dummy + 0xEA, 0xEA, 0xEA, // maxell, dummy, dummy, + 0x69, 0x69, 0x69 // dummy, dummy, pana }; const u8 BT_VERIFY_L[] = { - 0xE8, 0xE8, 0xE8, // maxell, dummy, dummy, - 0x67, 0x67, 0x67, 0x67 // dummy, dummy, panaso, dummy + 0xE8, 0xE8, 0xE8, // maxell, dummy, dummy, + 0x67, 0x67, 0x67 // dummy, dummy, pana }; const u8 BT_RCOMP_SCALE[] = { - 2, 2, 2, // maxell, dummy, dummy, - 1, 1, 1, 1 // dummy, dummy, panaso, dummy + 2, 2, 2, // maxell, dummy, dummy, + 1, 1, 1 // dummy, dummy, panaso }; diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 1d6db33..7c3a118 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 22f58d8..cc14ec5 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:18 Feb 2011 Page: 1 +78K0R Linker W1.33 Date:26 May 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C @@ -14,7 +14,7 @@ Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - 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 + status.rel led_cam.rel led_pow.rel Para-file: Out-file: bsr.lmf Map-file: bsr_k0r.map @@ -23,9 +23,9 @@ Direc-file:bsr_mcu.dr *** Link information *** - 63 output segment(s) - 3EE5H byte(s) real data - 5497 symbol(s) defined + 65 output segment(s) + 3E40H byte(s) real data + 5756 symbol(s) defined *** Memory map *** @@ -98,53 +98,53 @@ Direc-file:bsr_mcu.dr LDR_CODL task_status 000C4H 00000H ?CSEGSI 000C4H 0000AH CSEG - LDR_CODE 000CEH 00944H CSEG - LDR_CODE loader 000CEH 00207H - LDR_CODE main 002D5H 00046H - LDR_CODE WDT 0031BH 00000H - LDR_CODE i2c_mcu 0031BH 002F0H + LDR_CODE 000CEH 00955H CSEG + LDR_CODE loader 000CEH 00218H + LDR_CODE main 002E6H 00046H + LDR_CODE WDT 0032CH 00000H + LDR_CODE i2c_mcu 0032CH 002F0H LDR_CODE self_flash - 0060BH 0037FH + 0061CH 0037FH LDR_CODE task_debug - 0098AH 00000H + 0099BH 00000H LDR_CODE task_status - 0098AH 00088H - FSL_CODE 00A12H 00322H CSEG + 0099BH 00088H + FSL_CODE 00A23H 00322H CSEG FSL_CODE fsl_block_cmd - 00A12H 0002BH + 00A23H 0002BH FSL_CODE fsl_block_check - 00A3DH 00013H + 00A4EH 00013H FSL_CODE fsl_common - 00A50H 0014FH + 00A61H 0014FH FSL_CODE fsl_reset - 00B9FH 00001H + 00BB0H 00001H FSL_CODE fsl_si_ibf - 00BA0H 00064H + 00BB1H 00064H FSL_CODE fsl_phySwap - 00C04H 0004DH + 00C15H 0004DH FSL_CODE fsl_si_common - 00C51H 00061H - FSL_CODE fsl_swap 00CB2H 00030H + 00C62H 00061H + FSL_CODE fsl_swap 00CC3H 00030H FSL_CODE fsl_write - 00CE2H 00052H - @@LCODE 00D34H 00277H CSEG - @@LCODE @cstart 00D34H 0006DH - @@LCODE @imul 00DA1H 00011H - @@LCODE @lumul 00DB2H 0002BH - @@LCODE @isdiv 00DDDH 00022H - @@LCODE @iudiv 00DFFH 0002DH - @@LCODE @isrem 00E2CH 00021H - @@LCODE @iurem 00E4DH 0002FH - @@LCODE @lsdiv 00E7CH 00039H - @@LCODE @ludiv 00EB5H 0003FH - @@LCODE @divuw 00EF4H 00034H - @@LCODE @ladd 00F28H 0000FH - @@LCODE @llsh 00F37H 0001BH - @@LCODE @lursh 00F52H 0001FH - @@LCODE @iscmp 00F71H 0000CH - @@LCODE @lband 00F7DH 00014H - @@LCODE @bcdtob 00F91H 0001AH -* gap * 00FABH 0004BH + 00CF3H 00052H + @@LCODE 00D45H 00277H CSEG + @@LCODE @cstart 00D45H 0006DH + @@LCODE @imul 00DB2H 00011H + @@LCODE @lumul 00DC3H 0002BH + @@LCODE @isdiv 00DEEH 00022H + @@LCODE @iudiv 00E10H 0002DH + @@LCODE @isrem 00E3DH 00021H + @@LCODE @iurem 00E5EH 0002FH + @@LCODE @lsdiv 00E8DH 00039H + @@LCODE @ludiv 00EC6H 0003FH + @@LCODE @divuw 00F05H 00034H + @@LCODE @ladd 00F39H 0000FH + @@LCODE @llsh 00F48H 0001BH + @@LCODE @lursh 00F63H 0001FH + @@LCODE @iscmp 00F82H 0000CH + @@LCODE @lband 00F8EH 00014H + @@LCODE @bcdtob 00FA2H 0001AH +* gap * 00FBCH 0003AH MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD magic 00FF6H 0000AH @@ -154,262 +154,282 @@ Direc-file:bsr_mcu.dr SEGMENT SEGMENT MODULE ADDRESS MGC_MIMI 02000H 0000AH CSEG AT MGC_MIMI magic 02000H 0000AH - @@CNST 0200AH 002C6H CSEG + @@CNST 0200AH 0027CH CSEG @@CNST @cstart 0200AH 00000H @@CNST loader 0200AH 00000H - @@CNST pm 0200AH 00214H - @@CNST i2c_ctr 0221EH 00000H - @@CNST main 0221EH 00000H - @@CNST magic 0221EH 00000H - @@CNST WDT 0221EH 00000H - @@CNST i2c_mcu 0221EH 00000H - @@CNST i2c_twl 0221EH 00000H - @@CNST led 0221EH 00020H - @@CNST rtc 0223EH 00000H - @@CNST vreg_ctr 0223EH 00000H - @@CNST vreg_twl 0223EH 00000H - @@CNST adc 0223EH 00048H - @@CNST renge 02286H 00000H - @@CNST accero 02286H 00000H + @@CNST pm 0200AH 001CAH + @@CNST i2c_ctr 021D4H 00000H + @@CNST main 021D4H 00000H + @@CNST magic 021D4H 00000H + @@CNST WDT 021D4H 00000H + @@CNST i2c_mcu 021D4H 00000H + @@CNST i2c_twl 021D4H 00000H + @@CNST led 021D4H 00000H + @@CNST rtc 021D4H 00000H + @@CNST vreg_ctr 021D4H 00000H + @@CNST vreg_twl 021D4H 00000H + @@CNST adc 021D4H 00048H + @@CNST renge 0221CH 00000H + @@CNST accero 0221CH 00000H @@CNST self_flash - 02286H 00002H - @@CNST sw 02288H 00000H + 0221CH 00002H + @@CNST sw 0221EH 00000H @@CNST task_debug - 02288H 00000H + 0221EH 00000H @@CNST task_misc - 02288H 00000H - @@CNST task_sys 02288H 00000H + 0221EH 00000H + @@CNST task_sys 0221EH 00000H @@CNST pedo_alg_thre_det2 - 02288H 00048H - @@CNST ini_VECT 022D0H 00000H + 0221EH 00048H + @@CNST ini_VECT 02266H 00000H @@CNST task_status - 022D0H 00000H - ROM_CODE 022D0H 027EEH CSEG - ROM_CODE pm 022D0H 00AA4H - ROM_CODE i2c_ctr 02D74H 00060H - ROM_CODE i2c_twl 02DD4H 0005EH - ROM_CODE led 02E32H 00546H - ROM_CODE rtc 03378H 000E0H - ROM_CODE vreg_ctr 03458H 00481H - ROM_CODE vreg_twl 038D9H 000FAH - ROM_CODE adc 039D3H 002FCH - ROM_CODE renge 03CCFH 00190H - ROM_CODE accero 03E5FH 0013DH - ROM_CODE sw 03F9CH 00120H + 02266H 00000H + @@CNST led_cam 02266H 00000H + @@CNST led_pow 02266H 00020H + ROM_CODE 02286H 02780H CSEG + ROM_CODE pm 02286H 00A93H + ROM_CODE i2c_ctr 02D19H 00060H + ROM_CODE i2c_twl 02D79H 0005EH + ROM_CODE led 02DD7H 00265H + ROM_CODE rtc 0303CH 000E0H + ROM_CODE vreg_ctr 0311CH 00481H + ROM_CODE vreg_twl 0359DH 000FAH + ROM_CODE adc 03697H 002FCH + ROM_CODE renge 03993H 00190H + ROM_CODE accero 03B23H 0013DH + ROM_CODE sw 03C60H 0013DH ROM_CODE task_misc - 040BCH 00175H - ROM_CODE task_sys 04231H 0038BH + 03D9DH 0017FH + ROM_CODE task_sys 03F1CH 0038BH ROM_CODE pedo_alg_thre_det2 - 045BCH 00502H - @@BASE 04ABEH 004C6H CSEG BASE - @@BASE loader 04ABEH 00000H - @@BASE pm 04ABEH 0003FH - @@BASE i2c_ctr 04AFDH 0018DH - @@BASE main 04C8AH 00000H - @@BASE magic 04C8AH 00000H - @@BASE WDT 04C8AH 00000H - @@BASE i2c_mcu 04C8AH 0009CH - @@BASE i2c_twl 04D26H 000CBH - @@BASE led 04DF1H 00000H - @@BASE rtc 04DF1H 0005EH - @@BASE vreg_ctr 04E4FH 00000H - @@BASE vreg_twl 04E4FH 00000H - @@BASE adc 04E4FH 000B3H - @@BASE renge 04F02H 00000H - @@BASE accero 04F02H 0004AH + 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 @@BASE self_flash - 04F4CH 00000H - @@BASE sw 04F4CH 00000H + 04E94H 00000H + @@BASE sw 04E94H 00000H @@BASE task_debug - 04F4CH 00000H + 04E94H 00000H @@BASE task_misc - 04F4CH 00000H - @@BASE task_sys 04F4CH 00000H + 04E94H 00000H + @@BASE task_sys 04E94H 00000H @@BASE pedo_alg_thre_det2 - 04F4CH 00000H - @@BASE ini_VECT 04F4CH 00038H + 04E94H 00000H + @@BASE ini_VECT 04E94H 00038H @@BASE task_status - 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL @cstart 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL pm 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL i2c_ctr 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL i2c_twl 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL led 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL rtc 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL vreg_ctr 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL vreg_twl 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL adc 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL renge 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL accero 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL sw 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP + 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 @@CNSTL task_misc - 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL task_sys 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP + 04ECCH 00000H + @@CNSTL 04ECCH 00000H CSEG PAGE64KP + @@CNSTL task_sys 04ECCH 00000H + @@CNSTL 04ECCH 00000H CSEG PAGE64KP @@CNSTL pedo_alg_thre_det2 - 04F84H 00000H - @@CNSTL 04F84H 00000H CSEG PAGE64KP - @@CNSTL ini_VECT 04F84H 00000H - @@CNSTL 04F84H 0000AH CSEG PAGE64KP - @@CNSTL @bcdtob 04F84H 0000AH - @@R_INIT 04F8EH 00036H CSEG UNIT64KP - @@R_INIT @cstart 04F8EH 00000H - @@R_INIT loader 04F8EH 00000H - @@R_INIT pm 04F8EH 00002H - @@R_INIT i2c_ctr 04F90H 00002H - @@R_INIT main 04F92H 00000H - @@R_INIT magic 04F92H 00000H - @@R_INIT WDT 04F92H 00000H - @@R_INIT i2c_mcu 04F92H 00000H - @@R_INIT i2c_twl 04F92H 00000H - @@R_INIT led 04F92H 00006H - @@R_INIT rtc 04F98H 00000H - @@R_INIT vreg_ctr 04F98H 00000H - @@R_INIT vreg_twl 04F98H 00000H - @@R_INIT adc 04F98H 0000CH - @@R_INIT renge 04FA4H 00014H - @@R_INIT accero 04FB8H 00000H + 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 @@R_INIT self_flash - 04FB8H 00000H - @@R_INIT sw 04FB8H 00002H + 04EFAH 00000H + @@R_INIT sw 04EFAH 00002H @@R_INIT task_debug - 04FBAH 00000H + 04EFCH 00000H @@R_INIT task_misc - 04FBAH 00000H - @@R_INIT task_sys 04FBAH 00002H + 04EFCH 00000H + @@R_INIT task_sys 04EFCH 00002H @@R_INIT pedo_alg_thre_det2 - 04FBCH 00006H - @@R_INIT ini_VECT 04FC2H 00000H + 04EFEH 00006H + @@R_INIT ini_VECT 04F04H 00000H @@R_INIT task_status - 04FC2H 00002H - @@R_INIT @rom 04FC4H 00000H - @@R_INIS 04FC4H 00000H CSEG UNIT64KP - @@R_INIS @cstart 04FC4H 00000H - @@R_INIS loader 04FC4H 00000H - @@R_INIS pm 04FC4H 00000H - @@R_INIS i2c_ctr 04FC4H 00000H - @@R_INIS main 04FC4H 00000H - @@R_INIS magic 04FC4H 00000H - @@R_INIS WDT 04FC4H 00000H - @@R_INIS i2c_mcu 04FC4H 00000H - @@R_INIS i2c_twl 04FC4H 00000H - @@R_INIS led 04FC4H 00000H - @@R_INIS rtc 04FC4H 00000H - @@R_INIS vreg_ctr 04FC4H 00000H - @@R_INIS vreg_twl 04FC4H 00000H - @@R_INIS adc 04FC4H 00000H - @@R_INIS renge 04FC4H 00000H - @@R_INIS accero 04FC4H 00000H + 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 @@R_INIS self_flash - 04FC4H 00000H - @@R_INIS sw 04FC4H 00000H + 04F0EH 00000H + @@R_INIS sw 04F0EH 00000H @@R_INIS task_debug - 04FC4H 00000H + 04F0EH 00000H @@R_INIS task_misc - 04FC4H 00000H - @@R_INIS task_sys 04FC4H 00000H + 04F0EH 00000H + @@R_INIS task_sys 04F0EH 00000H @@R_INIS pedo_alg_thre_det2 - 04FC4H 00000H - @@R_INIS ini_VECT 04FC4H 00000H + 04F0EH 00000H + @@R_INIS ini_VECT 04F0EH 00000H @@R_INIS task_status - 04FC4H 00000H - @@R_INIS @rom 04FC4H 00000H - @@CALT 04FC4H 00000H CSEG - @@CALT @cstart 04FC4H 00000H - @@CALT loader 04FC4H 00000H - @@CALT pm 04FC4H 00000H - @@CALT i2c_ctr 04FC4H 00000H - @@CALT main 04FC4H 00000H - @@CALT magic 04FC4H 00000H - @@CALT WDT 04FC4H 00000H - @@CALT i2c_mcu 04FC4H 00000H - @@CALT i2c_twl 04FC4H 00000H - @@CALT led 04FC4H 00000H - @@CALT rtc 04FC4H 00000H - @@CALT vreg_ctr 04FC4H 00000H - @@CALT vreg_twl 04FC4H 00000H - @@CALT adc 04FC4H 00000H - @@CALT renge 04FC4H 00000H - @@CALT accero 04FC4H 00000H + 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 @@CALT self_flash - 04FC4H 00000H - @@CALT sw 04FC4H 00000H + 04F0EH 00000H + @@CALT sw 04F0EH 00000H @@CALT task_debug - 04FC4H 00000H + 04F0EH 00000H @@CALT task_misc - 04FC4H 00000H - @@CALT task_sys 04FC4H 00000H + 04F0EH 00000H + @@CALT task_sys 04F0EH 00000H @@CALT pedo_alg_thre_det2 - 04FC4H 00000H - @@CALT ini_VECT 04FC4H 00000H + 04F0EH 00000H + @@CALT ini_VECT 04F0EH 00000H @@CALT task_status - 04FC4H 00000H - @@RLINIT 04FC4H 00000H CSEG UNIT64KP - @@RLINIT loader 04FC4H 00000H - @@RLINIT pm 04FC4H 00000H - @@RLINIT i2c_ctr 04FC4H 00000H - @@RLINIT main 04FC4H 00000H - @@RLINIT magic 04FC4H 00000H - @@RLINIT WDT 04FC4H 00000H - @@RLINIT i2c_mcu 04FC4H 00000H - @@RLINIT i2c_twl 04FC4H 00000H - @@RLINIT led 04FC4H 00000H - @@RLINIT rtc 04FC4H 00000H - @@RLINIT vreg_ctr 04FC4H 00000H - @@RLINIT vreg_twl 04FC4H 00000H - @@RLINIT adc 04FC4H 00000H - @@RLINIT renge 04FC4H 00000H - @@RLINIT accero 04FC4H 00000H + 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 @@RLINIT self_flash - 04FC4H 00000H - @@RLINIT sw 04FC4H 00000H + 04F0EH 00000H + @@RLINIT sw 04F0EH 00000H @@RLINIT task_debug - 04FC4H 00000H + 04F0EH 00000H @@RLINIT task_misc - 04FC4H 00000H - @@RLINIT task_sys 04FC4H 00000H + 04F0EH 00000H + @@RLINIT task_sys 04F0EH 00000H @@RLINIT pedo_alg_thre_det2 - 04FC4H 00000H - @@RLINIT ini_VECT 04FC4H 00000H + 04F0EH 00000H + @@RLINIT ini_VECT 04F0EH 00000H @@RLINIT task_status - 04FC4H 00000H - @@RLINIT @rom 04FC4H 00000H - @@CODEL 04FC4H 00000H CSEG - @@CODEL pm 04FC4H 00000H - @@CODEL i2c_ctr 04FC4H 00000H - @@CODEL magic 04FC4H 00000H - @@CODEL i2c_twl 04FC4H 00000H - @@CODEL led 04FC4H 00000H - @@CODEL rtc 04FC4H 00000H - @@CODEL vreg_ctr 04FC4H 00000H - @@CODEL vreg_twl 04FC4H 00000H - @@CODEL adc 04FC4H 00000H - @@CODEL renge 04FC4H 00000H - @@CODEL accero 04FC4H 00000H - @@CODEL sw 04FC4H 00000H + 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 @@CODEL task_misc - 04FC4H 00000H - @@CODEL task_sys 04FC4H 00000H + 04F0EH 00000H + @@CODEL task_sys 04F0EH 00000H @@CODEL pedo_alg_thre_det2 - 04FC4H 00000H - @@CODEL ini_VECT 04FC4H 00000H - @@LCODEL 04FC4H 00008H CSEG - @@LCODEL abs 04FC4H 00008H -* gap * 04FCCH 0002AH + 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 MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL magic 04FF6H 0000AH @@ -417,194 +437,206 @@ Direc-file:bsr_mcu.dr BASE ADDRESS=FF900H SIZE=00500H OUTPUT INPUT INPUT BASE SIZE SEGMENT SEGMENT MODULE ADDRESS - @@DATA FF900H 00430H DSEG BASEP + @@DATA FF900H 00434H DSEG BASEP @@DATA @cstart FF900H 00002H @@DATA loader FF902H 00000H @@DATA pm FF902H 0001AH @@DATA i2c_ctr FF91CH 00006H - @@DATA main FF922H 0021CH - @@DATA magic FFB3EH 00000H - @@DATA WDT FFB3EH 00000H - @@DATA i2c_mcu FFB3EH 0000AH - @@DATA i2c_twl FFB48H 00000H - @@DATA led FFB48H 00088H - @@DATA rtc FFBD0H 00008H - @@DATA vreg_ctr FFBD8H 0005EH - @@DATA vreg_twl FFC36H 00010H - @@DATA adc FFC46H 0001AH - @@DATA renge FFC60H 00016H - @@DATA accero FFC76H 00002H + @@DATA main FF922H 0021EH + @@DATA magic FFB40H 00000H + @@DATA WDT FFB40H 00000H + @@DATA i2c_mcu FFB40H 0000AH + @@DATA i2c_twl FFB4AH 00000H + @@DATA led FFB4AH 0007CH + @@DATA rtc FFBC6H 00008H + @@DATA vreg_ctr FFBCEH 0005EH + @@DATA vreg_twl FFC2CH 00010H + @@DATA adc FFC3CH 0001AH + @@DATA renge FFC56H 00016H + @@DATA accero FFC6CH 00002H @@DATA self_flash - FFC78H 00002H - @@DATA sw FFC7AH 00008H + FFC6EH 00002H + @@DATA sw FFC70H 0000AH @@DATA task_debug - FFC82H 00000H + FFC7AH 00000H @@DATA task_misc - FFC82H 00004H - @@DATA task_sys FFC86H 00002H + FFC7AH 00004H + @@DATA task_sys FFC7EH 00002H @@DATA pedo_alg_thre_det2 - FFC88H 000A6H - @@DATA ini_VECT FFD2EH 00000H + FFC80H 000A6H + @@DATA ini_VECT FFD26H 00000H @@DATA task_status - FFD2EH 00002H - @@DATA @rom FFD30H 00000H - @@INIT FFD30H 00036H DSEG BASEP - @@INIT @cstart FFD30H 00000H - @@INIT loader FFD30H 00000H - @@INIT pm FFD30H 00002H - @@INIT i2c_ctr FFD32H 00002H - @@INIT main FFD34H 00000H - @@INIT magic FFD34H 00000H - @@INIT WDT FFD34H 00000H - @@INIT i2c_mcu FFD34H 00000H - @@INIT i2c_twl FFD34H 00000H - @@INIT led FFD34H 00006H - @@INIT rtc FFD3AH 00000H - @@INIT vreg_ctr FFD3AH 00000H - @@INIT vreg_twl FFD3AH 00000H - @@INIT adc FFD3AH 0000CH - @@INIT renge FFD46H 00014H - @@INIT accero FFD5AH 00000H + FFD26H 00002H + @@DATA led_cam FFD28H 00002H + @@DATA led_pow FFD2AH 0000AH + @@DATA @rom FFD34H 00000H + @@INIT FFD34H 00038H DSEG BASEP + @@INIT @cstart FFD34H 00000H + @@INIT loader FFD34H 00000H + @@INIT pm FFD34H 00002H + @@INIT i2c_ctr FFD36H 00002H + @@INIT main FFD38H 00000H + @@INIT magic FFD38H 00000H + @@INIT WDT FFD38H 00000H + @@INIT i2c_mcu FFD38H 00000H + @@INIT i2c_twl FFD38H 00000H + @@INIT led FFD38H 00000H + @@INIT rtc FFD38H 00000H + @@INIT vreg_ctr FFD38H 00000H + @@INIT vreg_twl FFD38H 00000H + @@INIT adc FFD38H 0000CH + @@INIT renge FFD44H 00014H + @@INIT accero FFD58H 00000H @@INIT self_flash - FFD5AH 00000H - @@INIT sw FFD5AH 00002H + FFD58H 00000H + @@INIT sw FFD58H 00002H @@INIT task_debug - FFD5CH 00000H + FFD5AH 00000H @@INIT task_misc - FFD5CH 00000H - @@INIT task_sys FFD5CH 00002H + FFD5AH 00000H + @@INIT task_sys FFD5AH 00002H @@INIT pedo_alg_thre_det2 - FFD5EH 00006H - @@INIT ini_VECT FFD64H 00000H + FFD5CH 00006H + @@INIT ini_VECT FFD62H 00000H @@INIT task_status - FFD64H 00002H - @@INIT @rom FFD66H 00000H - @@INIS FFD66H 00000H DSEG UNITP - @@INIS @cstart FFD66H 00000H - @@INIS loader FFD66H 00000H - @@INIS pm FFD66H 00000H - @@INIS i2c_ctr FFD66H 00000H - @@INIS main FFD66H 00000H - @@INIS magic FFD66H 00000H - @@INIS WDT FFD66H 00000H - @@INIS i2c_mcu FFD66H 00000H - @@INIS i2c_twl FFD66H 00000H - @@INIS led FFD66H 00000H - @@INIS rtc FFD66H 00000H - @@INIS vreg_ctr FFD66H 00000H - @@INIS vreg_twl FFD66H 00000H - @@INIS adc FFD66H 00000H - @@INIS renge FFD66H 00000H - @@INIS accero FFD66H 00000H + FFD62H 00002H + @@INIT led_cam FFD64H 00002H + @@INIT led_pow FFD66H 00006H + @@INIT @rom FFD6CH 00000H + @@INIS FFD6CH 00000H DSEG UNITP + @@INIS @cstart FFD6CH 00000H + @@INIS loader FFD6CH 00000H + @@INIS pm FFD6CH 00000H + @@INIS i2c_ctr FFD6CH 00000H + @@INIS main FFD6CH 00000H + @@INIS magic FFD6CH 00000H + @@INIS WDT FFD6CH 00000H + @@INIS i2c_mcu FFD6CH 00000H + @@INIS i2c_twl FFD6CH 00000H + @@INIS led FFD6CH 00000H + @@INIS rtc FFD6CH 00000H + @@INIS vreg_ctr FFD6CH 00000H + @@INIS vreg_twl FFD6CH 00000H + @@INIS adc FFD6CH 00000H + @@INIS renge FFD6CH 00000H + @@INIS accero FFD6CH 00000H @@INIS self_flash - FFD66H 00000H - @@INIS sw FFD66H 00000H + FFD6CH 00000H + @@INIS sw FFD6CH 00000H @@INIS task_debug - FFD66H 00000H + FFD6CH 00000H @@INIS task_misc - FFD66H 00000H - @@INIS task_sys FFD66H 00000H + FFD6CH 00000H + @@INIS task_sys FFD6CH 00000H @@INIS pedo_alg_thre_det2 - FFD66H 00000H - @@INIS ini_VECT FFD66H 00000H + FFD6CH 00000H + @@INIS ini_VECT FFD6CH 00000H @@INIS task_status - FFD66H 00000H - @@INIS @rom FFD66H 00000H - @@DATS FFD66H 00000H DSEG UNITP - @@DATS @cstart FFD66H 00000H - @@DATS loader FFD66H 00000H - @@DATS pm FFD66H 00000H - @@DATS i2c_ctr FFD66H 00000H - @@DATS main FFD66H 00000H - @@DATS magic FFD66H 00000H - @@DATS WDT FFD66H 00000H - @@DATS i2c_mcu FFD66H 00000H - @@DATS i2c_twl FFD66H 00000H - @@DATS led FFD66H 00000H - @@DATS rtc FFD66H 00000H - @@DATS vreg_ctr FFD66H 00000H - @@DATS vreg_twl FFD66H 00000H - @@DATS adc FFD66H 00000H - @@DATS renge FFD66H 00000H - @@DATS accero FFD66H 00000H + FFD6CH 00000H + @@INIS led_cam FFD6CH 00000H + @@INIS led_pow FFD6CH 00000H + @@INIS @rom FFD6CH 00000H + @@DATS FFD6CH 00000H DSEG UNITP + @@DATS @cstart FFD6CH 00000H + @@DATS loader FFD6CH 00000H + @@DATS pm FFD6CH 00000H + @@DATS i2c_ctr FFD6CH 00000H + @@DATS main FFD6CH 00000H + @@DATS magic FFD6CH 00000H + @@DATS WDT FFD6CH 00000H + @@DATS i2c_mcu FFD6CH 00000H + @@DATS i2c_twl FFD6CH 00000H + @@DATS led FFD6CH 00000H + @@DATS rtc FFD6CH 00000H + @@DATS vreg_ctr FFD6CH 00000H + @@DATS vreg_twl FFD6CH 00000H + @@DATS adc FFD6CH 00000H + @@DATS renge FFD6CH 00000H + @@DATS accero FFD6CH 00000H @@DATS self_flash - FFD66H 00000H - @@DATS sw FFD66H 00000H + FFD6CH 00000H + @@DATS sw FFD6CH 00000H @@DATS task_debug - FFD66H 00000H + FFD6CH 00000H @@DATS task_misc - FFD66H 00000H - @@DATS task_sys FFD66H 00000H + FFD6CH 00000H + @@DATS task_sys FFD6CH 00000H @@DATS pedo_alg_thre_det2 - FFD66H 00000H - @@DATS ini_VECT FFD66H 00000H + FFD6CH 00000H + @@DATS ini_VECT FFD6CH 00000H @@DATS task_status - FFD66H 00000H - @@DATS @rom FFD66H 00000H - FSL_DATA FFD66H 00010H DSEG UNITP + FFD6CH 00000H + @@DATS led_cam FFD6CH 00000H + @@DATS led_pow FFD6CH 00000H + @@DATS @rom FFD6CH 00000H + FSL_DATA FFD6CH 00010H DSEG UNITP FSL_DATA fsl_common - FFD66H 00010H - @@INITL FFD76H 00000H DSEG UNIT64KP - @@INITL loader FFD76H 00000H - @@INITL pm FFD76H 00000H - @@INITL i2c_ctr FFD76H 00000H - @@INITL main FFD76H 00000H - @@INITL magic FFD76H 00000H - @@INITL WDT FFD76H 00000H - @@INITL i2c_mcu FFD76H 00000H - @@INITL i2c_twl FFD76H 00000H - @@INITL led FFD76H 00000H - @@INITL rtc FFD76H 00000H - @@INITL vreg_ctr FFD76H 00000H - @@INITL vreg_twl FFD76H 00000H - @@INITL adc FFD76H 00000H - @@INITL renge FFD76H 00000H - @@INITL accero FFD76H 00000H + FFD6CH 00010H + @@INITL FFD7CH 00000H DSEG UNIT64KP + @@INITL loader FFD7CH 00000H + @@INITL pm FFD7CH 00000H + @@INITL i2c_ctr FFD7CH 00000H + @@INITL main FFD7CH 00000H + @@INITL magic FFD7CH 00000H + @@INITL WDT FFD7CH 00000H + @@INITL i2c_mcu FFD7CH 00000H + @@INITL i2c_twl FFD7CH 00000H + @@INITL led FFD7CH 00000H + @@INITL rtc FFD7CH 00000H + @@INITL vreg_ctr FFD7CH 00000H + @@INITL vreg_twl FFD7CH 00000H + @@INITL adc FFD7CH 00000H + @@INITL renge FFD7CH 00000H + @@INITL accero FFD7CH 00000H @@INITL self_flash - FFD76H 00000H - @@INITL sw FFD76H 00000H + FFD7CH 00000H + @@INITL sw FFD7CH 00000H @@INITL task_debug - FFD76H 00000H + FFD7CH 00000H @@INITL task_misc - FFD76H 00000H - @@INITL task_sys FFD76H 00000H + FFD7CH 00000H + @@INITL task_sys FFD7CH 00000H @@INITL pedo_alg_thre_det2 - FFD76H 00000H - @@INITL ini_VECT FFD76H 00000H + FFD7CH 00000H + @@INITL ini_VECT FFD7CH 00000H @@INITL task_status - FFD76H 00000H - @@INITL @rom FFD76H 00000H - @@DATAL FFD76H 00000H DSEG UNIT64KP - @@DATAL loader FFD76H 00000H - @@DATAL pm FFD76H 00000H - @@DATAL i2c_ctr FFD76H 00000H - @@DATAL main FFD76H 00000H - @@DATAL magic FFD76H 00000H - @@DATAL WDT FFD76H 00000H - @@DATAL i2c_mcu FFD76H 00000H - @@DATAL i2c_twl FFD76H 00000H - @@DATAL led FFD76H 00000H - @@DATAL rtc FFD76H 00000H - @@DATAL vreg_ctr FFD76H 00000H - @@DATAL vreg_twl FFD76H 00000H - @@DATAL adc FFD76H 00000H - @@DATAL renge FFD76H 00000H - @@DATAL accero FFD76H 00000H + FFD7CH 00000H + @@INITL led_cam FFD7CH 00000H + @@INITL led_pow FFD7CH 00000H + @@INITL @rom FFD7CH 00000H + @@DATAL FFD7CH 00000H DSEG UNIT64KP + @@DATAL loader FFD7CH 00000H + @@DATAL pm FFD7CH 00000H + @@DATAL i2c_ctr FFD7CH 00000H + @@DATAL main FFD7CH 00000H + @@DATAL magic FFD7CH 00000H + @@DATAL WDT FFD7CH 00000H + @@DATAL i2c_mcu FFD7CH 00000H + @@DATAL i2c_twl FFD7CH 00000H + @@DATAL led FFD7CH 00000H + @@DATAL rtc FFD7CH 00000H + @@DATAL vreg_ctr FFD7CH 00000H + @@DATAL vreg_twl FFD7CH 00000H + @@DATAL adc FFD7CH 00000H + @@DATAL renge FFD7CH 00000H + @@DATAL accero FFD7CH 00000H @@DATAL self_flash - FFD76H 00000H - @@DATAL sw FFD76H 00000H + FFD7CH 00000H + @@DATAL sw FFD7CH 00000H @@DATAL task_debug - FFD76H 00000H + FFD7CH 00000H @@DATAL task_misc - FFD76H 00000H - @@DATAL task_sys FFD76H 00000H + FFD7CH 00000H + @@DATAL task_sys FFD7CH 00000H @@DATAL pedo_alg_thre_det2 - FFD76H 00000H - @@DATAL ini_VECT FFD76H 00000H + FFD7CH 00000H + @@DATAL ini_VECT FFD7CH 00000H @@DATAL task_status - FFD76H 00000H - @@DATAL @rom FFD76H 00000H -* gap * FFD76H 0008AH + FFD7CH 00000H + @@DATAL led_cam FFD7CH 00000H + @@DATAL led_pow FFD7CH 00000H + @@DATAL @rom FFD7CH 00000H +* gap * FFD7CH 00084H MEMORY=RAM2 BASE ADDRESS=FFE20H SIZE=000C0H @@ -620,26 +652,28 @@ Direc-file:bsr_mcu.dr @@BITS WDT FFE21H.0 00000H.0 @@BITS i2c_mcu FFE21H.0 00000H.3 @@BITS i2c_twl FFE21H.3 00000H.0 - @@BITS led FFE21H.3 00000H.5 - @@BITS rtc FFE22H.0 00000H.3 - @@BITS vreg_ctr FFE22H.3 00000H.1 - @@BITS vreg_twl FFE22H.4 00000H.0 - @@BITS adc FFE22H.4 00000H.4 - @@BITS renge FFE23H.0 00000H.3 - @@BITS accero FFE23H.3 00000H.0 + @@BITS led FFE21H.3 00000H.4 + @@BITS rtc FFE21H.7 00000H.3 + @@BITS vreg_ctr FFE22H.2 00000H.1 + @@BITS vreg_twl FFE22H.3 00000H.0 + @@BITS adc FFE22H.3 00000H.4 + @@BITS renge FFE22H.7 00000H.3 + @@BITS accero FFE23H.2 00000H.0 @@BITS self_flash - FFE23H.3 00000H.0 - @@BITS sw FFE23H.3 00000H.2 + FFE23H.2 00000H.0 + @@BITS sw FFE23H.2 00000H.2 @@BITS task_debug - FFE23H.5 00000H.0 + FFE23H.4 00000H.0 @@BITS task_misc - FFE23H.5 00000H.2 - @@BITS task_sys FFE23H.7 00000H.0 + FFE23H.4 00000H.2 + @@BITS task_sys FFE23H.6 00000H.0 @@BITS pedo_alg_thre_det2 - FFE23H.7 00000H.2 - @@BITS ini_VECT FFE24H.1 00000H.0 + FFE23H.6 00000H.2 + @@BITS ini_VECT FFE24H.0 00000H.0 @@BITS task_status - FFE24H.1 00000H.0 + FFE24H.0 00000H.0 + @@BITS led_cam FFE24H.0 00000H.1 + @@BITS led_pow FFE24H.1 00000H.0 * gap * FFE25H 000AFH @@SEGREG FFED4H 00004H DSEG AT @@SEGREG @SEGREG FFED4H 00004H diff --git a/trunk/config.h b/trunk/config.h index 04e2fe1..157b419 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -20,7 +20,7 @@ #define MCU_VER_MAJOR 0x01 -#define MCU_VER_MINOR 0x34 +#define MCU_VER_MINOR 0x36 // ↑改訂の時は↓気をつけないと体験台の生産できないからね！ #ifdef _TAIKENDAI_SEISAN_SPECIAL_ @@ -50,8 +50,6 @@ #define _MODEL_CTR_ // ↑TS board, WM1,1 TS-CTRC, 実機 -// 特殊仕様 // -//#define _SW_HOME_ENABLE_ // ---------------------------------- // #ifdef _MODEL_TEG2_ @@ -71,7 +69,6 @@ unsupported! #ifdef _MODEL_CTR_ #define _PMIC_CTR_ #define _MCU_BSR_ -#define _SW_HOME_ENABLE_ #endif #endif diff --git a/trunk/hoge.bin b/trunk/hoge.bin index a252c7f..9ffe93c 100644 Binary files a/trunk/hoge.bin and b/trunk/hoge.bin differ diff --git a/trunk/led.c b/trunk/led.c index af0f16a..36b52b1 100644 --- a/trunk/led.c +++ b/trunk/led.c @@ -242,10 +242,29 @@ void tsk_led_wifi( ) + + bit info_led_pattern_updated; /* ======================================================== お知らせLED ======================================================== */ +// グラデーション計算など +void calc_info_led_fade_out( st_LED_dim_status* tgt_led ) +{ + tgt_led -> to = 0; + tgt_led -> delta = ( 0 - tgt_led -> now ) / 64; +} + + +void calc_info_led_next_frame( st_LED_dim_status* tgt_led, u8 color ) +{ + tgt_led -> to = color * 128; + // グラデーションのデルタを計算 + tgt_led -> delta = (( tgt_led -> to - tgt_led -> now ) ) / info_LED.info_LED.fade_time; +} + + +// 本体 void tsk_led_notify( ) { static u8 time_to_next_frame; @@ -272,12 +291,9 @@ void tsk_led_notify( ) if( info_led_off ) // ←電源off時など強制off { // フェードアウトさせる - LED_dim_status_info_R.to = 0; - LED_dim_status_info_G.to = 0; - LED_dim_status_info_B.to = 0; - LED_dim_status_info_R.delta = ( 0 - LED_dim_status_info_R.now ) / 64; - LED_dim_status_info_G.delta = ( 0 - LED_dim_status_info_G.now ) / 64; - LED_dim_status_info_B.delta = ( 0 - LED_dim_status_info_B.now ) / 64; + calc_info_led_fade_out( &LED_dim_status_info_R ); + calc_info_led_fade_out( &LED_dim_status_info_G ); + calc_info_led_fade_out( &LED_dim_status_info_B ); } else { @@ -315,21 +331,17 @@ void tsk_led_notify( ) loops = 0; } - LED_dim_status_info_R.to = info_LED.info_LED.red[frame] * 128; - LED_dim_status_info_G.to = info_LED.info_LED.grn[frame] * 128; - LED_dim_status_info_B.to = info_LED.info_LED.blu[frame] * 128; - - // グラデーションのデルタを計算 - LED_dim_status_info_R.delta = (( LED_dim_status_info_R.to - LED_dim_status_info_R.now ) ) / info_LED.info_LED.fade_time; - LED_dim_status_info_G.delta = (( LED_dim_status_info_G.to - LED_dim_status_info_G.now ) ) / info_LED.info_LED.fade_time; - LED_dim_status_info_B.delta = (( LED_dim_status_info_B.to - LED_dim_status_info_B.now ) ) / info_LED.info_LED.fade_time; - + // グラデーション計算 + calc_info_led_next_frame( &LED_dim_status_info_R, info_LED.info_LED.red[frame] ); + calc_info_led_next_frame( &LED_dim_status_info_G, info_LED.info_LED.grn[frame] ); + calc_info_led_next_frame( &LED_dim_status_info_B, info_LED.info_LED.blu[frame] ); + } time_to_next_frame -= 1; } } - 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 ); + led_fade_to2( LED_duty_notify_red, &LED_dim_status_info_R ); + led_fade_to2( LED_duty_notify_grn, &LED_dim_status_info_G ); } diff --git a/trunk/pm.c b/trunk/pm.c index 92a425b..3095951 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -22,17 +22,19 @@ // ======================================================== u8 raw_adc_temperature; BT_VENDER battery_manufacturer = BT_VENDER_NOT_CHECKED; -st_bt_comp bt_comp; // バッテリパラメータ構造体 -u8 reg_shadow; // NTR PMIC レジスタミラー +static st_bt_comp bt_comp; // バッテリパラメータ構造体 +static u8 reg_shadow; // NTR PMIC レジスタミラー bit bt_authorized; // バッテリパラメータ送信済。充電開始許可 u8 chg_led_override; // アダプタ差したとき、充電するしないに関わらずしばらく点灯させる -u16 bt_volt16; +static u16 bt_volt16; -bit ntr_pm_bt_low_old; +static bit ntr_pm_bt_low_old; bit BT_CHG_STAT_Change; bit BT_IN_CHG_delayed_n; +bit temp_zone_charge_disable; // 温度で充電停止する時にヒステリシスを付けるため + u8 pmic_version; u8 mgic_version[2]; @@ -41,7 +43,8 @@ u8 mgic_version[2]; static void BT_model_detect(); static void BT_mgic_quick_start(); static void BT_mgic_init(); - +static void bt_chk_temparature(); +static void bt_get_charge_status(); // ======================================================== @@ -54,6 +57,7 @@ const u8 BT_MANUF_BORDER[] = { 5, 33, 79, 123, 158, 197, 233 }; + /* ======================================================== 電池の管理 @@ -73,11 +77,9 @@ const u8 BT_MANUF_BORDER[] = { #define INTERVAL_TSK_BATT 60 // ↑100だと充電エラー時にうまく点滅しないので -bit temp_zone_charge_disable; // 温度で充電停止する時にヒステリシスを付けるため void tsk_batt( ) { static u8 task_interval = 0; - static u8 heikinka_h,heikinka_l; if( system_status.pwr_state != OFF_TRIG ) { @@ -91,11 +93,53 @@ void tsk_batt( ) } } - // アダプタステータス更新 ///////// + // アダプタステータス更新 // pm_chk_adapter(); - // 充電 /////////////////////////// - // 温度付きヒステリシス + // 充電 // + bt_chk_temparature(); // 温度チェック + if( !temp_zone_charge_disable && bt_authorized && !PM_EXTDC_n ) + { + BT_CHG_ENABLE(); // 温度範囲OKで充電再開 + } + else + { + BT_CHG_DISABLE(); // 温度危険！　充電停止 + } + + bt_get_charge_status(); // CCIC制御 + + LED_CHARGE = ( ! BT_IN_CHG_delayed_n )? 1: 0; // LEDに反映 + + // アダプタつないだ瞬間、満充電でも数秒わざと点灯させる。給電してることをわからせるため。 + if( chg_led_override != 0 ){ // ↑から見ればわかるが、瞬間(数クロック)消える事がある。気がつく人いるかな…？ + chg_led_override -= 1; + LED_CHARGE = 1; + } + + // レジスタの充電中ビットはLEDに同期する + set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。 + + // 割り込み + // tsk_miscが引き受ける + + // 電池残量 // + if( system_status.pwr_state != ON_CHECK ) + { + BT_get_left(); + } +} + + + +/* ******************************************************* + 温度チェック + 温度付きヒステリシス + ******************************************************* */ +void bt_chk_temparature() +{ + static u8 heikinka_h,heikinka_l; + if(( 75 <= raw_adc_temperature ) && ( raw_adc_temperature <= 184 )) { @@ -126,65 +170,39 @@ void tsk_batt( ) heikinka_h = 0; heikinka_l = 0; } +} - if( !temp_zone_charge_disable && bt_authorized && !PM_EXTDC_n ) + + +void bt_get_charge_status() +{ + // CCICの不具合回避のため、/CHGのネゲートをちょっと丁寧に遅延させる + static u8 anti_chatter; + + if( !BT_IN_CHG_n ) { - BT_CHG_ENABLE(); // 温度範囲OKで充電再開 + // さらにチャタリング除去 + if( anti_chatter < 2 ) // 電池無しでアダプタさして、電極をさわさわ + { // すると充電LEDががさがさするので + anti_chatter++; + } + else + { + BT_IN_CHG_delayed_n = 0; // 充電中 + } } else { - BT_CHG_DISABLE(); // 温度危険！　充電停止 - } - - // 充電 // - // →割り込み。 - // CCICの不具合回避のため、/CHGのネゲートをちょっと丁寧に遅延させる - { - static u8 anti_chatter; - - if( !BT_IN_CHG_n ) - { - // さらにチャタリング除去 - if( anti_chatter < 2 ) // 電池無しでアダプタさして、電極をさわさわ - { // すると充電LEDががさがさするので - anti_chatter++; - } - else - { - BT_IN_CHG_delayed_n = 0; // 充電中 - } - } - else - { - // "丁寧に遅延" todo:もっといい方法？ - if( !BT_CHG_Ena_n && vreg_ctr[ VREG_C_BT_REMAIN ] < 60 ) - { - BT_IN_CHG_delayed_n = 0; // 充電中と扱う。充電が終わっているはずがない - } - else - { - BT_IN_CHG_delayed_n = 1; - anti_chatter = 0; - } - } - - LED_CHARGE = ( ! BT_IN_CHG_delayed_n )? 1: 0; // LEDに反映 - } - - // アダプタつないだ瞬間、満充電でも数秒わざと点灯させる。給電してることをわからせるため。 - if( chg_led_override != 0 ){ // ↑から見ればわかるが、瞬間(数クロック)消える事がある。気がつく人いるかな…？ - chg_led_override -= 1; - LED_CHARGE = 1; - } - - // レジスタの充電中ビットはLEDに同期する - set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。 - // 割り込みはmiscが引き受ける - - // 電池残量 // - if( system_status.pwr_state != ON_CHECK ) - { - BT_get_left(); + // "丁寧に遅延" todo:もっといい方法？ + if( !BT_CHG_Ena_n && vreg_ctr[ VREG_C_BT_REMAIN ] < 60 ) + { + BT_IN_CHG_delayed_n = 0; // 充電中と扱う。充電が終わっているはずがない + } + else + { + BT_IN_CHG_delayed_n = 1; + anti_chatter = 0; + } } } @@ -331,14 +349,14 @@ void BT_model_detect() // 電池メーカーの識別 // { - BT_VENDER i; + u8 i; - battery_manufacturer = BT_VENDER_OPEN; + battery_manufacturer = BT_VENDER_OPEN; // デフォルト値 for(i=0; i<=7; i++) { if( temp <= BT_MANUF_BORDER[ i ] ) { - battery_manufacturer = i; + battery_manufacturer = (BT_VENDER)i; break; /* BT_VENDER_MAXELL; // = 0 @@ -404,6 +422,7 @@ static void BT_mgic_init() /* // -1. リセットをかけてみる + かけちゃだめ! dat_16._u16 = swap_endian_16( 0x5400 ); // reset iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_COMMAND, 2, &dat_16 ); // こいつはNACKを返す */ @@ -441,15 +460,36 @@ static void BT_mgic_init() // 5.メーカー別パラメータのロード { - // 16バイトごとに区切れとのこと - iic_mcu_set_wo_dma( ); - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM, 16, &BT_PARAM[ battery_manufacturer ] ); - iic_mcu_set_wo_dma( ); - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM +16, 16, &BT_PARAM[ battery_manufacturer ][16] ); - iic_mcu_set_wo_dma( ); - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM +32, 16, &BT_PARAM[ battery_manufacturer ][32] ); - iic_mcu_set_wo_dma( ); - iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM +48, 16, &BT_PARAM[ battery_manufacturer ][48] ); + // 苦肉の策... 誤判定耐性が下がるわけではないし + u8* p_batt_param; + BT_VENDER bt_manuf_temp = battery_manufacturer; + u8 loop; + + /* 埋蔵金をつかってしまったが　↓の苦肉の策でまるめられてしまう + if( battery_manufacturer == 6 ) + { + battery_manufacturer = 5; + } + */ + + if( bt_manuf_temp > BT_VENDER_4 ) + { + bt_manuf_temp = BT_VENDER_3; // 白箱はどうでもよし + } + + if( system_status.family == FAMILY_SPFL ) + { + bt_manuf_temp += 1; + } + + p_batt_param = BT_PARAM[bt_manuf_temp]; + + // 16バイトごとに区切れとのこと　（ノイズ対策とか言うんだけど、意味あるんか？） + for( loop = 0; loop < 4; loop++ ) + { + iic_mcu_set_wo_dma( ); + iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM, 16, p_batt_param + loop*16 ); + } } // 6. 150ms以上待つ @@ -583,7 +623,7 @@ void BT_get_left(){ else if( system_status.model == MODEL_SHIROBAKO ) { // 白箱 // - // 電池残量 + // 電池残量 if( iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC, 2, temp_fuel ) != ERR_SUCCESS ) { // エミュレーション機能がおかしい @@ -594,8 +634,9 @@ void BT_get_left(){ vreg_ctr[ VREG_C_BT_REMAIN ] = temp_fuel[0]; vreg_ctr[ VREG_C_BT_REMAIN_FINE ] = temp_fuel[1]; } - // 電池電圧 + //* + // 電池電圧 if( iic_mcu_read( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VCELL, 2, temp_fuel ) == ERR_SUCCESS ) { vreg_ctr[ VREG_C_BT_VOLTAGE ] = temp_fuel[0]; @@ -915,7 +956,6 @@ err PM_BL_set( u8 dat ) // シャットダウンすることがある { wait_ms( 16 + 10 ); -// wait_ms( 84 ); ミツミの1stバグ回避 } iic_mcu_write_a_byte( IIC_SLA_PMIC, PM_REG_ADRS_BL, blset ); @@ -923,10 +963,12 @@ err PM_BL_set( u8 dat ) // SoCがPWMを出すようレジスタをセットしてから遅延が有るため、ステータスを先に // 更新してしまう。 #endif + // PMICのBLのビットと、MCUのSTATUSレジスタのビット位置が逆なため入れ替え vreg_ctr[VREG_C_STATUS] = (( vreg_ctr[VREG_C_STATUS] & 0b10011111 ) | ( (( blset << 6 ) | ( blset << 4 )) & 0b01100000 )); - // PMICのBLのビットと、MCUのSTATUSレジスタのビット位置が逆なため入れ替え + // 割り込み + /// 複数ビットまとめて行うので、いつもの関数使用不可 { u8 tot; @@ -935,7 +977,7 @@ err PM_BL_set( u8 dat ) vreg_ctr[ VREG_C_IRQ3 ] |= ( intset & ~vreg_ctr[ VREG_C_IRQ_MASK3 ] ); IRQ0_neg; tot = 0; - while( !IRQ0 && ( ++tot != 0 ) ){;} // 割り込みを入れ直す + while( !IRQ0 && ( ++tot != 0 ) ){;} IRQ0_ast; } } @@ -1019,7 +1061,7 @@ err PM_sys_pow_on( ) codec_reg_init(); // CODEC 不定レジスタ初期化(reset2の後でないといけないので) reg_shadow = 0; // 　〃　こんなところで... - return ( ERR_SUCCESS ); + return ( ERR_SUCCESS ); } diff --git a/trunk/task_misc.c b/trunk/task_misc.c index ef5dc9a..a2f4bbe 100644 --- a/trunk/task_misc.c +++ b/trunk/task_misc.c @@ -266,15 +266,18 @@ extern bit bt_authorized; 6) ( rcomp & 0xFF ) 7) raw_adc_temperature 8) ( !temp_zone_charge_disable | ( bt_authorized << 1 ) ) - 9) + 9) お知らせLEDはフルカラー？ + 10) system_status.family ======================================================== */ + +#define KOUMOKU 9 u8 extinfo_read() { - u8 infos[10]; + u8 infos[ KOUMOKU +1 ]; - if( iic_burst_state > 8 ) + if( iic_burst_state > KOUMOKU ) { - return( 0xAA ); + return( 0x73 ); } // static でとるほどのものでないので毎回スタックからとってくる @@ -289,6 +292,8 @@ u8 extinfo_read() infos[6] = raw_adc_temperature; infos[7] = ( !temp_zone_charge_disable | ( bt_authorized << 1 ) ); infos[8] = 1; // system_status.info_fullcolor; + infos[9] = system_status.family; + // 項目足すときは気をつけてね!! // iic_burst_state++; return( infos[ iic_burst_state -1 ] ); diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 9cb435b..af75f32 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -22,7 +22,7 @@ SubClock=None [Mapping] Count=0 [Main] -Geometry=13, 66, 1440, 858 +Geometry=154, 154, 1080, 635 Window=Max MDI_MAX=OFF Button=ON @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=0, 0, 725, 753 +Geometry=344, 62, 733, 655 Window=Normal -DispStart=435 -CaretPos=436,0 +DispStart=40 +CaretPos=81,0 Mode=Normal DispFile= Address1= @@ -140,17 +140,17 @@ SaveStart= SaveEnd= Accumulative=ON [Source1] -Geometry=139, 70, 725, 684 +Geometry=25, 25, 600, 750 Window=Normal -DispStart=153 -CaretPos=121,9 +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 Window=Hide -DispStart=847434752 +DispStart=847627264 CaretPos=0,0 Address1= Address2= @@ -193,7 +193,7 @@ SaveRange=Screen SaveStart= SaveEnd= [Memory] -Geometry=856, 20, 550, 400 +Geometry=0, 0, 0, 0 Window=Hide Boundary=0 Format=Hex @@ -202,7 +202,7 @@ Endian= Ascii=OFF Idtag=OFF Address= -DispStart=00000000 +DispStart=FFFFFFFF CaretPosData=0, 0 CaretPosAscii=0, 0 Address1= @@ -965,16 +965,17 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=908, 128, 510, 614 +Geometry=981, 20, 440, 300 Window=Normal Boundary=13762700 -0=.vreg_ctr,P,N,A,+,1 -Line=1 +0=+info_LED.info_LED,.,N,A,-,1 +1=+LED_dim_status_info_R,.,N,A,-,1 +Line=2 [Quick Watch] -0=vreg_ctr,P,A,1 -1=system=status,P,A,1 -2= -3= +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= @@ -988,10 +989,18 @@ Line=1 14= 15= [Software Break] -Geometry=0, 0, 0, 0 -Window=Hide +Geometry=75, 75, 500, 200 +Window=Normal Width=150 30 200 100 -Count=0 +Name0=Swb00001 +Address0=led.c#_tsk_led_notify+0x84 +Window0=ASM +Status0=OFF +Name1=Swb00002 +Address1=led.c#_tsk_led_notify+0x47 +Window1=ASM +Status1=OFF +Count=2 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index b603d96..b2461ce 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -696,6 +696,68 @@ Tool1=CC78K0R|W2.13 Tool2=RA78K0R|W1.33 Tool3=SK78K0R|V3.10 Tool4=ID78K0R-QB|V3.61 +[SrcFile] +Source1=loader.c +Source2=pm.c +Source3=i2c_ctr.c +Source4=main.c +Source5=magic.c +Source6=WDT.c +Source7=i2c_mcu.c +Source8=i2c_twl.c +Source9=led.c +Source10=rtc.c +Source11=vreg_ctr.c +Source12=vreg_twl.c +Source13=adc.c +Source14=renge\renge.c +Source15=accero.c +Source16=self_flash.c +Source17=sw.c +Source18=task_debug.c +Source19=task_misc.c +Source20=task_sys.c +Source21=pedo_alg_thre_det2.c +Source22=ini_VECT.c +Source23=task_status.c +Source24=led_cam.c +Source25=led_pow.c +[IncFile] +Include1=incs_loader.h +Include2=jhl_defs.h +Include3=config.h +Include4=user_define.h +Include5=bsr_system.h +Include6=renge\renge.h +Include7=renge\renge_defs.h +Include8=renge\renge_task_immediate.h +Include9=vreg_ctr.h +Include10=vreg_twl.h +Include11=loader.h +Include12=i2c_mcu.h +Include13=WDT.h +Include14=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h +Include15=fsl_user.h +Include16=i2c_ctr.h +Include17=pm.h +Include18=rtc.h +Include19=reboot.h +Include20=magic.h +Include21=incs.h +Include22=i2c_twl.h +Include23=accero.h +Include24=pedometer.h +Include25=sw.h +Include26=adc.h +Include27=led.h +Include28=batt_params.h +Include29=pool.h +Include30=i2c_twl_defs.h +Include31=voltable.h +Include32=renge\renge_task_intval.h +Include33=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h +Include34=self_flash.h +Include35=pedo_lpf_coeff.h [Options.LK78K0R 0] Version=100 O0=bsr_k0r.lmf @@ -780,7 +842,7 @@ G=1 E=0 E0=flash.elk E1=a.elk -GO=1 +GO=0 GOValue=85 GOStart=FC00 GOSizeValue=1024 @@ -989,65 +1051,3 @@ DefaultMode2=1 DefaultMode3=1 DefaultMode4=1 DefaultMode5=1 -[SrcFile] -Source1=loader.c -Source2=pm.c -Source3=i2c_ctr.c -Source4=main.c -Source5=magic.c -Source6=WDT.c -Source7=i2c_mcu.c -Source8=i2c_twl.c -Source9=led.c -Source10=rtc.c -Source11=vreg_ctr.c -Source12=vreg_twl.c -Source13=adc.c -Source14=renge\renge.c -Source15=accero.c -Source16=self_flash.c -Source17=sw.c -Source18=task_debug.c -Source19=task_misc.c -Source20=task_sys.c -Source21=pedo_alg_thre_det2.c -Source22=ini_VECT.c -Source23=task_status.c -Source24=led_cam.c -Source25=led_pow.c -[IncFile] -Include1=incs_loader.h -Include2=jhl_defs.h -Include3=config.h -Include4=user_define.h -Include5=bsr_system.h -Include6=renge\renge.h -Include7=renge\renge_defs.h -Include8=renge\renge_task_immediate.h -Include9=vreg_ctr.h -Include10=vreg_twl.h -Include11=loader.h -Include12=i2c_mcu.h -Include13=WDT.h -Include14=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h -Include15=fsl_user.h -Include16=i2c_ctr.h -Include17=pm.h -Include18=rtc.h -Include19=reboot.h -Include20=magic.h -Include21=incs.h -Include22=i2c_twl.h -Include23=accero.h -Include24=pedometer.h -Include25=sw.h -Include26=adc.h -Include27=led.h -Include28=batt_params.h -Include29=pool.h -Include30=i2c_twl_defs.h -Include31=voltable.h -Include32=renge\renge_task_intval.h -Include33=..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h -Include34=self_flash.h -Include35=pedo_lpf_coeff.h diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 6be1f72..6914776 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,14 +1,17 @@ [ProjectManager] FrameMax=1 -FrameX=304 -FrameY=108 +FrameX=75 +FrameY=75 FrameCX=1440 FrameCY=850 -OpenFile1=ProjectWindow +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 PrjPos=0,0,706,0,291 -OpenFile2=batt_params.h,0,596,19,1842,741,0,19,0,0 -OpenFile3=config.h,0,442,428,1557,1029,63,10,0,0 -OpenFile4=OutputWindow +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 OutputPos=0,34,740,376,1323 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow]