2.36。 >MAX17048 の I2C に対応(R/W ともに 2B 単位)。即本流に取り込まれるので trunk で作業する。

バッテリパラメータも対応、他不備修正。

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@604 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2014-01-31 05:37:16 +00:00
parent 47607dc492
commit 5df9b5427d
9 changed files with 994 additions and 982 deletions

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,9 @@
#ifndef _bt_params_h_ #ifndef _bt_params_h_
#define _bt_params_h_ #define _bt_params_h_
// $Id: asdf$ /*
$Id: asdf$
*/
#include "jhl_defs.h" #include "jhl_defs.h"
/* /*
@ -16,6 +18,10 @@
*/ */
#define BATT_PARAM_SIZE 64
typedef enum typedef enum
{ {
BT_PARAM_CTR_MAXELL = 0, BT_PARAM_CTR_MAXELL = 0,
@ -45,7 +51,7 @@ typedef struct
typedef struct typedef struct
{ {
u8 mg_param[64]; u8 mg_param[BATT_PARAM_SIZE];
u8 v_scale; u8 v_scale;
rcomp_ rcomp; rcomp_ rcomp;
u16 ocv; u16 ocv;

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -26,8 +26,8 @@ Direc-file:bsr_mcu.dr
*** Link information *** *** Link information ***
73 output segment(s) 73 output segment(s)
3EB1H byte(s) real data 3E91H byte(s) real data
6438 symbol(s) defined 6420 symbol(s) defined
*** Memory map *** *** Memory map ***
@ -258,298 +258,298 @@ Direc-file:bsr_mcu.dr
0228CH 00000H 0228CH 00000H
@@CNST i2c_mcu-sub @@CNST i2c_mcu-sub
0228CH 00000H 0228CH 00000H
ROM_CODE 0228CH 02636H CSEG ROM_CODE 0228CH 02616H CSEG
ROM_CODE pm 0228CH 00A69H ROM_CODE pm 0228CH 00A49H
ROM_CODE i2c_ctr 02CF5H 0005CH ROM_CODE i2c_ctr 02CD5H 0005CH
ROM_CODE main 02D51H 00055H ROM_CODE main 02D31H 00055H
ROM_CODE led 02DA6H 00284H ROM_CODE led 02D86H 00284H
ROM_CODE rtc 0302AH 000E0H ROM_CODE rtc 0300AH 000E0H
ROM_CODE vreg_ctr 0310AH 0049EH ROM_CODE vreg_ctr 030EAH 0049EH
ROM_CODE vreg_twl 035A8H 000F9H ROM_CODE vreg_twl 03588H 000F9H
ROM_CODE adc 036A1H 00261H ROM_CODE adc 03681H 00261H
ROM_CODE renge 03902H 00018H ROM_CODE renge 038E2H 00018H
ROM_CODE accero 0391AH 00155H ROM_CODE accero 038FAH 00155H
ROM_CODE sw 03A6FH 00131H ROM_CODE sw 03A4FH 00131H
ROM_CODE task_misc ROM_CODE task_misc
03BA0H 001C9H 03B80H 001C9H
ROM_CODE task_sys 03D69H 0038AH ROM_CODE task_sys 03D49H 0038AH
ROM_CODE pedo_alg_thre_det2 ROM_CODE pedo_alg_thre_det2
040F3H 004D4H 040D3H 004D4H
ROM_CODE led_cam 045C7H 000C4H ROM_CODE led_cam 045A7H 000C4H
ROM_CODE led_pow 0468BH 0016FH ROM_CODE led_pow 0466BH 0016FH
ROM_CODE voltable 047FAH 00000H ROM_CODE voltable 047DAH 00000H
ROM_CODE pedo_lpf_coeff ROM_CODE pedo_lpf_coeff
047FAH 00000H 047DAH 00000H
ROM_CODE kanaria_c ROM_CODE kanaria_c
047FAH 00006H 047DAH 00006H
ROM_CODE get_ei 04800H 0000DH ROM_CODE get_ei 047E0H 0000DH
ROM_CODE i2c_mcu-sub ROM_CODE i2c_mcu-sub
0480DH 000B5H 047EDH 000B5H
@@BASE 048C2H 00614H CSEG BASE @@BASE 048A2H 00614H CSEG BASE
@@BASE loader 048C2H 00000H @@BASE loader 048A2H 00000H
@@BASE pm 048C2H 0003EH @@BASE pm 048A2H 0003EH
@@BASE i2c_ctr 04900H 00170H @@BASE i2c_ctr 048E0H 00170H
@@BASE main 04A70H 00000H @@BASE main 04A50H 00000H
@@BASE magic 04A70H 00000H @@BASE magic 04A50H 00000H
@@BASE WDT 04A70H 00000H @@BASE WDT 04A50H 00000H
@@BASE i2c_mcu 04A70H 000F2H @@BASE i2c_mcu 04A50H 000F2H
@@BASE i2c_twl 04B62H 000D0H @@BASE i2c_twl 04B42H 000D0H
@@BASE led 04C32H 00000H @@BASE led 04C12H 00000H
@@BASE rtc 04C32H 0005DH @@BASE rtc 04C12H 0005DH
@@BASE vreg_ctr 04C8FH 00000H @@BASE vreg_ctr 04C6FH 00000H
@@BASE vreg_twl 04C8FH 00000H @@BASE vreg_twl 04C6FH 00000H
@@BASE adc 04C8FH 00094H @@BASE adc 04C6FH 00094H
@@BASE renge 04D23H 0016BH @@BASE renge 04D03H 0016BH
@@BASE accero 04E8EH 00042H @@BASE accero 04E6EH 00042H
@@BASE self_flash @@BASE self_flash
04ED0H 00000H 04EB0H 00000H
@@BASE sw 04ED0H 00000H @@BASE sw 04EB0H 00000H
@@BASE task_debug @@BASE task_debug
04ED0H 00000H 04EB0H 00000H
@@BASE task_misc @@BASE task_misc
04ED0H 00000H 04EB0H 00000H
@@BASE task_sys 04ED0H 00000H @@BASE task_sys 04EB0H 00000H
@@BASE pedo_alg_thre_det2 @@BASE pedo_alg_thre_det2
04ED0H 00000H 04EB0H 00000H
@@BASE ini_VECT 04ED0H 00006H @@BASE ini_VECT 04EB0H 00006H
@@BASE task_status @@BASE task_status
04ED6H 00000H 04EB6H 00000H
@@BASE led_cam 04ED6H 00000H @@BASE led_cam 04EB6H 00000H
@@BASE led_pow 04ED6H 00000H @@BASE led_pow 04EB6H 00000H
@@BASE hal 04ED6H 00000H @@BASE hal 04EB6H 00000H
@@BASE batt_params @@BASE batt_params
04ED6H 00000H 04EB6H 00000H
@@BASE voltable 04ED6H 00000H @@BASE voltable 04EB6H 00000H
@@BASE pedo_lpf_coeff @@BASE pedo_lpf_coeff
04ED6H 00000H 04EB6H 00000H
@@BASE kanaria_c @@BASE kanaria_c
04ED6H 00000H 04EB6H 00000H
@@BASE util_funcs @@BASE util_funcs
04ED6H 00000H 04EB6H 00000H
@@BASE i2c_mcu-sub @@BASE i2c_mcu-sub
04ED6H 00000H 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL @cstart 04ED6H 00000H @@CNSTL @cstart 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL pm 04ED6H 00000H @@CNSTL pm 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL i2c_ctr 04ED6H 00000H @@CNSTL i2c_ctr 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL main 04ED6H 00000H @@CNSTL main 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL led 04ED6H 00000H @@CNSTL led 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL rtc 04ED6H 00000H @@CNSTL rtc 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL vreg_ctr 04ED6H 00000H @@CNSTL vreg_ctr 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL vreg_twl 04ED6H 00000H @@CNSTL vreg_twl 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL adc 04ED6H 00000H @@CNSTL adc 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL renge 04ED6H 00000H @@CNSTL renge 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL accero 04ED6H 00000H @@CNSTL accero 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL sw 04ED6H 00000H @@CNSTL sw 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL task_misc @@CNSTL task_misc
04ED6H 00000H 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL task_sys 04ED6H 00000H @@CNSTL task_sys 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL pedo_alg_thre_det2 @@CNSTL pedo_alg_thre_det2
04ED6H 00000H 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL ini_VECT 04ED6H 00000H @@CNSTL ini_VECT 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL led_cam 04ED6H 00000H @@CNSTL led_cam 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL led_pow 04ED6H 00000H @@CNSTL led_pow 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL batt_params @@CNSTL batt_params
04ED6H 00000H 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL voltable 04ED6H 00000H @@CNSTL voltable 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL pedo_lpf_coeff @@CNSTL pedo_lpf_coeff
04ED6H 00000H 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL kanaria_c @@CNSTL kanaria_c
04ED6H 00000H 04EB6H 00000H
@@CNSTL 04ED6H 00000H CSEG PAGE64KP @@CNSTL 04EB6H 00000H CSEG PAGE64KP
@@CNSTL i2c_mcu-sub @@CNSTL i2c_mcu-sub
04ED6H 00000H 04EB6H 00000H
@@CNSTL 04ED6H 0000AH CSEG PAGE64KP @@CNSTL 04EB6H 0000AH CSEG PAGE64KP
@@CNSTL @bcdtob 04ED6H 0000AH @@CNSTL @bcdtob 04EB6H 0000AH
@@R_INIT 04EE0H 0004AH CSEG UNIT64KP @@R_INIT 04EC0H 0004AH CSEG UNIT64KP
@@R_INIT @cstart 04EE0H 00000H @@R_INIT @cstart 04EC0H 00000H
@@R_INIT loader 04EE0H 00000H @@R_INIT loader 04EC0H 00000H
@@R_INIT pm 04EE0H 00000H @@R_INIT pm 04EC0H 00000H
@@R_INIT i2c_ctr 04EE0H 00000H @@R_INIT i2c_ctr 04EC0H 00000H
@@R_INIT main 04EE0H 00000H @@R_INIT main 04EC0H 00000H
@@R_INIT magic 04EE0H 00000H @@R_INIT magic 04EC0H 00000H
@@R_INIT WDT 04EE0H 00000H @@R_INIT WDT 04EC0H 00000H
@@R_INIT i2c_mcu 04EE0H 00000H @@R_INIT i2c_mcu 04EC0H 00000H
@@R_INIT i2c_twl 04EE0H 00000H @@R_INIT i2c_twl 04EC0H 00000H
@@R_INIT led 04EE0H 00000H @@R_INIT led 04EC0H 00000H
@@R_INIT rtc 04EE0H 00000H @@R_INIT rtc 04EC0H 00000H
@@R_INIT vreg_ctr 04EE0H 00000H @@R_INIT vreg_ctr 04EC0H 00000H
@@R_INIT vreg_twl 04EE0H 00000H @@R_INIT vreg_twl 04EC0H 00000H
@@R_INIT adc 04EE0H 0000CH @@R_INIT adc 04EC0H 0000CH
@@R_INIT renge 04EECH 00014H @@R_INIT renge 04ECCH 00014H
@@R_INIT accero 04F00H 00000H @@R_INIT accero 04EE0H 00000H
@@R_INIT self_flash @@R_INIT self_flash
04F00H 00000H 04EE0H 00000H
@@R_INIT sw 04F00H 00000H @@R_INIT sw 04EE0H 00000H
@@R_INIT task_debug @@R_INIT task_debug
04F00H 00000H 04EE0H 00000H
@@R_INIT task_misc @@R_INIT task_misc
04F00H 00026H 04EE0H 00026H
@@R_INIT task_sys 04F26H 00000H @@R_INIT task_sys 04F06H 00000H
@@R_INIT pedo_alg_thre_det2 @@R_INIT pedo_alg_thre_det2
04F26H 00000H 04F06H 00000H
@@R_INIT ini_VECT 04F26H 00000H @@R_INIT ini_VECT 04F06H 00000H
@@R_INIT task_status @@R_INIT task_status
04F26H 00000H 04F06H 00000H
@@R_INIT led_cam 04F26H 00000H @@R_INIT led_cam 04F06H 00000H
@@R_INIT led_pow 04F26H 00004H @@R_INIT led_pow 04F06H 00004H
@@R_INIT hal 04F2AH 00000H @@R_INIT hal 04F0AH 00000H
@@R_INIT batt_params @@R_INIT batt_params
04F2AH 00000H 04F0AH 00000H
@@R_INIT voltable 04F2AH 00000H @@R_INIT voltable 04F0AH 00000H
@@R_INIT pedo_lpf_coeff @@R_INIT pedo_lpf_coeff
04F2AH 00000H 04F0AH 00000H
@@R_INIT kanaria_c @@R_INIT kanaria_c
04F2AH 00000H 04F0AH 00000H
@@R_INIT util_funcs @@R_INIT util_funcs
04F2AH 00000H 04F0AH 00000H
@@R_INIT i2c_mcu-sub @@R_INIT i2c_mcu-sub
04F2AH 00000H 04F0AH 00000H
@@R_INIT @rom 04F2AH 00000H @@R_INIT @rom 04F0AH 00000H
@@R_INIS 04F2AH 00010H CSEG UNIT64KP @@R_INIS 04F0AH 00010H CSEG UNIT64KP
@@R_INIS @cstart 04F2AH 00000H @@R_INIS @cstart 04F0AH 00000H
@@R_INIS loader 04F2AH 00000H @@R_INIS loader 04F0AH 00000H
@@R_INIS pm 04F2AH 00002H @@R_INIS pm 04F0AH 00002H
@@R_INIS i2c_ctr 04F2CH 00002H @@R_INIS i2c_ctr 04F0CH 00002H
@@R_INIS main 04F2EH 00000H @@R_INIS main 04F0EH 00000H
@@R_INIS magic 04F2EH 00000H @@R_INIS magic 04F0EH 00000H
@@R_INIS WDT 04F2EH 00000H @@R_INIS WDT 04F0EH 00000H
@@R_INIS i2c_mcu 04F2EH 00000H @@R_INIS i2c_mcu 04F0EH 00000H
@@R_INIS i2c_twl 04F2EH 00000H @@R_INIS i2c_twl 04F0EH 00000H
@@R_INIS led 04F2EH 00000H @@R_INIS led 04F0EH 00000H
@@R_INIS rtc 04F2EH 00000H @@R_INIS rtc 04F0EH 00000H
@@R_INIS vreg_ctr 04F2EH 00000H @@R_INIS vreg_ctr 04F0EH 00000H
@@R_INIS vreg_twl 04F2EH 00000H @@R_INIS vreg_twl 04F0EH 00000H
@@R_INIS adc 04F2EH 00000H @@R_INIS adc 04F0EH 00000H
@@R_INIS renge 04F2EH 00000H @@R_INIS renge 04F0EH 00000H
@@R_INIS accero 04F2EH 00000H @@R_INIS accero 04F0EH 00000H
@@R_INIS self_flash @@R_INIS self_flash
04F2EH 00000H 04F0EH 00000H
@@R_INIS sw 04F2EH 00000H @@R_INIS sw 04F0EH 00000H
@@R_INIS task_debug @@R_INIS task_debug
04F2EH 00000H 04F0EH 00000H
@@R_INIS task_misc @@R_INIS task_misc
04F2EH 00000H 04F0EH 00000H
@@R_INIS task_sys 04F2EH 00002H @@R_INIS task_sys 04F0EH 00002H
@@R_INIS pedo_alg_thre_det2 @@R_INIS pedo_alg_thre_det2
04F30H 00006H 04F10H 00006H
@@R_INIS ini_VECT 04F36H 00000H @@R_INIS ini_VECT 04F16H 00000H
@@R_INIS task_status @@R_INIS task_status
04F36H 00000H 04F16H 00000H
@@R_INIS led_cam 04F36H 00002H @@R_INIS led_cam 04F16H 00002H
@@R_INIS led_pow 04F38H 00002H @@R_INIS led_pow 04F18H 00002H
@@R_INIS hal 04F3AH 00000H @@R_INIS hal 04F1AH 00000H
@@R_INIS batt_params @@R_INIS batt_params
04F3AH 00000H 04F1AH 00000H
@@R_INIS voltable 04F3AH 00000H @@R_INIS voltable 04F1AH 00000H
@@R_INIS pedo_lpf_coeff @@R_INIS pedo_lpf_coeff
04F3AH 00000H 04F1AH 00000H
@@R_INIS kanaria_c @@R_INIS kanaria_c
04F3AH 00000H 04F1AH 00000H
@@R_INIS util_funcs @@R_INIS util_funcs
04F3AH 00000H 04F1AH 00000H
@@R_INIS i2c_mcu-sub @@R_INIS i2c_mcu-sub
04F3AH 00000H 04F1AH 00000H
@@R_INIS @rom 04F3AH 00000H @@R_INIS @rom 04F1AH 00000H
@@RLINIT 04F3AH 00000H CSEG UNIT64KP @@RLINIT 04F1AH 00000H CSEG UNIT64KP
@@RLINIT loader 04F3AH 00000H @@RLINIT loader 04F1AH 00000H
@@RLINIT pm 04F3AH 00000H @@RLINIT pm 04F1AH 00000H
@@RLINIT i2c_ctr 04F3AH 00000H @@RLINIT i2c_ctr 04F1AH 00000H
@@RLINIT main 04F3AH 00000H @@RLINIT main 04F1AH 00000H
@@RLINIT magic 04F3AH 00000H @@RLINIT magic 04F1AH 00000H
@@RLINIT WDT 04F3AH 00000H @@RLINIT WDT 04F1AH 00000H
@@RLINIT i2c_mcu 04F3AH 00000H @@RLINIT i2c_mcu 04F1AH 00000H
@@RLINIT i2c_twl 04F3AH 00000H @@RLINIT i2c_twl 04F1AH 00000H
@@RLINIT led 04F3AH 00000H @@RLINIT led 04F1AH 00000H
@@RLINIT rtc 04F3AH 00000H @@RLINIT rtc 04F1AH 00000H
@@RLINIT vreg_ctr 04F3AH 00000H @@RLINIT vreg_ctr 04F1AH 00000H
@@RLINIT vreg_twl 04F3AH 00000H @@RLINIT vreg_twl 04F1AH 00000H
@@RLINIT adc 04F3AH 00000H @@RLINIT adc 04F1AH 00000H
@@RLINIT renge 04F3AH 00000H @@RLINIT renge 04F1AH 00000H
@@RLINIT accero 04F3AH 00000H @@RLINIT accero 04F1AH 00000H
@@RLINIT self_flash @@RLINIT self_flash
04F3AH 00000H 04F1AH 00000H
@@RLINIT sw 04F3AH 00000H @@RLINIT sw 04F1AH 00000H
@@RLINIT task_debug @@RLINIT task_debug
04F3AH 00000H 04F1AH 00000H
@@RLINIT task_misc @@RLINIT task_misc
04F3AH 00000H 04F1AH 00000H
@@RLINIT task_sys 04F3AH 00000H @@RLINIT task_sys 04F1AH 00000H
@@RLINIT pedo_alg_thre_det2 @@RLINIT pedo_alg_thre_det2
04F3AH 00000H 04F1AH 00000H
@@RLINIT ini_VECT 04F3AH 00000H @@RLINIT ini_VECT 04F1AH 00000H
@@RLINIT task_status @@RLINIT task_status
04F3AH 00000H 04F1AH 00000H
@@RLINIT led_cam 04F3AH 00000H @@RLINIT led_cam 04F1AH 00000H
@@RLINIT led_pow 04F3AH 00000H @@RLINIT led_pow 04F1AH 00000H
@@RLINIT hal 04F3AH 00000H @@RLINIT hal 04F1AH 00000H
@@RLINIT batt_params @@RLINIT batt_params
04F3AH 00000H 04F1AH 00000H
@@RLINIT voltable 04F3AH 00000H @@RLINIT voltable 04F1AH 00000H
@@RLINIT pedo_lpf_coeff @@RLINIT pedo_lpf_coeff
04F3AH 00000H 04F1AH 00000H
@@RLINIT kanaria_c @@RLINIT kanaria_c
04F3AH 00000H 04F1AH 00000H
@@RLINIT util_funcs @@RLINIT util_funcs
04F3AH 00000H 04F1AH 00000H
@@RLINIT i2c_mcu-sub @@RLINIT i2c_mcu-sub
04F3AH 00000H 04F1AH 00000H
@@RLINIT @rom 04F3AH 00000H @@RLINIT @rom 04F1AH 00000H
@@CODEL 04F3AH 00000H CSEG @@CODEL 04F1AH 00000H CSEG
@@CODEL pm 04F3AH 00000H @@CODEL pm 04F1AH 00000H
@@CODEL i2c_ctr 04F3AH 00000H @@CODEL i2c_ctr 04F1AH 00000H
@@CODEL main 04F3AH 00000H @@CODEL main 04F1AH 00000H
@@CODEL magic 04F3AH 00000H @@CODEL magic 04F1AH 00000H
@@CODEL led 04F3AH 00000H @@CODEL led 04F1AH 00000H
@@CODEL rtc 04F3AH 00000H @@CODEL rtc 04F1AH 00000H
@@CODEL vreg_ctr 04F3AH 00000H @@CODEL vreg_ctr 04F1AH 00000H
@@CODEL vreg_twl 04F3AH 00000H @@CODEL vreg_twl 04F1AH 00000H
@@CODEL adc 04F3AH 00000H @@CODEL adc 04F1AH 00000H
@@CODEL renge 04F3AH 00000H @@CODEL renge 04F1AH 00000H
@@CODEL accero 04F3AH 00000H @@CODEL accero 04F1AH 00000H
@@CODEL sw 04F3AH 00000H @@CODEL sw 04F1AH 00000H
@@CODEL task_misc @@CODEL task_misc
04F3AH 00000H 04F1AH 00000H
@@CODEL task_sys 04F3AH 00000H @@CODEL task_sys 04F1AH 00000H
@@CODEL pedo_alg_thre_det2 @@CODEL pedo_alg_thre_det2
04F3AH 00000H 04F1AH 00000H
@@CODEL ini_VECT 04F3AH 00000H @@CODEL ini_VECT 04F1AH 00000H
@@CODEL led_cam 04F3AH 00000H @@CODEL led_cam 04F1AH 00000H
@@CODEL led_pow 04F3AH 00000H @@CODEL led_pow 04F1AH 00000H
@@CODEL batt_params @@CODEL batt_params
04F3AH 00000H 04F1AH 00000H
@@CODEL voltable 04F3AH 00000H @@CODEL voltable 04F1AH 00000H
@@CODEL pedo_lpf_coeff @@CODEL pedo_lpf_coeff
04F3AH 00000H 04F1AH 00000H
@@CODEL kanaria_c @@CODEL kanaria_c
04F3AH 00000H 04F1AH 00000H
@@CODEL i2c_mcu-sub @@CODEL i2c_mcu-sub
04F3AH 00000H 04F1AH 00000H
@@LCODEL 04F3AH 00022H CSEG @@LCODEL 04F1AH 00022H CSEG
@@LCODEL abs 04F3AH 00008H @@LCODEL abs 04F1AH 00008H
@@LCODEL memcpy_n 04F42H 0001AH @@LCODEL memcpy_n 04F22H 0001AH
* gap * 04F5CH 00098H * gap * 04F3CH 000B8H
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

Binary file not shown.

View File

@ -536,11 +536,11 @@ static void BT_mgic_init()
{ {
u8 loop; u8 loop;
// 16バイトごとに区切れとのこと イズ対策とか言うんだけど、意味あるんか // -16バイトごとに区切れとのこと イズ対策とか言うんだけど、意味あるんか-
for( loop = 0; loop < 4; loop ++ ) // 2バイト単位で送れとのこと。
for( loop = 0; loop < BATT_PARAM_SIZE; loop +=2 )
{ {
iic_mcu_set_wo_dma( ); send_cmd_mgic_2B( BT_GAUGE_REG_BT_PARAM + loop, p_bt_param->mg_param + loop );
iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_BT_PARAM + loop*16, 16, p_bt_param->mg_param + loop*16 );
} }
} }
@ -549,14 +549,11 @@ static void BT_mgic_init()
// 基本使わないが、不意に書き換わってしまったときのため、規定値を書く。 // 基本使わないが、不意に書き換わってしまったときのため、規定値を書く。
// 17048 で必要。17040CTR) に書いてしまっても不具合なし // 17048 で必要。17040CTR) に書いてしまっても不具合なし
u8 loop; u8 loop;
short param[RCOMP_SIZE];
for( loop=0; loop < RCOMP_SIZE; loop++ ) for( loop=0; loop < RCOMP_SIZE*2; loop+=2 )
{ {
param[loop] = swap_endian_16(K_RCOMP_SEG); send_cmd_mgic_2B( BT_GAUGE_REG_RCOMP_EXT + loop, swap_endian_16(K_RCOMP_SEG) );
} }
iic_mcu_set_wo_dma( );
iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP_EXT, sizeof(param), param );
} }
// 6. 150ms以上待つ // 6. 150ms以上待つ
@ -584,7 +581,6 @@ static void BT_mgic_init()
// 10.元のRCOMPとOCVを書き戻す // 10.元のRCOMPとOCVを書き戻す
// 2B x 2times write に // 2B x 2times write に
// iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 4, origParam );
iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &origParam[0] ); iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP, 2, &origParam[0] );
iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP+2, 2, &origParam[2] ); iic_mcu_write( IIC_SLA_BT_GAUGE, BT_GAUGE_REG_RCOMP+2, 2, &origParam[2] );
@ -1360,7 +1356,6 @@ u8 read_pmic( u8 reg )
return iic_mcu_read_a_byte( IIC_SLA_PMIC, reg ); return iic_mcu_read_a_byte( IIC_SLA_PMIC, reg );
} }
/********************************************//** /********************************************//**
使 使
***********************************************/ ***********************************************/

View File

@ -1,23 +1,36 @@
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 -sainter_asm -zpb -no pm.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 pm.c
pm.c(543) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(543) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(604) : CC78K0R warning W0510: Pointer mismatch in function 'iic_mcu_read' pm.c(543) : CC78K0R warning W0511: Different argument types in function 'send_cmd_mgic_2B'
pm.c(555) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(600) : CC78K0R warning W0510: Pointer mismatch in function 'iic_mcu_read'
pm.c(882) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(886) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(886) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(890) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(915) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(919) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(929) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(933) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(1015) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1019) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(1024) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1028) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(1095) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1099) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(1241) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1245) : CC78K0R warning W0401: Conversion may lose significant digits pm.c(1243) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1247) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 13 warning(s) found.
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 "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. 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 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 -sainter_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 -sainter_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
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\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 "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\
@ -45,4 +58,4 @@ intel-HEX to bsr bin converter
file converted! file converted!
Build Total error(s) : 0 Total warning(s) : 25 Build Total error(s) : 0 Total warning(s) : 34