diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf index 4d3d252..f0f5fe6 100644 Binary files a/trunk/VCProj/bsr_trunk.sdf and b/trunk/VCProj/bsr_trunk.sdf differ diff --git a/trunk/VCProj/bsr_trunk.suo b/trunk/VCProj/bsr_trunk.suo index 8869ca4..b303b18 100644 Binary files a/trunk/VCProj/bsr_trunk.suo and b/trunk/VCProj/bsr_trunk.suo differ diff --git a/trunk/batt_params.c b/trunk/batt_params.c index 2103980..74c2146 100644 --- a/trunk/batt_params.c +++ b/trunk/batt_params.c @@ -81,29 +81,29 @@ const bt_param_ bt_param[ _BT_PARAM_NUM_ ] = 2, { 113, (-256* 0.30), (-256* 2.25) }, 0xDAA0, - { 0xE5, 0xE7 }, + { 0xE7, 0xE5 }, }, // SNAKE ///////////////////////////////////////////// - // BT_PARAM_SNAKE_MAXELL !!! dummy !!! + // BT_PARAM_SNAKE_MAXELL { { - 0xA1, 0x20, 0xB7, 0x50, 0xB9, 0xD0, 0xBB, 0x00, - 0xBC, 0x30, 0xBC, 0x60, 0xBC, 0xA0, 0xBD, 0x10, - 0xBD, 0xC0, 0xBE, 0x70, 0xBF, 0xD0, 0xC2, 0xA0, - 0xC4, 0x00, 0xC8, 0x50, 0xCC, 0x80, 0xD0, 0xB0, - 0x01, 0xA0, 0x25, 0x10, 0x18, 0xB0, 0x17, 0xC0, - 0x95, 0x20, 0x6F, 0xE0, 0x7C, 0x60, 0x35, 0x10, - 0x35, 0x00, 0x37, 0xF0, 0x16, 0xF0, 0x1C, 0xA0, - 0x17, 0x30, 0x11, 0xD0, 0x11, 0xF0, 0x11, 0xF0 - }, + 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, - { 94, (-256* 0.35), (-256* 3.85) }, - 0xDAB0, - { 0xF5, 0xF3 } + { 86, (-256* 0.6), (-256* 3.675) }, // rcomp, r-hot, r-cold + 0xDAA0, // ocv + { 0xF5, 0xF3 } // compare max, min }, - // BT_PARAM_SNAKE_PANA + // bt_PARAM_SNAKE_PANA { { 0x9D, 0xA0, 0xA8, 0xF0, 0xAD, 0x90, 0xAF, 0x00, @@ -118,7 +118,7 @@ const bt_param_ bt_param[ _BT_PARAM_NUM_ ] = 2, { 106, (-256* 0.925), (-256* 2.3) }, 0xDA30, // = 55856 - { 0xE7, 0xE9 }, + { 0xE9, 0xE7 }, } }; diff --git a/trunk/bsr.hex b/trunk/bsr.hex index 38645da..0d66dd4 100644 --- a/trunk/bsr.hex +++ b/trunk/bsr.hex @@ -246,8 +246,8 @@ :100F4C009DDAADDC5BD9085BD808BDD8D7C3C7F335 :100F5C00728EFDC162314C4100363E4E1161A07261 :070F6C00C09EFD62C6C2D762 -:0A0FF60031363A34393A3032000047 -:0A20000031363A34393A303200002C +:0A0FF60030393A31363A3237000044 +:0A20000030393A31363A3237000029 :10200A0005214F7B9EC5E9000104080D12171C1F0C :10201A00080100001F003B005A0078009700B50035 :10202A00D400F300110130014E01192634445362E1 @@ -276,12 +276,12 @@ :10219A00C2A0C400C850CC80D0B001A0251018B08D :1021AA0017C095206FE07C603510350037F016F0C7 :1021BA001CA0173011D011F011F002005E00A7FF29 -:1021CA0027FCB0DAF5F39CF0AD50AFB0B300B3E042 -:1021DA00B560B670B7A0BA00BC00BE90C160C400BA -:1021EA00C700CCA0D0A00200191012004810251078 -:1021FA0041F02FA013F01CD010D00FA0110010E056 -:10220A000C100C000C0002007100B4FFC0FDA0DA33 -:10221A00E5E77F7E7D7C7A7978777675747271705E +:1021CA0027FCB0DAF5F39DA0A8F0AD90AF00B300FC +:1021DA00B3E0B4A0B540B630B7E0B8C0BE70C140F5 +:1021EA00C420C9A0D030011006002C200DA0370051 +:1021FA00373047F028F025F0373010F014F00F7020 +:10220A000D000D000D0002006A0014FFB4FD30DA63 +:10221A00E7E97F7E7D7C7A7978777675747271705A :10222A006F6E6D6C6A6968676665646261605F5E3D :10223A005D5C5A5958575655535251504F4E4D4B53 :10224A004A494948474645434241403F3E3D3B3A59 @@ -514,7 +514,7 @@ :10306C00A792DFF9710B9E31449813714398717BD1 :10307C009E8FDCFB9E9A8FDDFB9E9B717A9EC6D742 :10308C00CFA7FB5CCFA8FB5FCFC8FB5DCFFCFB36AB -:10309C00CFFDFBC9D7C7CFA4FB12CFA5FB28CFCC44 +:10309C00CFFDFBC9D7C7CFA4FB12CFA5FB29CFCC43 :1030AC00FBFFF5CDFBF5CEFBF5CFFBF5D0FB5600CA :1030BC00664C64DE08723826FB0086EFF3F5E3FB02 :1030CC00710A20711A20710203C6D7C78806161719 @@ -999,7 +999,7 @@ :104EA200317503F7332312D714AEF8C716AC0612C6 :104EB200C5AC0416F643DD078B99A7A5B3EFF5C27F :024EC200C6D751 -:024FF400325831 -:0A4FF60031363A34393A3032000007 +:024FF400325930 +:0A4FF60030393A31363A3237000004 :00000001FF  \ No newline at end of file diff --git a/trunk/bsr.lmf b/trunk/bsr.lmf index 2e76835..130e128 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 621d7ab..0a46013 100644 --- a/trunk/bsr_k0r.map +++ b/trunk/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:13 Sep 2012 Page: 1 +78K0R Linker W1.33 Date:25 Sep 2012 Page: 1 Command: -yC:\Program Files (x86)\NEC Electronics Tools\DEV -_msgoff - obsr.lmf ..\..\..\Program Files (x86)\NEC Electronics Tools\C diff --git a/trunk/config.h b/trunk/config.h index a06eb9a..bbbf6fc 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -7,7 +7,7 @@ */ #define MCU_VER_MAJOR 0x02 -#define MCU_VER_MINOR 0x29 +#define MCU_VER_MINOR 0x2A // デバッグ向けスイッチ diff --git a/trunk/pm.c b/trunk/pm.c index cca7126..c839cf0 100644 --- a/trunk/pm.c +++ b/trunk/pm.c @@ -562,7 +562,8 @@ static void BT_mgic_init() wait_ms( 150 + 15 ); // 9. SOCを読む。ベリファイのため。 - { u8 temp; + { + u8 temp; temp = iic_mcu_read_a_byte( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_SOC ); if(( p_bt_param->verify.low <= temp ) && ( temp <= p_bt_param->verify.hi )) diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index a8906a2..e456f86 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -147,11 +147,11 @@ 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 -sainter_asm -zpb -no led_pow.c -led_pow.c(119) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(124) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(177) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(239) : CC78K0R warning W0401: Conversion may lose significant digits -led_pow.c(270) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(120) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(125) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(178) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(240) : CC78K0R warning W0401: Conversion may lose significant digits +led_pow.c(271) : 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. @@ -159,6 +159,17 @@ Assembly 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\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 -sainter_asm -zpb -no batt_params.c +batt_params.c(64) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(64) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(82) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(101) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(101) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(119) : CC78K0R warning W0401: Conversion may lose significant digits +batt_params.c(119) : 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\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 -sainter_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 @@ -206,4 +217,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 71 +Build Total error(s) : 0 Total warning(s) : 78 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index ffc60ff..b98c4db 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -11,7 +11,7 @@ OpenFile3=i2c_ctr.c,0,655,120,1628,751,14,7,14,0 OpenFile4=i2c_mcu_sub.h,0,125,125,1302,650,0,5,6,0 OpenFile5=bsr_k0r.map,0,150,150,1327,675,36,262,36,0 OpenFile6=pm.c,0,175,175,1352,700,62,157,25,0 -OpenFile7=config.h,0,216,85,1393,610,29,10,29,0 +OpenFile7=config.h,0,216,85,1393,610,0,11,0,0 OpenFile8=OutputWindow OutputPos=0,200,778,258,926 ActivePRJ=yav_mcu_bsr.prj diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index b060dca..b173753 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -40,7 +40,7 @@ T=505039f7 7=i2c_mcu.h 8=pool.h [magic.c] -T=50518f69 +T=50518fec 1=magic.h 2=config.h [WDT.c] @@ -190,15 +190,15 @@ T=4e687272 2=led.h 3=vreg_twl.h [led_pow.c] -T=50504cbd +T=5060f6f5 1=incs.h 2=led.h 3=pm.h [hal.c] -T=50518746 +T=5060f66e 1=incs_loader.h [batt_params.c] -T=5017927d +T=5060f648 1=jhl_defs.h 2=batt_params.h [voltable.c] @@ -227,7 +227,7 @@ T=5024cb0a 5=i2c_mcu_sub.h 6=pm.h [incs_loader.h] -T=50518ef9 +T=5060f6cf 1=sim\simOnWin.h 2=jhl_defs.h 3=config.h @@ -244,7 +244,7 @@ T=4e559884 T=4fd7f6f9 1=config.h [config.h] -T=50518feb +T=5060f61e [jhl_defs.h] T=4e647343 [user_define.h]