From 6bf985c25532af59661ce2ea06319397850f286d Mon Sep 17 00:00:00 2001 From: n2232 Date: Wed, 3 Oct 2012 08:12:36 +0000 Subject: [PATCH] =?UTF-8?q?2.2A=20SNAKE=20=EF=BC=92=E7=A4=BE=E7=9B=AE?= =?UTF-8?q?=E3=81=AE=E3=83=90=E3=83=83=E3=83=86=E3=83=AA=E3=83=91=E3=83=A9?= =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=82=BF=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@472 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/VCProj/bsr_trunk.sdf | Bin 2248704 -> 2248704 bytes trunk/VCProj/bsr_trunk.suo | Bin 75264 -> 72192 bytes trunk/batt_params.c | 32 ++++++++++++++++---------------- trunk/bsr.hex | 22 +++++++++++----------- trunk/bsr.lmf | Bin 180388 -> 180388 bytes trunk/bsr_k0r.map | 2 +- trunk/config.h | 2 +- trunk/pm.c | 3 ++- trunk/yav_mcu_bsr.plg | 23 +++++++++++++++++------ trunk/yav_mcu_bsr.prk | 2 +- trunk/yav_mcu_bsr.sdb | 12 ++++++------ 11 files changed, 55 insertions(+), 43 deletions(-) diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf index 4d3d2520e57f284bfa77bceb1ed22cab8742b9a5..f0f5fe6dc82371819c94b31f9d868515d441a65d 100644 GIT binary patch delta 6095 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 Tp%iZ@)f-ClhOEJmt?7RO1plwJ diff --git a/trunk/VCProj/bsr_trunk.suo b/trunk/VCProj/bsr_trunk.suo index 8869ca4e8610a18a8b84796aa94e5c628110ce0f..b303b1835e09ca1f6c32d5f2046db337f7a42faa 100644 GIT binary patch delta 1252 zcmZ9LacmP+9LMi>@7=Xq%i1|sTsP*@K}OtkE1Jm?HH8sEO5|EZCHyf`W)uiUWG`XF z#jQpX4b7DPnw?QMTnS2u&e1nJ5XF4c5p1qsa2ZdSW*H{K%A9+&(Oi~dR!YOK@W}bVPVRN8I)T;RbyBQOfYw6Z8rLiBT7%zdNra6%y@4VBssB#Z zAxJ*9>}&jxLF!bpUQS2+53N!jr|e?orP}sWEh>0UC2M5+o;no*<&|RZ01GaV_Z4bu zkZ{IXtx-1ioDJ*HO@%7UX1jm42llyB6hk)`n@e-XKc=-f@Y<%q2^xGtOcED}0wIYh z;!~nXOcNK0OT=fyW#V(<3*rj#C1DX?5m$*B;%nj>F-v?yl!)uZw}jL5QsCf;E_wJw z&Re(=QDx+!4YkezFg z4HGT&y*JR}q`Pw|CVvDt;7(B#657*bh?f<+VCc#rl8%%mA?X_Rko2T0`Tn5UF@gfq z*B-&)@zpXuR%F?9L`E)-!zy@=QstdFm&CqgkgTti#pQ&m?IHDGxwvz5eFO!Lw?$>g z2e&~sS-(O4BNgMhN_;}xBO9hT$EH#ON1><*7J8#T;Ql z!h1hJ;Z}^9e>3P;`;M7O4{XcMm2i8YP1XjK10W(_Bu(GG-JYWj?wF+CVppRj{k@i>2chZzp!-!sb9NY>=CNFX^T?0HqpO@8}9hNYy14(^aRKU|GWjb z?s(8#6N28AZN|*MnxK+}t@UOw1c&ZQJEhImwcyu$R3FUFW_U4wTQ|=(Lk2g#+9}oH z1;E(Pmb7v)Kx^K@g!f?_84F>2q_gmEtgfO`ne`|NSC%&vnzm};bp}57I89LphI2ap L^R&D4(pLWmNY{qt*ghhiLRHGOv%(*Papl%BRol3TsIpg9A z4n<)DdI--O6KqHy|`x=ke@FelD@a_s8Y6^ALCyoft_h@&o z5{?pXlPxI)SfJyaPv(lKPH{n;JG|2dJ=PS}#F7k8k>W9nVrs7_h(-xKa;yOl_YaKr zgxUW7F?;GXpBfQU6FlmJTXB5G%UY&pA^moYmpZ6I=W2zMLqcjsOr=CjZ3?sSTozbx z@_QjQ&!;am^D^fqdHbq-`YQmznxdL+lVlRK6qsC^n({1Bdkd7xs3~H^ah=$g2o!8( zp;~0Yi)ZOIcBYuOWPY#E)}QJ*roh%yOR%$q)3Bvybo^p`S2Fc%ASDVSw-!p^Gp?Fply#{hlBU z6GjN5gxd_>y#(nmqeAkup1j~k|J5nzvi8VwR}}&Kw0buC$LEm#Mwc-?*o5IlA8uH7 zVw1g`MVED%=@U_~`hhJ|hj9DGwRi00KJ5P5HGi!Cemqxse#g4s#_79pv*^z{U{hZm zyFTRwbZ)B06Pa>snK^`sY>0)j*Cb39HK2dE7+beF@ddxkDn9;+$Dlie*~L<7WE-t@ zOUF*XW`yQ)LxZQ? zoaCST=((N{)2d71In4%er}mK-ysnjk$fpOXM7cJ+20As>4tE)Xpu%wyNgRe3wFtm7 z+Cw(jVw$_iU`9}Xp2o#_GY@R{s(pc0Cb723jhEB 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 2e76835acaf20f0c527de8293ec74410bad7e8b5..130e128c569ba9f6e5b2748ff09554f7d30e9bbc 100644 GIT binary patch delta 193 zcmZ3|$i1YIo83duli}(2gpKU3@*)P7R)%I)M&=Aa0Ap`XkUz!fGk3v?4{Il^XV}cJ z`N5V2TOGC;Y=5xhz`lZm4o4JDF1TR8D8R;`qrkhsoWb0{{e#8_)eq(d0v|*^@E7nh zfFKh?7K6zDEq@JeJ%72mOtGJjQFAk!fwCNTB*La<6Tj^yevBo*7?ZcJ^kCY~$hd5J fq8HO~#=YA$y_wP(8J}#Q=mQew*zW1a6kP-W-h4wO delta 120 zcmZ3|$i1YIo83duli_=R;6`>=c@aZ1D-%mA10x0?fU!3x$e&`IJW0W4bD3g4AEU-* zHUnij?g)f}W)r{dCVq@1zZjFYuk>Kr&d9iQdZHK8amGE{HNBbA85tjMpXdV;X5a4V I#}r)z0OfKc1^@s6 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]