rvtr/ctr_mcu
1
Fork 0
mirror of https://github.com/rvtr/ctr_mcu.git synced 2025-06-19 09:05:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

SDK5.0の変更をマージ

Browse Source 
flower、CTRと同じバッテリーを使うそうなのでパラメータを削除（マップは改変後のままにしてある）
flower の LCD に合わせて修正（SoCにはバックライトが二枚あるように見せている。プロセス変更不要）
ほか、もういらないコメントアウトなど削除

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@500 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2012-12-12 07:43:26 +00:00
parent 3f9e2b7b96
commit bc6125cca4
21 changed files with 2104 additions and 2324 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
trunk/VCProj/bsr_trunk.sdf
View File

Binary file not shown.

BIN
trunk/VCProj/bsr_trunk.suo
View File

Binary file not shown.

74
trunk/batt_params.c
View File

@ -118,81 +118,13 @@ const bt_param_ bt_param[ _BT_PARAM_NUM_ ] =
{ 106, (-256* 0.925), (-256* 2.3) }, { 106, (-256* 0.925), (-256* 2.3) },
0xDA30, // = 55856 0xDA30, // = 55856
{ 0xE9, 0xE7 }, { 0xE9, 0xE7 },
}, }
// FLOWER ///////////////////////////////////////////// // FLOWER /////////////////////////////////////////////
// BT_PARAM__MAXELL // 無し。CTRのバッテリーを使う。
{
{
0x9D, 0x80, 0xB7, 0xB0, 0xB8, 0xA0, 0xB9, 0xA0,
0xBB, 0x40, 0xBC, 0x50, 0xBC, 0xA0, 0xBD, 0x00,
0xBD, 0x90, 0xBF, 0x30, 0xC0, 0xE0, 0xC3, 0x30,
0xC5, 0x40, 0xC7, 0x50, 0xCD, 0x40, 0xD0, 0xA0,
0x01, 0x90, 0x35, 0x10, 0x2F, 0x30, 0x11, 0x00,
0x29, 0x40, 0x88, 0x50, 0x71, 0xA0, 0x5F, 0xE0,
0x32, 0xD0, 0x1C, 0xF0, 0x14, 0xF0, 0x1A, 0x80,
0x1A, 0x80, 0x11, 0x10, 0x12, 0x00, 0x12, 0x00
},
2,
{ 86, (-256* 0.6), (-256* 3.675) }, // rcomp, r-hot, r-cold
0xDAA0, // ocv
{ 0xF5, 0xF3 } // compare max, min
},
// bt_PARAM__PANA
{
{
0x9D, 0xA0, 0xA8, 0xF0, 0xAD, 0x90, 0xAF, 0x00,
0xB3, 0x00, 0xB3, 0xE0, 0xB4, 0xA0, 0xB5, 0x40,
0xB6, 0x30, 0xB7, 0xE0, 0xB8, 0xC0, 0xBE, 0x70,
0xC1, 0x40, 0xC4, 0x20, 0xC9, 0xA0, 0xD0, 0x30,
0x01, 0x10, 0x06, 0x00, 0x2C, 0x20, 0x0D, 0xA0,
0x37, 0x00, 0x37, 0x30, 0x47, 0xF0, 0x28, 0xF0,
0x25, 0xF0, 0x37, 0x30, 0x10, 0xF0, 0x14, 0xF0,
0x0F, 0x70, 0x0D, 0x00, 0x0D, 0x00, 0x0D, 0x00,
},
2,
{ 106, (-256* 0.925), (-256* 2.3) },
0xDA30, // = 55856
{ 0xE9, 0xE7 },
},
// CLOSER ///////////////////////////////////////////// // CLOSER /////////////////////////////////////////////
// BT_PARAM_CLOSER_MAXELL // 未定。
{
{
0x9D, 0x80, 0xB7, 0xB0, 0xB8, 0xA0, 0xB9, 0xA0,
0xBB, 0x40, 0xBC, 0x50, 0xBC, 0xA0, 0xBD, 0x00,
0xBD, 0x90, 0xBF, 0x30, 0xC0, 0xE0, 0xC3, 0x30,
0xC5, 0x40, 0xC7, 0x50, 0xCD, 0x40, 0xD0, 0xA0,
0x01, 0x90, 0x35, 0x10, 0x2F, 0x30, 0x11, 0x00,
0x29, 0x40, 0x88, 0x50, 0x71, 0xA0, 0x5F, 0xE0,
0x32, 0xD0, 0x1C, 0xF0, 0x14, 0xF0, 0x1A, 0x80,
0x1A, 0x80, 0x11, 0x10, 0x12, 0x00, 0x12, 0x00
},
2,
{ 86, (-256* 0.6), (-256* 3.675) }, // rcomp, r-hot, r-cold
0xDAA0, // ocv
{ 0xF5, 0xF3 } // compare max, min
},
// bt_PARAM_CLOSER_PANA
{
{
0x9D, 0xA0, 0xA8, 0xF0, 0xAD, 0x90, 0xAF, 0x00,
0xB3, 0x00, 0xB3, 0xE0, 0xB4, 0xA0, 0xB5, 0x40,
0xB6, 0x30, 0xB7, 0xE0, 0xB8, 0xC0, 0xBE, 0x70,
0xC1, 0x40, 0xC4, 0x20, 0xC9, 0xA0, 0xD0, 0x30,
0x01, 0x10, 0x06, 0x00, 0x2C, 0x20, 0x0D, 0xA0,
0x37, 0x00, 0x37, 0x30, 0x47, 0xF0, 0x28, 0xF0,
0x25, 0xF0, 0x37, 0x30, 0x10, 0xF0, 0x14, 0xF0,
0x0F, 0x70, 0x0D, 0x00, 0x0D, 0x00, 0x0D, 0x00,
},
2,
{ 106, (-256* 0.925), (-256* 2.3) },
0xDA30, // = 55856
{ 0xE9, 0xE7 },
}
}; };

3
trunk/batt_params.h
View File

@ -39,7 +39,8 @@ typedef struct
typedef struct typedef struct
{ {
u8 hi,low; u8 hi;
u8 low;
} verify_; } verify_;
typedef struct typedef struct

1761
trunk/bsr.hex
View File

File diff suppressed because it is too large Load Diff

582
trunk/bsr_k0r.map
View File

@ -1,22 +1,22 @@
78K0R Linker W1.33 Date:22 Nov 2012 Page: 1 78K0R Linker W1.33 Date: 5 Dec 2012 Page: 1
Command: -yC:\Program Files (x86)\NEC Electronics Tools\DEV -_msgoff - Command: -yC:\Program Files (x86)\NEC Electronics Tools\DEV -_msgoff -
obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C
C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr C78K0R\W2.13\lib78k0r\s0rm.rel -go85h,0FC00h,1024 -gi1B339499
_k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -bC:\Program File
nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r s (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib
m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -iC:\Program Files (x86
ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel pm )\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -
.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_t s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.re
wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng l i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_t
e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi wl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel tas
sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_ k_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel
status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel vo ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel
ltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_e batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel
i.rel util_funcs.rel i2c_mcu-sub.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel
Para-file: Para-file:
Out-file: bsr.lmf Out-file: bsr.lmf
Map-file: bsr_k0r.map Map-file: bsr_k0r.map
@ -25,9 +25,9 @@ Direc-file:bsr_mcu.dr
*** Link information *** *** Link information ***
73 output segment(s) 75 output segment(s)
3EDFH byte(s) real data 3F0BH byte(s) real data
6330 symbol(s) defined 6371 symbol(s) defined
*** Memory map *** *** Memory map ***
@ -64,7 +64,8 @@ Direc-file:bsr_mcu.dr
LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL 00002H 00000H CSEG PAGE64KP
LDR_CNSL util_funcs LDR_CNSL util_funcs
00002H 00000H 00002H 00000H
* gap * 00002H 0000EH ??NMIROM 00002H 00002H CSEG
* gap * 00004H 0000CH
@@VECT10 00010H 00004H CSEG AT @@VECT10 00010H 00004H CSEG AT
@@VECT10 ini_VECT 00010H 00004H @@VECT10 ini_VECT 00010H 00004H
* gap * 00014H 00008H * gap * 00014H 00008H
@ -155,56 +156,57 @@ Direc-file:bsr_mcu.dr
LDR_CODL util_funcs LDR_CODL util_funcs
000C4H 00000H 000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG ?CSEGSI 000C4H 0000AH CSEG
LDR_CODE 000CEH 0096FH CSEG ?OCDSTAD 000CEH 0000AH CSEG
LDR_CODE loader 000CEH 0018CH LDR_CODE 000D8H 00967H CSEG
LDR_CODE WDT 0025AH 00000H LDR_CODE loader 000D8H 0018CH
LDR_CODE i2c_mcu 0025AH 0029BH LDR_CODE WDT 00264H 00000H
LDR_CODE i2c_twl 004F5H 00063H LDR_CODE i2c_mcu 00264H 0029BH
LDR_CODE i2c_twl 004FFH 0005BH
LDR_CODE self_flash LDR_CODE self_flash
00558H 00370H 0055AH 00370H
LDR_CODE task_debug LDR_CODE task_debug
008C8H 00000H 008CAH 00000H
LDR_CODE task_status LDR_CODE task_status
008C8H 00075H 008CAH 00075H
LDR_CODE hal 0093DH 000DCH LDR_CODE hal 0093FH 000DCH
LDR_CODE util_funcs LDR_CODE util_funcs
00A19H 00024H 00A1BH 00024H
FSL_CODE 00A3DH 00322H CSEG FSL_CODE 00A3FH 00322H CSEG
FSL_CODE fsl_block_cmd FSL_CODE fsl_block_cmd
00A3DH 0002BH 00A3FH 0002BH
FSL_CODE fsl_block_check FSL_CODE fsl_block_check
00A68H 00013H 00A6AH 00013H
FSL_CODE fsl_common FSL_CODE fsl_common
00A7BH 0014FH 00A7DH 0014FH
FSL_CODE fsl_reset FSL_CODE fsl_reset
00BCAH 00001H 00BCCH 00001H
FSL_CODE fsl_si_ibf FSL_CODE fsl_si_ibf
00BCBH 00064H 00BCDH 00064H
FSL_CODE fsl_phySwap FSL_CODE fsl_phySwap
00C2FH 0004DH 00C31H 0004DH
FSL_CODE fsl_si_common FSL_CODE fsl_si_common
00C7CH 00061H 00C7EH 00061H
FSL_CODE fsl_swap 00CDDH 00030H FSL_CODE fsl_swap 00CDFH 00030H
FSL_CODE fsl_write FSL_CODE fsl_write
00D0DH 00052H 00D0FH 00052H
@@LCODE 00D5FH 00277H CSEG @@LCODE 00D61H 00277H CSEG
@@LCODE @cstart 00D5FH 0006DH @@LCODE @cstart 00D61H 0006DH
@@LCODE @imul 00DCCH 00011H @@LCODE @imul 00DCEH 00011H
@@LCODE @lumul 00DDDH 0002BH @@LCODE @lumul 00DDFH 0002BH
@@LCODE @isdiv 00E08H 00022H @@LCODE @isdiv 00E0AH 00022H
@@LCODE @iudiv 00E2AH 0002DH @@LCODE @iudiv 00E2CH 0002DH
@@LCODE @isrem 00E57H 00021H @@LCODE @isrem 00E59H 00021H
@@LCODE @iurem 00E78H 0002FH @@LCODE @iurem 00E7AH 0002FH
@@LCODE @lsdiv 00EA7H 00039H @@LCODE @lsdiv 00EA9H 00039H
@@LCODE @ludiv 00EE0H 0003FH @@LCODE @ludiv 00EE2H 0003FH
@@LCODE @divuw 00F1FH 00034H @@LCODE @divuw 00F21H 00034H
@@LCODE @ladd 00F53H 0000FH @@LCODE @ladd 00F55H 0000FH
@@LCODE @llsh 00F62H 0001BH @@LCODE @llsh 00F64H 0001BH
@@LCODE @lursh 00F7DH 0001FH @@LCODE @lursh 00F7FH 0001FH
@@LCODE @iscmp 00F9CH 0000CH @@LCODE @iscmp 00F9EH 0000CH
@@LCODE @lband 00FA8H 00014H @@LCODE @lband 00FAAH 00014H
@@LCODE @bcdtob 00FBCH 0001AH @@LCODE @bcdtob 00FBEH 0001AH
* gap * 00FD6H 00020H * gap * 00FD8H 0001EH
MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH MGC_LOAD magic 00FF6H 0000AH
@ -258,299 +260,299 @@ Direc-file:bsr_mcu.dr
023BCH 00000H 023BCH 00000H
@@CNST i2c_mcu-sub @@CNST i2c_mcu-sub
023BCH 00000H 023BCH 00000H
ROM_CODE 023BCH 0253DH CSEG ROM_CODE 023BCH 02565H CSEG
ROM_CODE pm 023BCH 009BDH ROM_CODE pm 023BCH 009C5H
ROM_CODE i2c_ctr 02D79H 00064H ROM_CODE i2c_ctr 02D81H 0005CH
ROM_CODE main 02DDDH 00055H ROM_CODE main 02DDDH 00055H
ROM_CODE led 02E32H 0024FH ROM_CODE led 02E32H 00277H
ROM_CODE rtc 03081H 000E0H ROM_CODE rtc 030A9H 000E0H
ROM_CODE vreg_ctr 03161H 00493H ROM_CODE vreg_ctr 03189H 00493H
ROM_CODE vreg_twl 035F4H 000F9H ROM_CODE vreg_twl 0361CH 000F9H
ROM_CODE adc 036EDH 00261H ROM_CODE adc 03715H 00261H
ROM_CODE renge 0394EH 00018H ROM_CODE renge 03976H 00018H
ROM_CODE accero 03966H 00155H ROM_CODE accero 0398EH 00155H
ROM_CODE sw 03ABBH 00131H ROM_CODE sw 03AE3H 00131H
ROM_CODE task_misc ROM_CODE task_misc
03BECH 001C1H 03C14H 001C1H
ROM_CODE task_sys 03DADH 0037DH ROM_CODE task_sys 03DD5H 0037DH
ROM_CODE pedo_alg_thre_det2 ROM_CODE pedo_alg_thre_det2
0412AH 004D4H 04152H 004D4H
ROM_CODE led_cam 045FEH 000C4H ROM_CODE led_cam 04626H 000C4H
ROM_CODE led_pow 046C2H 0016FH ROM_CODE led_pow 046EAH 0016FH
ROM_CODE voltable 04831H 00000H ROM_CODE voltable 04859H 00000H
ROM_CODE pedo_lpf_coeff ROM_CODE pedo_lpf_coeff
04831H 00000H 04859H 00000H
ROM_CODE kanaria_c ROM_CODE kanaria_c
04831H 00006H 04859H 00006H
ROM_CODE get_ei 04837H 0000DH ROM_CODE get_ei 0485FH 0000DH
ROM_CODE i2c_mcu-sub ROM_CODE i2c_mcu-sub
04844H 000B5H 0486CH 000B5H
@@BASE 048F9H 00614H CSEG BASE @@BASE 04921H 00614H CSEG BASE
@@BASE loader 048F9H 00000H @@BASE loader 04921H 00000H
@@BASE pm 048F9H 0003EH @@BASE pm 04921H 0003EH
@@BASE i2c_ctr 04937H 00170H @@BASE i2c_ctr 0495FH 00170H
@@BASE main 04AA7H 00000H @@BASE main 04ACFH 00000H
@@BASE magic 04AA7H 00000H @@BASE magic 04ACFH 00000H
@@BASE WDT 04AA7H 00000H @@BASE WDT 04ACFH 00000H
@@BASE i2c_mcu 04AA7H 000F2H @@BASE i2c_mcu 04ACFH 000F2H
@@BASE i2c_twl 04B99H 000D0H @@BASE i2c_twl 04BC1H 000D0H
@@BASE led 04C69H 00000H @@BASE led 04C91H 00000H
@@BASE rtc 04C69H 0005DH @@BASE rtc 04C91H 0005DH
@@BASE vreg_ctr 04CC6H 00000H @@BASE vreg_ctr 04CEEH 00000H
@@BASE vreg_twl 04CC6H 00000H @@BASE vreg_twl 04CEEH 00000H
@@BASE adc 04CC6H 00094H @@BASE adc 04CEEH 00094H
@@BASE renge 04D5AH 0016BH @@BASE renge 04D82H 0016BH
@@BASE accero 04EC5H 00042H @@BASE accero 04EEDH 00042H
@@BASE self_flash @@BASE self_flash
04F07H 00000H 04F2FH 00000H
@@BASE sw 04F07H 00000H @@BASE sw 04F2FH 00000H
@@BASE task_debug @@BASE task_debug
04F07H 00000H 04F2FH 00000H
@@BASE task_misc @@BASE task_misc
04F07H 00000H 04F2FH 00000H
@@BASE task_sys 04F07H 00000H @@BASE task_sys 04F2FH 00000H
@@BASE pedo_alg_thre_det2 @@BASE pedo_alg_thre_det2
04F07H 00000H 04F2FH 00000H
@@BASE ini_VECT 04F07H 00006H @@BASE ini_VECT 04F2FH 00006H
@@BASE task_status @@BASE task_status
04F0DH 00000H 04F35H 00000H
@@BASE led_cam 04F0DH 00000H @@BASE led_cam 04F35H 00000H
@@BASE led_pow 04F0DH 00000H @@BASE led_pow 04F35H 00000H
@@BASE hal 04F0DH 00000H @@BASE hal 04F35H 00000H
@@BASE batt_params @@BASE batt_params
04F0DH 00000H 04F35H 00000H
@@BASE voltable 04F0DH 00000H @@BASE voltable 04F35H 00000H
@@BASE pedo_lpf_coeff @@BASE pedo_lpf_coeff
04F0DH 00000H 04F35H 00000H
@@BASE kanaria_c @@BASE kanaria_c
04F0DH 00000H 04F35H 00000H
@@BASE util_funcs @@BASE util_funcs
04F0DH 00000H 04F35H 00000H
@@BASE i2c_mcu-sub @@BASE i2c_mcu-sub
04F0DH 00000H 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL @cstart 04F0DH 00000H @@CNSTL @cstart 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL pm 04F0DH 00000H @@CNSTL pm 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04F0DH 00000H @@CNSTL i2c_ctr 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL main 04F0DH 00000H @@CNSTL main 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL led 04F0DH 00000H @@CNSTL led 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL rtc 04F0DH 00000H @@CNSTL rtc 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04F0DH 00000H @@CNSTL vreg_ctr 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04F0DH 00000H @@CNSTL vreg_twl 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL adc 04F0DH 00000H @@CNSTL adc 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL renge 04F0DH 00000H @@CNSTL renge 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL accero 04F0DH 00000H @@CNSTL accero 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL sw 04F0DH 00000H @@CNSTL sw 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL task_misc @@CNSTL task_misc
04F0DH 00000H 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL task_sys 04F0DH 00000H @@CNSTL task_sys 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2 @@CNSTL pedo_alg_thre_det2
04F0DH 00000H 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04F0DH 00000H @@CNSTL ini_VECT 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL led_cam 04F0DH 00000H @@CNSTL led_cam 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL led_pow 04F0DH 00000H @@CNSTL led_pow 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL batt_params @@CNSTL batt_params
04F0DH 00000H 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL voltable 04F0DH 00000H @@CNSTL voltable 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL pedo_lpf_coeff @@CNSTL pedo_lpf_coeff
04F0DH 00000H 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL kanaria_c @@CNSTL kanaria_c
04F0DH 00000H 04F35H 00000H
@@CNSTL 04F0DH 00000H CSEG PAGE64KP @@CNSTL 04F35H 00000H CSEG PAGE64KP
@@CNSTL i2c_mcu-sub @@CNSTL i2c_mcu-sub
04F0DH 00000H 04F35H 00000H
@@RLINIT 04F0DH 00000H CSEG UNIT64KP @@RLINIT 04F35H 00000H CSEG UNIT64KP
@@RLINIT loader 04F0DH 00000H @@RLINIT loader 04F35H 00000H
@@RLINIT pm 04F0DH 00000H @@RLINIT pm 04F35H 00000H
@@RLINIT i2c_ctr 04F0DH 00000H @@RLINIT i2c_ctr 04F35H 00000H
@@RLINIT main 04F0DH 00000H @@RLINIT main 04F35H 00000H
@@RLINIT magic 04F0DH 00000H @@RLINIT magic 04F35H 00000H
@@RLINIT WDT 04F0DH 00000H @@RLINIT WDT 04F35H 00000H
@@RLINIT i2c_mcu 04F0DH 00000H @@RLINIT i2c_mcu 04F35H 00000H
@@RLINIT i2c_twl 04F0DH 00000H @@RLINIT i2c_twl 04F35H 00000H
@@RLINIT led 04F0DH 00000H @@RLINIT led 04F35H 00000H
@@RLINIT rtc 04F0DH 00000H @@RLINIT rtc 04F35H 00000H
@@RLINIT vreg_ctr 04F0DH 00000H @@RLINIT vreg_ctr 04F35H 00000H
@@RLINIT vreg_twl 04F0DH 00000H @@RLINIT vreg_twl 04F35H 00000H
@@RLINIT adc 04F0DH 00000H @@RLINIT adc 04F35H 00000H
@@RLINIT renge 04F0DH 00000H @@RLINIT renge 04F35H 00000H
@@RLINIT accero 04F0DH 00000H @@RLINIT accero 04F35H 00000H
@@RLINIT self_flash @@RLINIT self_flash
04F0DH 00000H 04F35H 00000H
@@RLINIT sw 04F0DH 00000H @@RLINIT sw 04F35H 00000H
@@RLINIT task_debug @@RLINIT task_debug
04F0DH 00000H 04F35H 00000H
@@RLINIT task_misc @@RLINIT task_misc
04F0DH 00000H 04F35H 00000H
@@RLINIT task_sys 04F0DH 00000H @@RLINIT task_sys 04F35H 00000H
@@RLINIT pedo_alg_thre_det2 @@RLINIT pedo_alg_thre_det2
04F0DH 00000H 04F35H 00000H
@@RLINIT ini_VECT 04F0DH 00000H @@RLINIT ini_VECT 04F35H 00000H
@@RLINIT task_status @@RLINIT task_status
04F0DH 00000H 04F35H 00000H
@@RLINIT led_cam 04F0DH 00000H @@RLINIT led_cam 04F35H 00000H
@@RLINIT led_pow 04F0DH 00000H @@RLINIT led_pow 04F35H 00000H
@@RLINIT hal 04F0DH 00000H @@RLINIT hal 04F35H 00000H
@@RLINIT batt_params @@RLINIT batt_params
04F0DH 00000H 04F35H 00000H
@@RLINIT voltable 04F0DH 00000H @@RLINIT voltable 04F35H 00000H
@@RLINIT pedo_lpf_coeff @@RLINIT pedo_lpf_coeff
04F0DH 00000H 04F35H 00000H
@@RLINIT kanaria_c @@RLINIT kanaria_c
04F0DH 00000H 04F35H 00000H
@@RLINIT util_funcs @@RLINIT util_funcs
04F0DH 00000H 04F35H 00000H
@@RLINIT i2c_mcu-sub @@RLINIT i2c_mcu-sub
04F0DH 00000H 04F35H 00000H
@@RLINIT @rom 04F0DH 00000H @@RLINIT @rom 04F35H 00000H
@@CODEL 04F0DH 00000H CSEG @@CODEL 04F35H 00000H CSEG
@@CODEL pm 04F0DH 00000H @@CODEL pm 04F35H 00000H
@@CODEL i2c_ctr 04F0DH 00000H @@CODEL i2c_ctr 04F35H 00000H
@@CODEL main 04F0DH 00000H @@CODEL main 04F35H 00000H
@@CODEL magic 04F0DH 00000H @@CODEL magic 04F35H 00000H
@@CODEL led 04F0DH 00000H @@CODEL led 04F35H 00000H
@@CODEL rtc 04F0DH 00000H @@CODEL rtc 04F35H 00000H
@@CODEL vreg_ctr 04F0DH 00000H @@CODEL vreg_ctr 04F35H 00000H
@@CODEL vreg_twl 04F0DH 00000H @@CODEL vreg_twl 04F35H 00000H
@@CODEL adc 04F0DH 00000H @@CODEL adc 04F35H 00000H
@@CODEL renge 04F0DH 00000H @@CODEL renge 04F35H 00000H
@@CODEL accero 04F0DH 00000H @@CODEL accero 04F35H 00000H
@@CODEL sw 04F0DH 00000H @@CODEL sw 04F35H 00000H
@@CODEL task_misc @@CODEL task_misc
04F0DH 00000H 04F35H 00000H
@@CODEL task_sys 04F0DH 00000H @@CODEL task_sys 04F35H 00000H
@@CODEL pedo_alg_thre_det2 @@CODEL pedo_alg_thre_det2
04F0DH 00000H 04F35H 00000H
@@CODEL ini_VECT 04F0DH 00000H @@CODEL ini_VECT 04F35H 00000H
@@CODEL led_cam 04F0DH 00000H @@CODEL led_cam 04F35H 00000H
@@CODEL led_pow 04F0DH 00000H @@CODEL led_pow 04F35H 00000H
@@CODEL batt_params @@CODEL batt_params
04F0DH 00000H 04F35H 00000H
@@CODEL voltable 04F0DH 00000H @@CODEL voltable 04F35H 00000H
@@CODEL pedo_lpf_coeff @@CODEL pedo_lpf_coeff
04F0DH 00000H 04F35H 00000H
@@CODEL kanaria_c @@CODEL kanaria_c
04F0DH 00000H 04F35H 00000H
@@CODEL i2c_mcu-sub @@CODEL i2c_mcu-sub
04F0DH 00000H 04F35H 00000H
* gap * 04F0DH 00001H * gap * 04F35H 00001H
@@CNSTL 04F0EH 0000AH CSEG PAGE64KP @@CNSTL 04F36H 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04F0EH 0000AH @@CNSTL @bcdtob 04F36H 0000AH
@@R_INIT 04F18H 0004AH CSEG UNIT64KP @@R_INIT 04F40H 0004AH CSEG UNIT64KP
@@R_INIT @cstart 04F18H 00000H @@R_INIT @cstart 04F40H 00000H
@@R_INIT loader 04F18H 00000H @@R_INIT loader 04F40H 00000H
@@R_INIT pm 04F18H 00000H @@R_INIT pm 04F40H 00000H
@@R_INIT i2c_ctr 04F18H 00000H @@R_INIT i2c_ctr 04F40H 00000H
@@R_INIT main 04F18H 00000H @@R_INIT main 04F40H 00000H
@@R_INIT magic 04F18H 00000H @@R_INIT magic 04F40H 00000H
@@R_INIT WDT 04F18H 00000H @@R_INIT WDT 04F40H 00000H
@@R_INIT i2c_mcu 04F18H 00000H @@R_INIT i2c_mcu 04F40H 00000H
@@R_INIT i2c_twl 04F18H 00000H @@R_INIT i2c_twl 04F40H 00000H
@@R_INIT led 04F18H 00000H @@R_INIT led 04F40H 00000H
@@R_INIT rtc 04F18H 00000H @@R_INIT rtc 04F40H 00000H
@@R_INIT vreg_ctr 04F18H 00000H @@R_INIT vreg_ctr 04F40H 00000H
@@R_INIT vreg_twl 04F18H 00000H @@R_INIT vreg_twl 04F40H 00000H
@@R_INIT adc 04F18H 0000CH @@R_INIT adc 04F40H 0000CH
@@R_INIT renge 04F24H 00014H @@R_INIT renge 04F4CH 00014H
@@R_INIT accero 04F38H 00000H @@R_INIT accero 04F60H 00000H
@@R_INIT self_flash @@R_INIT self_flash
04F38H 00000H 04F60H 00000H
@@R_INIT sw 04F38H 00000H @@R_INIT sw 04F60H 00000H
@@R_INIT task_debug @@R_INIT task_debug
04F38H 00000H 04F60H 00000H
@@R_INIT task_misc @@R_INIT task_misc
04F38H 00026H 04F60H 00026H
@@R_INIT task_sys 04F5EH 00000H @@R_INIT task_sys 04F86H 00000H
@@R_INIT pedo_alg_thre_det2 @@R_INIT pedo_alg_thre_det2
04F5EH 00000H 04F86H 00000H
@@R_INIT ini_VECT 04F5EH 00000H @@R_INIT ini_VECT 04F86H 00000H
@@R_INIT task_status @@R_INIT task_status
04F5EH 00000H 04F86H 00000H
@@R_INIT led_cam 04F5EH 00000H @@R_INIT led_cam 04F86H 00000H
@@R_INIT led_pow 04F5EH 00004H @@R_INIT led_pow 04F86H 00004H
@@R_INIT hal 04F62H 00000H @@R_INIT hal 04F8AH 00000H
@@R_INIT batt_params @@R_INIT batt_params
04F62H 00000H 04F8AH 00000H
@@R_INIT voltable 04F62H 00000H @@R_INIT voltable 04F8AH 00000H
@@R_INIT pedo_lpf_coeff @@R_INIT pedo_lpf_coeff
04F62H 00000H 04F8AH 00000H
@@R_INIT kanaria_c @@R_INIT kanaria_c
04F62H 00000H 04F8AH 00000H
@@R_INIT util_funcs @@R_INIT util_funcs
04F62H 00000H 04F8AH 00000H
@@R_INIT i2c_mcu-sub @@R_INIT i2c_mcu-sub
04F62H 00000H 04F8AH 00000H
@@R_INIT @rom 04F62H 00000H @@R_INIT @rom 04F8AH 00000H
@@R_INIS 04F62H 00010H CSEG UNIT64KP @@R_INIS 04F8AH 00010H CSEG UNIT64KP
@@R_INIS @cstart 04F62H 00000H @@R_INIS @cstart 04F8AH 00000H
@@R_INIS loader 04F62H 00000H @@R_INIS loader 04F8AH 00000H
@@R_INIS pm 04F62H 00002H @@R_INIS pm 04F8AH 00002H
@@R_INIS i2c_ctr 04F64H 00002H @@R_INIS i2c_ctr 04F8CH 00002H
@@R_INIS main 04F66H 00000H @@R_INIS main 04F8EH 00000H
@@R_INIS magic 04F66H 00000H @@R_INIS magic 04F8EH 00000H
@@R_INIS WDT 04F66H 00000H @@R_INIS WDT 04F8EH 00000H
@@R_INIS i2c_mcu 04F66H 00000H @@R_INIS i2c_mcu 04F8EH 00000H
@@R_INIS i2c_twl 04F66H 00000H @@R_INIS i2c_twl 04F8EH 00000H
@@R_INIS led 04F66H 00000H @@R_INIS led 04F8EH 00000H
@@R_INIS rtc 04F66H 00000H @@R_INIS rtc 04F8EH 00000H
@@R_INIS vreg_ctr 04F66H 00000H @@R_INIS vreg_ctr 04F8EH 00000H
@@R_INIS vreg_twl 04F66H 00000H @@R_INIS vreg_twl 04F8EH 00000H
@@R_INIS adc 04F66H 00000H @@R_INIS adc 04F8EH 00000H
@@R_INIS renge 04F66H 00000H @@R_INIS renge 04F8EH 00000H
@@R_INIS accero 04F66H 00000H @@R_INIS accero 04F8EH 00000H
@@R_INIS self_flash @@R_INIS self_flash
04F66H 00000H 04F8EH 00000H
@@R_INIS sw 04F66H 00000H @@R_INIS sw 04F8EH 00000H
@@R_INIS task_debug @@R_INIS task_debug
04F66H 00000H 04F8EH 00000H
@@R_INIS task_misc @@R_INIS task_misc
04F66H 00000H 04F8EH 00000H
@@R_INIS task_sys 04F66H 00002H @@R_INIS task_sys 04F8EH 00002H
@@R_INIS pedo_alg_thre_det2 @@R_INIS pedo_alg_thre_det2
04F68H 00006H 04F90H 00006H
@@R_INIS ini_VECT 04F6EH 00000H @@R_INIS ini_VECT 04F96H 00000H
@@R_INIS task_status @@R_INIS task_status
04F6EH 00000H 04F96H 00000H
@@R_INIS led_cam 04F6EH 00002H @@R_INIS led_cam 04F96H 00002H
@@R_INIS led_pow 04F70H 00002H @@R_INIS led_pow 04F98H 00002H
@@R_INIS hal 04F72H 00000H @@R_INIS hal 04F9AH 00000H
@@R_INIS batt_params @@R_INIS batt_params
04F72H 00000H 04F9AH 00000H
@@R_INIS voltable 04F72H 00000H @@R_INIS voltable 04F9AH 00000H
@@R_INIS pedo_lpf_coeff @@R_INIS pedo_lpf_coeff
04F72H 00000H 04F9AH 00000H
@@R_INIS kanaria_c @@R_INIS kanaria_c
04F72H 00000H 04F9AH 00000H
@@R_INIS util_funcs @@R_INIS util_funcs
04F72H 00000H 04F9AH 00000H
@@R_INIS i2c_mcu-sub @@R_INIS i2c_mcu-sub
04F72H 00000H 04F9AH 00000H
@@R_INIS @rom 04F72H 00000H @@R_INIS @rom 04F9AH 00000H
@@LCODEL 04F72H 00022H CSEG @@LCODEL 04F9AH 00022H CSEG
@@LCODEL abs 04F72H 00008H @@LCODEL abs 04F9AH 00008H
@@LCODEL memcpy_n 04F7AH 0001AH @@LCODEL memcpy_n 04FA2H 0001AH
* gap * 04F94H 00060H * gap * 04FBCH 00038H
MGC_VER 04FF4H 00002H CSEG AT MGC_VER 04FF4H 00002H CSEG AT
MGC_VER magic 04FF4H 00002H MGC_VER magic 04FF4H 00002H
MGC_TAIL 04FF6H 0000AH CSEG AT MGC_TAIL 04FF6H 0000AH CSEG AT

6
trunk/bsr_system.h
View File

@ -43,8 +43,9 @@ enum family_
FAMILY_CTR, FAMILY_CTR,
FAMILY_SPFL, // おっきいの。 FAMILY_SPFL, // おっきいの。
FAMILY_SNAKE, // LAGERの。 FAMILY_SNAKE, // LAGERの。
FAMILY_4_RESERVED, FAMILY_FLOWER,
FAMILY_5_RESERVED FAMILY_CLOSER,
FAMILY_RESERVED5,
}; };
// タスクシステムの状態情報など // タスクシステムの状態情報など
@ -53,7 +54,6 @@ typedef struct _system_status_
enum pwr_state_ pwr_state; enum pwr_state_ pwr_state;
enum poweron_reason_ poweron_reason; enum poweron_reason_ poweron_reason;
unsigned char reboot:1; unsigned char reboot:1;
// unsigned char info_fullcolor:1;
unsigned char captureBox:1; // キャプチャ箱 SDKには実機と返す unsigned char captureBox:1; // キャプチャ箱 SDKには実機と返す
unsigned char taikendai:1; unsigned char taikendai:1;
unsigned char taikendai_nbd:1; unsigned char taikendai_nbd:1;

4
trunk/hal.c
View File

@ -69,7 +69,6 @@ void hal_update()
PM_EXTDC_n = PM_EXTDC_n_RAW; PM_EXTDC_n = PM_EXTDC_n_RAW;
} }
#ifndef _DBG_BT_FULL_
// <20>[“d’†<E28099>H // <20>[“d’†<E28099>H
if( temp_conf & REG_BIT_HAL0_BT_IN_CHG_n ) if( temp_conf & REG_BIT_HAL0_BT_IN_CHG_n )
{ {
@ -86,9 +85,6 @@ void hal_update()
{ {
BT_IN_CHG_n = BT_IN_CHG_n_RAW; BT_IN_CHG_n = BT_IN_CHG_n_RAW;
} }
#else
BT_IN_CHG_n = 1;
#endif
// “dŒ¹–t // “dŒ¹–t
if( temp_conf & REG_BIT_HAL0_SW_POW_n ) if( temp_conf & REG_BIT_HAL0_SW_POW_n )

BIN
trunk/hoge.bin
View File

Binary file not shown.

3
trunk/i2c_ctr.c
View File

@ -270,7 +270,7 @@ void IIC_ctr_Init( void )
// IICAPR0 = 1; /* set INTIICA high priority */ // IICAPR0 = 1; /* set INTIICA high priority */
// IICAPR1 = 0; /* set INTIICA high priority */ スタック不足 // IICAPR1 = 0; /* set INTIICA high priority */ スタック不足
P20 &= ~0x3; Port &= ~0x03;
SVA = IIC_C_SLAVEADDRESS; SVA = IIC_C_SLAVEADDRESS;
IICF = 0x01; IICF = 0x01;
@ -293,7 +293,6 @@ void IIC_ctr_Init( void )
IICE = 1; IICE = 1;
PortMode &= ~0x03; PortMode &= ~0x03;
Port &= ~0x03;
state = IIC_IDLE; state = IIC_IDLE;
} }

2
trunk/i2c_mcu-sub.c
View File

@ -2,7 +2,7 @@
簡易I2C（内蔵ペリフェラル使用）通信 簡易I2C（内蔵ペリフェラル使用）通信
de JHL 藤田＠開技 de JHL 藤田＠開技
'09 Feb - '09 Feb -
$Id$ $Id: $
======================================================== */ ======================================================== */
#ifndef _WIN32 #ifndef _WIN32
#pragma sfr #pragma sfr

3
trunk/i2c_twl.c
View File

@ -204,7 +204,7 @@ void IIC_twl_Init( void )
IICAPR0 = 0; /* set INTIICA high priority */ IICAPR0 = 0; /* set INTIICA high priority */
IICAPR1 = 0; /* set INTIICA high priority */ IICAPR1 = 0; /* set INTIICA high priority */
P20 &= ~0x3; Port &= ~0x03;
SVA = IIC_T_SLAVEADDRESS; SVA = IIC_T_SLAVEADDRESS;
IICF = 0x01; IICF = 0x01;
@ -227,7 +227,6 @@ void IIC_twl_Init( void )
IICE = 1; IICE = 1;
PortMode &= ~0x03; PortMode &= ~0x03;
Port &= ~0x03;
LREL = 1; LREL = 1;
} }

39
trunk/led.c
View File

@ -13,6 +13,10 @@
#include "led.h" #include "led.h"
// ========================================================
static void LED_oshirase_init();
// ======================================================== // ========================================================
// TPS0 // TPS0
@ -117,6 +121,9 @@ void LED_init( )
　　　　　　　　６　電源 Ｌ 　　　　　　　　６　電源 Ｌ
　　　　　　　　７　電源 Ｈ 　　　　　　　　７　電源 Ｈ
*/ */
// LED_oshirase_init(); // お知らせパターン初期化
/// ペリフェラル初期化 ///
TAU0EN = 1; TAU0EN = 1;
TPS0 = BIT_PRS012 | BIT_PRS002; // マスタークロックはCK01,8M/2 /2^4 = 250kHz TPS0 = BIT_PRS012 | BIT_PRS002; // マスタークロックはCK01,8M/2 /2^4 = 250kHz
@ -127,29 +134,45 @@ void LED_init( )
1 << BIT_CKS0 | 0 << BIT_CCS0 | 0 << BIT_MASTER0 | 4 << BIT_STS0 | 0 1 << BIT_CKS0 | 0 << BIT_CCS0 | 0 << BIT_MASTER0 | 4 << BIT_STS0 | 0
<< BIT_CIS0 | 4 << BIT_MD123 | 1 << BIT_MD0; << BIT_CIS0 | 4 << BIT_MD123 | 1 << BIT_MD0;
ISC = 0; ISC = 0;
TOM0 = 0x00FE; // 出力モード。4はPWM出力しないが1にしないとTO5以降にクロックが届かない TOM0 = 0x00FE; // 出力モード。4はPWM出力しないが1にしないとTO5以降にクロックが届かない
TOL0 = 0x0000; // 出力を反転させるかフラグ TOL0 = 0x0000; // 出力を反転させるかフラグ
TO0 = 0x0000; // タイマー動作中で、タイマー出力にしてないときのピンのラッチ。タイマー出力を使わないなら０ TO0 = 0x0000; // タイマー動作中で、タイマー出力にしてないときのピンのラッチ。タイマー出力を使わないなら０
TOE0 = 0x00EE; // TOxをタイマーモジュールが制御？ TOE0 = 0x00EE; // TOxをタイマーモジュールが制御？
TS0 = 0x00EF; // 動作開始 TS0 = 0x00EF; // 動作開始
TDR00 = LED_BRIGHT_MAX - 1; // 周期 10bit TDR00 = LED_BRIGHT_MAX - 1; // 周期 10bit
// system_status.info_fullcolor = 1; // お知らせ1灯仕様廃止 // アップデートなどでマイコンのみリブートしたとき
if( system_status.reboot ) if( system_status.reboot )
{ {
// SoC からのコマンドを待たず、自動で電源 LED をつける
vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO; vreg_ctr[VREG_C_LED_POW] = LED_POW_ILM_AUTO;
LED_duty_pow_blu = LED_BRIGHT_MAX; LED_duty_pow_blu = LED_BRIGHT_MAX;
} }
info_led_off = false; info_led_off = false; // 強制消灯 解除
ledInitialized = true; ledInitialized = true;
} }
static void LED_oshirase_init()
{
char* p_tgt = &info_LED;
int i;
for( i = 0; i < sizeof(info_LED); i++ )
{
*p_tgt = 0;
p_tgt++;
}
}
/********************************************//** /********************************************//**
LEDの停止。 LEDの停止。

4
trunk/loader.c
View File

@ -206,7 +206,7 @@ void chk_platform_type()
} }
else else
{ {
// FAMILY_SPFL or FAMILY_SNAKE // アモルファスしか生産しない // FAMILY_SPFL or FAMILY_SNAKE or FAMILY_FLOWER // アモルファスしか生産しない
system_status.LCD_is_CGS = false; system_status.LCD_is_CGS = false;
} }
@ -216,7 +216,7 @@ void chk_platform_type()
} }
else else
{ {
pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_AMO; pm_reg_bit_vddlcd = PM_REG_BIT_VDDLCD_AMO;
} }
set_vdd_voltages( system_status.family ); set_vdd_voltages( system_status.family );

47
trunk/pm.c
View File

@ -406,10 +406,12 @@ void BT_model_detect()
system_status.model = MODEL_SHIROBAKO; system_status.model = MODEL_SHIROBAKO;
// もしかして：キャプチャボード // // もしかして：キャプチャボード //
if(( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) == 0x01 ) && if( iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_VERSION ) == 0x01 )
( iic_mcu_result == I2C_ERR_OK ))
{ {
system_status.captureBox = true; if( iic_mcu_result == I2C_ERR_OK ) // バラに書かないと評価順が処理系依存
{
system_status.captureBox = true;
}
} }
} }
else else
@ -922,15 +924,15 @@ void PM_LCD_off()
***********************************************/ ***********************************************/
err PM_BL_set( u8 dat ) err PM_BL_set( u8 dat )
{ {
u8 blset; u8 blset; // PMIC レジスタに書き込む値
u8 intset = 0; u8 intset = 0; // 割り込みレジスタに反映する値
// RMWを行う // RMWを行う
// Read // Read
blset = read_pmic( PM_REG_ADRS_BL ); blset = read_pmic( PM_REG_ADRS_BL );
// Modify // Modify
// ue // 上画面
if(( dat & REG_BIT_CMD_BL_U_ON ) != 0 ) if(( dat & REG_BIT_CMD_BL_U_ON ) != 0 )
{ {
blset |= PM_REG_BIT_BL_U; blset |= PM_REG_BIT_BL_U;
@ -942,7 +944,7 @@ err PM_BL_set( u8 dat )
intset |= REG_BIT_BL_U_OFF; intset |= REG_BIT_BL_U_OFF;
} }
// shita // 下画面
if(( dat & REG_BIT_CMD_BL_L_ON ) != 0 ) if(( dat & REG_BIT_CMD_BL_L_ON ) != 0 )
{ {
blset |= PM_REG_BIT_BL_L; blset |= PM_REG_BIT_BL_L;
@ -954,6 +956,18 @@ err PM_BL_set( u8 dat )
intset |= REG_BIT_BL_L_OFF; intset |= REG_BIT_BL_L_OFF;
} }
if( system_status.family == FAMILY_FLOWER )
{
// パネルが一枚なので、off/off でなければ点灯、LX1（未接続側）を立ち上げない
// ただし、割り込みは嘘をついて SoC が設定したと思い込んだ値にする。
// todo: 要周知。
if( blset != 0 )
{
blset = PM_REG_BIT_BL_L;
}
}
// write
if( blset != 0 ) // BLを付ける場合はウェイトを挟まないとPWMが来ておらず if( blset != 0 ) // BLを付ける場合はウェイトを挟まないとPWMが来ておらず
// シャットダウンすることがある // シャットダウンすることがある
{ {
@ -1319,8 +1333,9 @@ u8 read_pmic( u8 reg )
void bt_param_select() void bt_param_select()
{ {
BT_TYPE bt_type_temp; BT_TYPE bt_type_temp;
// 対応が増えてきたら分岐コード書き直すつもりで
if( battery_manufacturer <= BT_VENDER_3 ) // バッテリメーカー識別
if( battery_manufacturer <= BT_VENDER_3 ) // 余裕を持って中間に閾値をとる
{ {
bt_type_temp = BT_PARAM_CTR_MAXELL; bt_type_temp = BT_PARAM_CTR_MAXELL;
} }
@ -1329,14 +1344,16 @@ void bt_param_select()
bt_type_temp = BT_PARAM_CTR_PANA; bt_type_temp = BT_PARAM_CTR_PANA;
} }
if( system_status.family == FAMILY_SPFL ) // モデル識別
switch( system_status.family )
{ {
bt_type_temp += BT_PARAM_SPFL_MAXELL; // オフセット 残念な実装で…。 case( FAMILY_SPFL ): bt_type_temp += BT_PARAM_SPFL_MAXELL; break; // オフセット 残念な実装で…。
} case( FAMILY_SNAKE ): bt_type_temp += BT_PARAM_SNAKE_MAXELL; break;
else if( system_status.family == FAMILY_SNAKE ) case( FAMILY_CTR ):
{ case( FAMILY_FLOWER ): // CTR と同じ物を使う
bt_type_temp += BT_PARAM_SNAKE_MAXELL; default: /* bt_type_temp そのまま */ break;
} }
p_bt_param = &bt_param[ bt_type_temp ]; p_bt_param = &bt_param[ bt_type_temp ];
} }

1
trunk/vreg_ctr.c
View File

@ -81,6 +81,7 @@ void vreg_ctr_reset( )
vreg_ctr[ VREG_C_MCU_VER_MAJOR ] = MCU_VER_MAJOR | 0x10; vreg_ctr[ VREG_C_MCU_VER_MAJOR ] = MCU_VER_MAJOR | 0x10;
vreg_ctr[ VREG_C_MCU_VER_MINOR ] = MCU_VER_MINOR; vreg_ctr[ VREG_C_MCU_VER_MINOR ] = MCU_VER_MINOR;
// vreg_ctr[ VREG_C_STATUS ] &= bits8(0,0,0,1, 1,1,1,1);
vreg_ctr[ VREG_C_LED_BRIGHT ] = 0xFF; vreg_ctr[ VREG_C_LED_BRIGHT ] = 0xFF;
vreg_ctr[ VREG_C_LED_POW ] = 0; vreg_ctr[ VREG_C_LED_POW ] = 0;
vreg_ctr[ VREG_C_LED_WIFI ] = 0; vreg_ctr[ VREG_C_LED_WIFI ] = 0;

207
trunk/yav_mcu_bsr.plg
View File

@ -1,207 +1,17 @@
C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c C:\Windows\system32\cmd.exe /c c:\cygwin\bin\touch magic.c
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no loader.c "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_ctr.c
loader.c(160) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(161) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\loader.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no pm.c
pm.c(538) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(849) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(853) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(881) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(895) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(969) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(978) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1051) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1058) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1197) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1199) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 11 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\pm.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no i2c_ctr.c
Compilation complete, 0 error(s) and 0 warning(s) found. Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_ctr.asm "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_ctr.asm
Assembly complete, 0 error(s) and 0 warning(s) found. Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no main.c "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no magic.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\main.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no magic.c
Compilation complete, 0 error(s) and 0 warning(s) found. Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\magic.asm
Assembly complete, 0 error(s) and 0 warning(s) found. Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no WDT.c "C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -sainter_asm -zpb -no i2c_twl.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\WDT.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no i2c_mcu.c
i2c_mcu.c(188) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 1 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no i2c_twl.c
Compilation complete, 0 error(s) and 0 warning(s) found. Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_twl.asm "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_twl.asm
Assembly complete, 0 error(s) and 0 warning(s) found. Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no led.c "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel
led.c(86) : CC78K0R warning W0745: Expected function prototype
led.c(352) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no rtc.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\rtc.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -ainter_asm -zpb -no vreg_ctr.c
vreg_ctr.c(158) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(159) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(161) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(163) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(164) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(247) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(247) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(252) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(252) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(256) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(256) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(260) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(260) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(264) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 14 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_ctr.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -ainter_asm -zpb -no vreg_twl.c
vreg_twl.c(68) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_twl.c(72) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\vreg_twl.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no adc.c
adc.c(104) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(190) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(241) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(308) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(434) : CC78K0R warning W0745: Expected function prototype
adc.c(463) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(468) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 7 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\adc.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2m -qvjl2w -ainter_asm -zpb -no renge\renge.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\renge.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no accero.c
accero.c(121) : CC78K0R warning W0745: Expected function prototype
Compilation complete, 0 error(s) and 1 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\accero.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2 -qvjl2w -ainter_asm -zpb -no self_flash.c
self_flash.c(289) : CC78K0R warning W0401: Conversion may lose significant digits
self_flash.c(290) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\self_flash.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no sw.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\sw.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no task_debug.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_debug.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no task_misc.c
task_misc.c(382) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(384) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(394) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 3 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_misc.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no task_sys.c
task_sys.c(229) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(291) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(569) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 3 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_sys.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no pedo_alg_thre_det2.c
pedo_alg_thre_det2.c(104) : CC78K0R warning W0745: Expected function prototype
pedo_alg_thre_det2.c(120) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 2 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\pedo_alg_thre_det2.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no ini_VECT.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\ini_VECT.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no task_status.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\task_status.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no led_cam.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led_cam.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no led_pow.c
led_pow.c(122) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(127) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(180) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(242) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(273) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 5 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\led_pow.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no hal.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\hal.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no batt_params.c
batt_params.c(63) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(63) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(81) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(100) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(100) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(118) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(118) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(138) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(138) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(156) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(156) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(175) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(175) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(193) : CC78K0R warning W0401: Conversion may lose significant digits
batt_params.c(193) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 15 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\batt_params.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no voltable.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\voltable.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no pedo_lpf_coeff.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\pedo_lpf_coeff.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx kanaria.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no kanaria_c.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\kanaria_c.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx get_ei.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no util_funcs.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\util_funcs.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r" -ms -rd2s2 -qvjl2w -ainter_asm -zpb -no i2c_mcu-sub.c
Compilation complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -pinter_asm -ks -kx inter_asm\i2c_mcu-sub.asm
Assembly complete, 0 error(s) and 0 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\lk78k0r.exe" -y"C:\Program Files (x86)\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\s0rm.rel" -gi1B339499E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -b"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r" -dbsr_mcu.dr -s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel task_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_ei.rel util_funcs.rel i2c_mcu-sub.rel
RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K' RA78K0R warning W3420: File 'loader.rel' already has had error(s)/warning(s) by 'CC78K'
Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\ Read Device File Directory : C:\PROGRAM FILES (X86)\NEC ELECTRONICS TOOLS\DEV\
RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K' RA78K0R warning W3420: File 'pm.rel' already has had error(s)/warning(s) by 'CC78K'
@ -223,9 +33,6 @@ Link complete, 0 error(s) and 14 warning(s) found.
Object Conversion Complete, 0 error(s) and 0 warning(s) found. Object Conversion Complete, 0 error(s) and 0 warning(s) found.
C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex C:\Windows\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex
nec_s_2_bsrbin2.rb:2: warning: variable $KCODE is no longer effective; ignored nec_s_2_bsrbin2.rb:2: warning: variable $KCODE is no longer effective; ignored
4 133
intel-HEX to bsr bin converter !E debug enable!!
file converted! Build Total error(s) : 0 Total warning(s) : 14
Build Total error(s) : 0 Total warning(s) : 84

1618
trunk/yav_mcu_bsr.prj
View File

File diff suppressed because it is too large Load Diff

19
trunk/yav_mcu_bsr.prk
View File

@ -1,18 +1,17 @@
[ProjectManager] [ProjectManager]
FrameMax=0 FrameMax=0
FrameX=140 FrameX=31
FrameY=81 FrameY=11
FrameCX=1576 FrameCX=1576
FrameCY=1127 FrameCY=1127
OpenFile1=ProjectWindow OpenFile1=i2c_mcu-sub.c,0,150,150,1381,808,0,3,0,0
OpenFile2=ProjectWindow
PrjPos=0,0,706,0,291 PrjPos=0,0,706,0,291
OpenFile2=batt_params.c,0,75,75,1306,733,37,10,77,0 OpenFile3=batt_params.c,0,75,75,1306,733,37,10,77,0
OpenFile3=pedo_lpf_coeff.c,0,100,100,1331,758,0,22,0,0 OpenFile4=i2c_twl.c,0,360,230,1591,888,0,31,0,0
OpenFile4=led_pow.c,0,125,125,1356,783,0,32,0,0 OpenFile5=OutputWindow
OpenFile5=i2c_twl.c,0,360,230,1591,888,0,31,0,0 OutputPos=0,247,897,112,1068
OpenFile6=config.h,0,156,405,1333,930,5,15,5,0 OpenFile6=config.h,0,156,405,1333,930,29,10,29,0
OpenFile7=OutputWindow
OutputPos=0,200,850,258,1214
ActivePRJ=yav_mcu_bsr.prj ActivePRJ=yav_mcu_bsr.prj
[ProjectWindow] [ProjectWindow]
ProjectWindowDispType=0 ProjectWindowDispType=0

42
trunk/yav_mcu_bsr.sdb
View File

@ -13,7 +13,7 @@ T=50aae350
9=WDT.h 9=WDT.h
10=magic.h 10=magic.h
[pm.c] [pm.c]
T=509cba41 T=50bec633
1=incs.h 1=incs.h
2=adc.h 2=adc.h
3=led.h 3=led.h
@ -25,7 +25,7 @@ T=509cba41
9=vreg_twl.h 9=vreg_twl.h
10=i2c_mcu.h 10=i2c_mcu.h
[i2c_ctr.c] [i2c_ctr.c]
T=50aae39f T=50becc7f
1=incs.h 1=incs.h
2=rtc.h 2=rtc.h
3=pedometer.h 3=pedometer.h
@ -40,7 +40,7 @@ T=505039f7
7=i2c_mcu.h 7=i2c_mcu.h
8=pool.h 8=pool.h
[magic.c] [magic.c]
T=50aae490 T=50beccce
1=magic.h 1=magic.h
2=config.h 2=config.h
[WDT.c] [WDT.c]
@ -54,21 +54,21 @@ T=5024cbbe
4=util_funcs.h 4=util_funcs.h
5=i2c_mcu_sub.h 5=i2c_mcu_sub.h
[i2c_twl.c] [i2c_twl.c]
T=50aae489 T=50becc95
1=incs_loader.h 1=incs_loader.h
2=i2c_twl_defs.h 2=i2c_twl_defs.h
3=i2c_twl.h 3=i2c_twl.h
4=vreg_twl.h 4=vreg_twl.h
5=WDT.h 5=WDT.h
[led.c] [led.c]
T=50504cbd T=50b57193
1=incs.h 1=incs.h
2=led.h 2=led.h
[rtc.c] [rtc.c]
T=4e647eec T=4e647eec
1=incs.h 1=incs.h
[vreg_ctr.c] [vreg_ctr.c]
T=507619ca T=50adcaee
1=incs.h 1=incs.h
2=vreg_ctr.h 2=vreg_ctr.h
3=rtc.h 3=rtc.h
@ -135,7 +135,7 @@ T=5004e509
6=rtc.h 6=rtc.h
7=sw.h 7=sw.h
[task_debug.c] [task_debug.c]
T=4fcdd1ab T=50ad9127
1=incs_loader.h 1=incs_loader.h
2=renge\renge.h 2=renge\renge.h
3=pm.h 3=pm.h
@ -151,7 +151,7 @@ T=4fd7f6fa
7=led.h 7=led.h
8=vreg_twl.h 8=vreg_twl.h
[task_sys.c] [task_sys.c]
T=50761442 T=50b5703a
1=incs.h 1=incs.h
2=i2c_twl.h 2=i2c_twl.h
3=i2c_ctr.h 3=i2c_ctr.h
@ -190,22 +190,22 @@ T=4e687272
2=led.h 2=led.h
3=vreg_twl.h 3=vreg_twl.h
[led_pow.c] [led_pow.c]
T=50aae477 T=50ad907d
1=incs.h 1=incs.h
2=led.h 2=led.h
3=pm.h 3=pm.h
[hal.c] [hal.c]
T=5060f66e T=50b5cb8c
1=incs_loader.h 1=incs_loader.h
[batt_params.c] [batt_params.c]
T=50aae24b T=50beaeca
1=jhl_defs.h 1=jhl_defs.h
2=batt_params.h 2=batt_params.h
[voltable.c] [voltable.c]
T=4e649285 T=4e649285
1=incs.h 1=incs.h
[pedo_lpf_coeff.c] [pedo_lpf_coeff.c]
T=50aae47c T=50ad90a1
1=incs.h 1=incs.h
[kanaria.asm] [kanaria.asm]
T=4e4226a2 T=4e4226a2
@ -219,7 +219,7 @@ T=4e68724a
1=incs_loader.h 1=incs_loader.h
2=WDT.h 2=WDT.h
[i2c_mcu-sub.c] [i2c_mcu-sub.c]
T=5024cb0a T=50bec718
1=incs.h 1=incs.h
2=i2c_mcu.h 2=i2c_mcu.h
3=loader.h 3=loader.h
@ -244,15 +244,15 @@ T=4e559884
T=4fd7f6f9 T=4fd7f6f9
1=config.h 1=config.h
[config.h] [config.h]
T=50aae350 T=50ad9062
[jhl_defs.h] [jhl_defs.h]
T=4e647343 T=4e647343
[user_define.h] [user_define.h]
T=4fd8204b T=50ad9023
[hal.h] [hal.h]
T=4e5229fb T=4e5229fb
[bsr_system.h] [bsr_system.h]
T=5004ed54 T=50beafec
[renge\renge.h] [renge\renge.h]
T=4e5e108a T=4e5e108a
1=renge\renge_defs.h 1=renge\renge_defs.h
@ -280,9 +280,9 @@ T=4e409e62
[i2c_ctr.h] [i2c_ctr.h]
T=4bf0d1e1 T=4bf0d1e1
[pm.h] [pm.h]
T=5004ed54 T=50ad8ff5
[rtc.h] [rtc.h]
T=4fd8204b T=50ad900d
[reboot.h] [reboot.h]
T=4bf0d1e1 T=4bf0d1e1
[magic.h] [magic.h]
@ -312,9 +312,9 @@ T=4df2001a
T=4dd5c8b2 T=4dd5c8b2
1=jhl_defs.h 1=jhl_defs.h
[led.h] [led.h]
T=4e530d97 T=50b5703a
[batt_params.h] [batt_params.h]
T=50aadda3 T=50bdb452
1=jhl_defs.h 1=jhl_defs.h
[pool.h] [pool.h]
T=4c072cf1 T=4c072cf1
@ -333,4 +333,4 @@ T=4e409e19
[util_funcs.h] [util_funcs.h]
T=4e687249 T=4e687249
[i2c_mcu_sub.h] [i2c_mcu_sub.h]
T=5024cbb4 T=50ad8f4e

13
trunk/覚え書き.txt
View File

@ -1,10 +1,9 @@
■2012/01/19 ■メモ、まとめ wiki に書けないことなど。■
trunk R436
　電池充電割り込み通知についてのリファクタリング（微っ妙ーに動作が変わるからリファクタリングとは呼ばないかもしれないが）、検証コストに見合わないのでR437で手動巻き戻し
●2.2C
SNAKE 対応 (試作プリライト)
■今日 ●2.2D
branch spfl_taiken_seisan SNAKE 向け system updater は mcu プロセス作成時に誤ったため、
　trunk R437からエクスポート。SPFL生産のため。 バージョン番号のみ、2.2D になっている
　#ifdef _TAIKENDAI_SEISAN_SPECIAL_ で囲い忘れていて、自動で電源が入ってしまうなど。なんかのタイミングでtrunkにマージする