【不具合修正】
#765 充電台においてもオレンジランプが点つかないことがある
 HALの更新タイミングがよくなかった。ピンを直接見るように。
#766: ACアダプターが挿さっている状態で電池パックを抜くとオレンジランプがすぐに消えない
 アダプタ接続時、強制的に5sec点灯させる機能が働いていた。エンバグもなさそうなので一応修正
#767: ACアダプターが挿さっている状態で電池パックを挿しても電源が1回で入らない
 電池抜けで強制電源断のフラグが残ったままだった。
#ctr-dev 7060: OFF中の電池消費が激しい
 (task_sys.c)HALの更新タイミングの関係で、アダプタ情報が更新されず、STOPに入れなかったのを修正 
【リファクタリング】
accero.c tski_acc_hosu_set(名前変更→tski_acc_setup)するたびにwhoamiを見ていたが、廃止。コマンド列のnakでチェック
command3をifdefでリリース時はコンパイルされないように


git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_mcu@376 013db118-44a6-b54f-8bf7-843cb86687b1
This commit is contained in:
n2232 2011-08-24 10:53:54 +00:00
parent 92d54aae94
commit a55b0c4e61
15 changed files with 1170 additions and 966 deletions

View File

@ -38,6 +38,8 @@
#define ACC_REG_CTRL5 0x24 #define ACC_REG_CTRL5 0x24
#define ACC_REG_X 0x28 #define ACC_REG_X 0x28
#define ACC_REG_FLG_BURST_ACCESS 0x80
// ビット位置 // ビット位置
#define ACC_bP_PM0 5 #define ACC_bP_PM0 5
#define ACC_bP_DR0 3 #define ACC_bP_DR0 3
@ -64,12 +66,18 @@
// ========================================================
#define ACC_RAW_DATA_SIZE 6
// ======================================================== // ========================================================
task_status tsk_soft_int( ); task_status tsk_soft_int( );
extern void DI_wt_chk();
#define ACC_RAW_DATA_SIZE 6
/* ======================================================== /* ========================================================
   
@ -82,7 +90,7 @@ task_status_immed tski_cbk_accero( )
u8 acc_dat_buff[ ACC_RAW_DATA_SIZE ]; u8 acc_dat_buff[ ACC_RAW_DATA_SIZE ];
// 加速度センサデータレジスタへの反映 // 加速度センサデータレジスタへの反映
if( iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), ACC_RAW_DATA_SIZE, acc_dat_buff ) if( iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), ACC_RAW_DATA_SIZE, acc_dat_buff )
!= ERR_SUCCESS ) != ERR_SUCCESS )
{ {
err_count ++; err_count ++;
@ -95,7 +103,7 @@ task_status_immed tski_cbk_accero( )
{ {
// 加速度センサが異常になったので止める // 加速度センサが異常になったので止める
vreg_ctr[ VREG_C_ACC_CONFIG ] &= ~( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ); vreg_ctr[ VREG_C_ACC_CONFIG ] &= ~( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ );
tski_acc_hosu_set(); tski_acc_setup();
vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR; vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR;
return ( ERR_FINISED ); // タスクの削除は必要 return ( ERR_FINISED ); // タスクの削除は必要
} }
@ -116,7 +124,7 @@ task_status_immed tski_cbk_accero( )
if( ACC_VALID ) if( ACC_VALID )
{ {
u8 temp[ACC_RAW_DATA_SIZE]; u8 temp[ACC_RAW_DATA_SIZE];
iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), ACC_RAW_DATA_SIZE, temp ); iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), ACC_RAW_DATA_SIZE, temp );
} }
} }
if(( system_status.pwr_state != ON_CHECK ) if(( system_status.pwr_state != ON_CHECK )
@ -172,43 +180,19 @@ task_status_immed tski_acc_write( )
/*========================================================= /*=========================================================
   
========================================================*/ ========================================================*/
task_status_immed tski_acc_hosu_set( ) task_status_immed tski_acc_setup( )
{ {
// iic_mcu_read_a_byte( IIC_SLA_ACCEL, ACC_REG_WHOAMI ); // スタックが足りないので展開… // 加速度 on/off設定する
// if( iic_mcu_result == ERR_NOSLAVE )
{
u8 dummy;
if( iic_mcu_read( IIC_SLA_ACCEL, ACC_REG_WHOAMI, 1, &dummy ) == ERR_NOSLAVE )
{
vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR;
return ( ERR_FINISED ); // とりあえず、タスクは削除しなくてはならない
// おしまい
}else{
vreg_ctr[ VREG_C_STATUS_1 ] &= ~REG_BIT_ACCERO_ERR;
}
}
{ {
u8 str_send_buf[4]; u8 str_send_buf[4];
str_send_buf[1] = 0x00; // ctrl2 HPF:normal, filterd, HPF for IRQ : dis/dis, HPF coeff:norm str_send_buf[1] = 0x00; // ctrl2 HPF:normal, filterd, HPF for IRQ : dis/dis, HPF coeff:norm
/*
// ピン不足のため、TSとそれ以外回路違いを区別して設定
if( system_status.model == MODEL_TS_BOARD ) if( system_status.model == MODEL_TS_BOARD )
{ {
// TS Final SoC str_send_buf[2] = bits8(0,0,0,0, 0,0,1,0);
str_send_buf[2] = 0x02; // 3 IRQ pol :Active HI, Drive:Pushpull,
}
else
{
// 実機&派生種、白箱
str_send_buf[2] = 0x10; // 3 IRQ pol :Active HI, Drive:Pushpull,
}
*/
if( system_status.model == MODEL_TS_BOARD )
{
str_send_buf[2] = bits8(0,0,0,0, 0,0,1,0); // ピン不足のため、ちゃんと分ける
} }
else else
{ {
@ -216,8 +200,13 @@ task_status_immed tski_acc_hosu_set( )
} }
str_send_buf[3] = 0x80; // ctrl3 block update:enable, MSB first, scale: +-2G(default), selftest: dis str_send_buf[3] = 0x80; // ctrl3 block update:enable, MSB first, scale: +-2G(default), selftest: dis
if( ( vreg_ctr[VREG_C_ACC_CONFIG] & {
( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ) ) == 0 ) u8 acc_setting_sent = ( vreg_ctr[VREG_C_ACC_CONFIG] &
( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ ));
do{
EI();
if( acc_setting_sent == 0 )
{ {
PMK23 = 1; PMK23 = 1;
// 完全停止 // 完全停止
@ -233,18 +222,34 @@ task_status_immed tski_acc_hosu_set( )
| ACC_BITS_DR_100Hz << ACC_bP_DR0 | ACC_BITS_DR_100Hz << ACC_bP_DR0
| ACC_BITS_ALL_AXIS_ON ); | ACC_BITS_ALL_AXIS_ON );
} }
iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | 0x80 ), 4, str_send_buf );
// 実書き込み兼、通信できたかフラグ更新
if( iic_mcu_write( IIC_SLA_ACCEL, ( ACC_REG_CTRL1 | ACC_REG_FLG_BURST_ACCESS ), 4, str_send_buf ) == ERR_NOSLAVE )
{
vreg_ctr[ VREG_C_STATUS_1 ] |= REG_BIT_ACCERO_ERR;
}else{
vreg_ctr[ VREG_C_STATUS_1 ] &= ~REG_BIT_ACCERO_ERR;
} }
// カラ読み // カラ読み。前回のゴミを読み捨て
if( ACC_VALID ) if( ACC_VALID )
{ {
if( system_status.pwr_state == ON ) if( system_status.pwr_state == ON )
{ {
u8 temp[ACC_RAW_DATA_SIZE]; u8 temp[ACC_RAW_DATA_SIZE];
iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | 0x80 ), 6, temp ); iic_mcu_read( IIC_SLA_ACCEL, ( ACC_REG_X | ACC_REG_FLG_BURST_ACCESS ), 6, temp );
} }
} }
// センサに書きにいっている最中にSoCがまた書き換えてしまうかもしれない
DI_wt_chk();
}while( acc_setting_sent != ( vreg_ctr[VREG_C_ACC_CONFIG] &
( VREG_BITMASK_ACC_CONF_HOSU | VREG_BITMASK_ACC_CONF_ACQ )) );
}
}
// DI状態のまま帰る
return ( ERR_FINISED ); return ( ERR_FINISED );
} }

View File

@ -8,7 +8,7 @@
/////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////
task_status_immed tski_cbk_accero( ); task_status_immed tski_cbk_accero( );
task_status_immed tski_acc_hosu_set( ); task_status_immed tski_acc_setup( );
#endif #endif

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -1,22 +1,22 @@
78K0R Linker W1.33 Date:23 Aug 2011 Page: 1 78K0R Linker W1.33 Date:24 Aug 2011 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 -go85h,0FC00h,1024 -gi1B339499 C78K0R\W2.13\lib78k0r\s0rm.rel -gi1B339499E033F240BFAAh -pbsr
E033F240BFAAh -pbsr_k0r.map -nkd -gb7EFBFFh -bC:\Program File _k0r.map -nkd -gb7EFBFFh -bC:\Program Files (x86)\NEC Electro
s (x86)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib nics Tools\CC78K0R\W2.13\lib78k0r\fsl.lib -bcl0rdm.lib -bcl0r
-bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -iC:\Program Files (x86 m.lib -bcl0rmf.lib -iC:\Program Files (x86)\NEC Electronics T
)\NEC Electronics Tools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr - ools\CC78K0R\W2.13\lib78k0r -dbsr_mcu.dr -s -w2 loader.rel pm
s -w2 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.re .rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_t
l i2c_mcu.rel i2c_twl.rel led.rel rtc.rel vreg_ctr.rel vreg_t wl.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel reng
wl.rel adc.rel renge.rel accero.rel self_flash.rel sw.rel tas e.rel accero.rel self_flash.rel sw.rel task_debug.rel task_mi
k_debug.rel task_misc.rel task_sys.rel pedo_alg_thre_det2.rel sc.rel task_sys.rel pedo_alg_thre_det2.rel ini_VECT.rel task_
ini_VECT.rel task_status.rel led_cam.rel led_pow.rel hal.rel status.rel led_cam.rel led_pow.rel hal.rel batt_params.rel vo
batt_params.rel voltable.rel pedo_lpf_coeff.rel kanaria.rel ltable.rel pedo_lpf_coeff.rel kanaria.rel kanaria_c.rel get_e
kanaria_c.rel get_ei.rel i.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) 71 output segment(s)
3CB9H byte(s) real data 3CADH byte(s) real data
6282 symbol(s) defined 6298 symbol(s) defined
*** Memory map *** *** Memory map ***
@ -61,8 +61,7 @@ Direc-file:bsr_mcu.dr
00002H 00000H 00002H 00000H
LDR_CNSL 00002H 00000H CSEG PAGE64KP LDR_CNSL 00002H 00000H CSEG PAGE64KP
LDR_CNSL hal 00002H 00000H LDR_CNSL hal 00002H 00000H
??NMIROM 00002H 00002H CSEG * gap * 00002H 0000EH
* 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
@ -147,55 +146,54 @@ Direc-file:bsr_mcu.dr
000C4H 00000H 000C4H 00000H
LDR_CODL hal 000C4H 00000H LDR_CODL hal 000C4H 00000H
?CSEGSI 000C4H 0000AH CSEG ?CSEGSI 000C4H 0000AH CSEG
?OCDSTAD 000CEH 0000AH CSEG LDR_CODE 000CEH 0097FH CSEG
LDR_CODE 000D8H 0097FH CSEG LDR_CODE loader 000CEH 00196H
LDR_CODE loader 000D8H 00196H LDR_CODE main 00264H 0004EH
LDR_CODE main 0026EH 0004EH LDR_CODE WDT 002B2H 00000H
LDR_CODE WDT 002BCH 00000H LDR_CODE i2c_mcu 002B2H 002D7H
LDR_CODE i2c_mcu 002BCH 002D7H
LDR_CODE self_flash LDR_CODE self_flash
00593H 00373H 00589H 00373H
LDR_CODE task_debug LDR_CODE task_debug
00906H 00000H 008FCH 00000H
LDR_CODE task_status LDR_CODE task_status
00906H 00075H 008FCH 00075H
LDR_CODE hal 0097BH 000DCH LDR_CODE hal 00971H 000DCH
FSL_CODE 00A57H 00322H CSEG FSL_CODE 00A4DH 00322H CSEG
FSL_CODE fsl_block_cmd FSL_CODE fsl_block_cmd
00A57H 0002BH 00A4DH 0002BH
FSL_CODE fsl_block_check FSL_CODE fsl_block_check
00A82H 00013H 00A78H 00013H
FSL_CODE fsl_common FSL_CODE fsl_common
00A95H 0014FH 00A8BH 0014FH
FSL_CODE fsl_reset FSL_CODE fsl_reset
00BE4H 00001H 00BDAH 00001H
FSL_CODE fsl_si_ibf FSL_CODE fsl_si_ibf
00BE5H 00064H 00BDBH 00064H
FSL_CODE fsl_phySwap FSL_CODE fsl_phySwap
00C49H 0004DH 00C3FH 0004DH
FSL_CODE fsl_si_common FSL_CODE fsl_si_common
00C96H 00061H 00C8CH 00061H
FSL_CODE fsl_swap 00CF7H 00030H FSL_CODE fsl_swap 00CEDH 00030H
FSL_CODE fsl_write FSL_CODE fsl_write
00D27H 00052H 00D1DH 00052H
@@LCODE 00D79H 00277H CSEG @@LCODE 00D6FH 00277H CSEG
@@LCODE @cstart 00D79H 0006DH @@LCODE @cstart 00D6FH 0006DH
@@LCODE @imul 00DE6H 00011H @@LCODE @imul 00DDCH 00011H
@@LCODE @lumul 00DF7H 0002BH @@LCODE @lumul 00DEDH 0002BH
@@LCODE @isdiv 00E22H 00022H @@LCODE @isdiv 00E18H 00022H
@@LCODE @iudiv 00E44H 0002DH @@LCODE @iudiv 00E3AH 0002DH
@@LCODE @isrem 00E71H 00021H @@LCODE @isrem 00E67H 00021H
@@LCODE @iurem 00E92H 0002FH @@LCODE @iurem 00E88H 0002FH
@@LCODE @lsdiv 00EC1H 00039H @@LCODE @lsdiv 00EB7H 00039H
@@LCODE @ludiv 00EFAH 0003FH @@LCODE @ludiv 00EF0H 0003FH
@@LCODE @divuw 00F39H 00034H @@LCODE @divuw 00F2FH 00034H
@@LCODE @ladd 00F6DH 0000FH @@LCODE @ladd 00F63H 0000FH
@@LCODE @llsh 00F7CH 0001BH @@LCODE @llsh 00F72H 0001BH
@@LCODE @lursh 00F97H 0001FH @@LCODE @lursh 00F8DH 0001FH
@@LCODE @iscmp 00FB6H 0000CH @@LCODE @iscmp 00FACH 0000CH
@@LCODE @lband 00FC2H 00014H @@LCODE @lband 00FB8H 00014H
@@LCODE @bcdtob 00FD6H 0001AH @@LCODE @bcdtob 00FCCH 0001AH
* gap * 00FF0H 00006H * gap * 00FE6H 00010H
MGC_LOAD 00FF6H 0000AH CSEG AT MGC_LOAD 00FF6H 0000AH CSEG AT
MGC_LOAD magic 00FF6H 0000AH MGC_LOAD magic 00FF6H 0000AH
@ -246,20 +244,20 @@ Direc-file:bsr_mcu.dr
@@CNST kanaria_c @@CNST kanaria_c
0228CH 00000H 0228CH 00000H
ROM_CODE 0228CH 0244BH CSEG ROM_CODE 0228CH 0244BH CSEG
ROM_CODE pm 0228CH 00971H ROM_CODE pm 0228CH 0097DH
ROM_CODE i2c_ctr 02BFDH 0005CH ROM_CODE i2c_ctr 02C09H 0005CH
ROM_CODE i2c_twl 02C59H 0005EH ROM_CODE i2c_twl 02C65H 0005EH
ROM_CODE led 02CB7H 00249H ROM_CODE led 02CC3H 00249H
ROM_CODE rtc 02F00H 000E0H ROM_CODE rtc 02F0CH 000E0H
ROM_CODE vreg_ctr 02FE0H 00493H ROM_CODE vreg_ctr 02FECH 0047DH
ROM_CODE vreg_twl 03473H 000F9H ROM_CODE vreg_twl 03469H 000F9H
ROM_CODE adc 0356CH 00261H ROM_CODE adc 03562H 00261H
ROM_CODE renge 037CDH 00018H ROM_CODE renge 037C3H 00018H
ROM_CODE accero 037E5H 0015EH ROM_CODE accero 037DBH 00160H
ROM_CODE sw 03943H 00126H ROM_CODE sw 0393BH 00126H
ROM_CODE task_misc ROM_CODE task_misc
03A69H 001EAH 03A61H 001EAH
ROM_CODE task_sys 03C53H 00376H ROM_CODE task_sys 03C4BH 0037EH
ROM_CODE pedo_alg_thre_det2 ROM_CODE pedo_alg_thre_det2
03FC9H 004D4H 03FC9H 004D4H
ROM_CODE led_cam 0449DH 000B8H ROM_CODE led_cam 0449DH 000B8H

View File

@ -12,17 +12,15 @@
//#define _ALLOW_NOBATT_ // 実機電池なし(=アダプタのみ)での起動を許可 //#define _ALLOW_NOBATT_ // 実機電池なし(=アダプタのみ)での起動を許可
//#define _DBG_PEDO_AUTO_ENABLE_ // 電源投入の瞬間から歩数計on //#define _DBG_PEDO_AUTO_ENABLE_ // 電源投入の瞬間から歩数計on
//#define _DBG_LED_PRINT_ // LED print デバッグをしたいとき(自己アップデート用) //#define _DBG_LED_PRINT_ // LED print デバッグをしたいとき(自己アップデート用)
//#define _ENABLE_WDT_TEST_ //#define _ENABLE_COMMAND3_ // mcuリセットやwdtコマンドを有効にする
//#define _FORCE_TAIKENDAI_ //#define _FORCE_TAIKENDAI_
//#define _FORCE_TAIKENDAI_NBD_ //#define _FORCE_TAIKENDAI_NBD_
//#define _DBG_CHK_OFF_LEAK_ // OFF時リーク電流のチェック(デバッガで確認) //#define _DBG_CHK_OFF_LEAK_ // OFF時リーク電流のチェック(デバッガで確認)
//#define _DBG_NOP_ // ブレークを貼るためにNOP()を有効にしたいとき //#define _DBG_NOP_ // ブレークを貼るためにNOP()を有効にしたいとき
#define _I2C_ERR_ABORT_
//#define _ENABLE_HAL_ // デバッグ用にHALを有効にする。コメントアウトでスルーになる。 //#define _ENABLE_HAL_ // デバッグ用にHALを有効にする。コメントアウトでスルーになる。
#ifdef _DBG_NOP_ // コード上必要なNOPと区別するため #ifdef _DBG_NOP_ // コード上必要なNOPと区別するため
# define dbg_nop() NOP() # define dbg_nop() NOP()
#else #else
@ -30,6 +28,9 @@
#endif #endif
#define _I2C_ERR_ABORT_ // *標準でon* I2Cで誤書き込みらしきが発生したら以降無視 
//. ブレーク張っても全然引っかからなくなりましたが...
// 特殊仕様ファーム // 特殊仕様ファーム
//#define _TAIKENDAI_ //#define _TAIKENDAI_
// homeメニューに入れてしまうのを回避する特殊ファームをつくる。ROMが足りないので電池パラメータ周りをパスする // homeメニューに入れてしまうのを回避する特殊ファームをつくる。ROMが足りないので電池パラメータ周りをパスする

Binary file not shown.

View File

@ -126,7 +126,7 @@ void tsk_batt( )
bt_get_charge_status(); // CCIC制御 bt_get_charge_status(); // CCIC制御
if( ! BT_IN_CHG_delayed_n ) // LEDに反映 if( ! BT_IN_CHG_delayed_n ) // LEDに反映。bt_get_charge_status()で更新されます。
{ {
LED_CHARGE = 1; LED_CHARGE = 1;
} }
@ -138,8 +138,16 @@ void tsk_batt( )
// アダプタつないだ瞬間、満充電でも数秒わざと点灯させる。給電してることをわからせるため。 // アダプタつないだ瞬間、満充電でも数秒わざと点灯させる。給電してることをわからせるため。
if( chg_led_override != 0 ){ // ↑から見ればわかるが、瞬間(数クロック)消える事がある。気がつく人いるかな…? if( chg_led_override != 0 ){ // ↑から見ればわかるが、瞬間(数クロック)消える事がある。気がつく人いるかな…?
chg_led_override --; chg_led_override --;
if(( vreg_ctr[ VREG_C_STATUS_1 ] & REG_BIT_MGIC_ERR ) != 0 ) // アダプタ有り、電池無しですぐに消す。
{
chg_led_override = 0;
}
else
{
LED_CHARGE = 1; LED_CHARGE = 1;
} }
}
// レジスタの充電中ビットはLEDに同期する // レジスタの充電中ビットはLEDに同期する
set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。 set_bit( LED_CHARGE, vreg_ctr[VREG_C_STATUS], REG_BIT_BATT_CHARGE ); // set_bitのみ。
@ -891,14 +899,14 @@ err PM_BL_set( u8 dat )
#if 0 #if 0
// SoCがPWMを出すようレジスタをセットしてから遅延が有るため、ステータスを先に // SoCがPWMを出すようレジスタをセットしてから遅延が有るため、ステータスを先に
// 更新してしまう。 // 更新してしまう。してほしいとの要求。
#endif #endif
// PMICのBLのビットと、MCUのSTATUSレジスタのビット位置が逆なため入れ替え // PMICのBLのビットと、MCUのSTATUSレジスタのビット位置が逆なため入れ替え
vreg_ctr[VREG_C_STATUS] = (( vreg_ctr[VREG_C_STATUS] & bits8(1,0,0,1, 1,1,1,1) ) vreg_ctr[VREG_C_STATUS] = (( vreg_ctr[VREG_C_STATUS] & bits8(1,0,0,1, 1,1,1,1) )
| ( (( blset << 6 ) | ( blset << 4 )) & bits8(0,1,1,0, 0,0,0,0) )); | ( (( blset << 6 ) | ( blset << 4 )) & bits8(0,1,1,0, 0,0,0,0) ));
// 割り込み // 割り込み
/// 複数ビットまとめて行うので、いつもの関数使用不可 /// 複数ビットまとめて行うので、set_irq()使用不可
{ {
u8 tot; u8 tot;

View File

@ -215,11 +215,12 @@ __callt err renge_task_immed_run(){
u8 rv; u8 rv;
EI(); EI();
rv = tasks_immed[ list_id ](); rv = tasks_immed[ list_id ](); // タスク実行
if( rv == ERR_SUCCESS ) if( rv == ERR_SUCCESS )
{ {
tasks_immed[ list_id ] = TSK_IMM_DELETED_; tasks_immed[ list_id ] = TSK_IMM_DELETED_;
} }
// きわどいタイミングで同じタスクの登録があると困るのでDI状態でかえって来る事がある
} }
DI_wt_chk(); DI_wt_chk();
} }

View File

@ -11,7 +11,7 @@ extern task_status_immed tski_do_command0( );
extern task_status_immed tski_ntr_pmic_comm(); extern task_status_immed tski_ntr_pmic_comm();
extern task_status_immed tski_acc_read(); extern task_status_immed tski_acc_read();
extern task_status_immed tski_acc_write(); extern task_status_immed tski_acc_write();
//extern task_status_immed tski_acc_hosu_set(); // accero.h //extern task_status_immed tski_acc_setup(); // accero.h
extern task_status_immed tski_mcu_reset(); extern task_status_immed tski_mcu_reset();
extern task_status_immed tski_vol_update(); extern task_status_immed tski_vol_update();

View File

@ -33,7 +33,7 @@ void tsk_debug( )
if( system_status.pwr_state == ON_TRIG ){ if( system_status.pwr_state == ON_TRIG ){
// 歩数計を起動時にonにする // 歩数計を起動時にonにする
vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x03; vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x03;
renge_task_immed_add( tski_acc_hosu_set ); renge_task_immed_add( tski_acc_setup );
} }
#endif #endif

View File

@ -31,6 +31,9 @@ extern void nop8();
static void chk_emergencyExit(); static void chk_emergencyExit();
static void force_off_check(); static void force_off_check();
static void send_getup_to_soc(); static void send_getup_to_soc();
#ifdef _DBG_CHK_OFF_LEAK_
static void leak_check();
#endif
@ -65,6 +68,9 @@ void tsk_sys( )
switch ( system_status.pwr_state ) switch ( system_status.pwr_state )
{ {
case ON_CHECK: //------------------------------------------------------- case ON_CHECK: //-------------------------------------------------------
// 強制電源断カウントダウンタイマクリア
clear_pow_off_countdown();
// 他の割り込みでHALT(スリープ)が解除 / アダプタ有時 // 他の割り込みでHALT(スリープ)が解除 / アダプタ有時
// 電源スイッチでHALT解除 // // 電源スイッチでHALT解除 //
@ -287,7 +293,7 @@ void tsk_sys( )
force_off_check(); force_off_check();
#ifndef _TAIKENDAI_SEISAN_SPECIAL_ #ifndef _TAIKENDAI_SEISAN_SPECIAL_
if( system_status.taikendai ) // アダプタが刺さっていたら自動で電源on if( system_status.taikendai ) // アダプタが抜けたら自動で電源off
{ {
if( PM_EXTDC_n ) if( PM_EXTDC_n )
{ {
@ -317,7 +323,8 @@ void tsk_sys( )
// 加速度センサ停止 // 加速度センサ停止
vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x00; vreg_ctr[ VREG_C_ACC_CONFIG ] = 0x00;
tski_acc_hosu_set(); tski_acc_setup();
EI(); // DI状態でかえって来るので、I2C_mcu 完了させるのに必要を
// その他ペリフェラル停止 // その他ペリフェラル停止
LED_stop( ); LED_stop( );
@ -429,43 +436,11 @@ void tsk_sys( )
RTCIMK = 1; // systick用インターバルタイマー割り込みマスク RTCIMK = 1; // systick用インターバルタイマー割り込みマスク
#ifdef _DBG_CHK_OFF_LEAK_ #ifdef _DBG_CHK_OFF_LEAK_
{ // leak_check();
// off中のpin設定ミスチェック
volatile u8 ports_i[12];
volatile u8 ports_o[12];
ports_i[0] = ( PM0 & PU0 & ~P0 ); // プルアップ切り忘れ?
ports_i[1] = ( PM1 & PU1 & ~P1 );
ports_i[2] = 0;
ports_i[3] = ( PM3 & PU3 & ~P3 );
ports_i[4] = ( PM4 & PU4 & ~P4 );
ports_i[5] = ( PM5 & PU5 & ~P5 );
ports_i[6] = 0;
ports_i[7] = ( PM7 & PU7 & ~P7 );
ports_i[8] = ( PM12 & PU12 & ~P12 );
ports_i[9] = ( PM14 & PU14 & ~P14 );
ports_i[10] = 0;
ports_i[11] = ( PM20 & PU20 & ~P20 );
ports_o[0] = ( ~PM0 & P0 ); // H 出力しちゃってるかも
ports_o[1] = ( ~PM1 & P1 );
ports_o[2] = ( ~PM2 & P2 );
ports_o[3] = ( ~PM3 & P3 & ~POM3 );
ports_o[4] = ( ~PM4 & P4 ); // bit3はchg_enなので1でもよい
ports_o[5] = ( ~PM5 & P5 );
ports_o[6] = ( ~PM6 & P6 );
ports_o[7] = ( ~PM7 & P7 );
ports_o[8] = ( ~PM12 & P12 );
ports_o[9] = ( ~PM14 & P14 );
ports_o[10] = ( ~PM15 & P15 );
ports_o[11] = ( ~PM20 & P20 );
NOP(); // ←ブレーク置くため
}
#endif #endif
CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzに落としてからSTOPしなくてはならない CKC = bits8(0,0,0,0, 1,0,0,1); // 4MHzに落としてからSTOPしなくてはならない
if( PM_EXTDC_n ) // きわどいタイミングで挿抜が起きることがある if( PM_EXTDC_n_RAW ) // きわどいタイミングで挿抜が起きることがある。HAL通さないべきoff中ですし
{ {
STOP(); STOP();
} }
@ -635,3 +610,42 @@ task_status_immed tski_firm_update(){
return( ERR_SUCCESS ); return( ERR_SUCCESS );
} }
#ifdef _DBG_CHK_OFF_LEAK_
/* ========================================================
pin設定ミスチェック
======================================================== */
static void leak_check()
{
volatile u8 ports_i[12];
volatile u8 ports_o[12];
ports_i[0] = ( PM0 & PU0 & ~P0 ); // プルアップ切り忘れ?
ports_i[1] = ( PM1 & PU1 & ~P1 );
ports_i[2] = 0;
ports_i[3] = ( PM3 & PU3 & ~P3 );
ports_i[4] = ( PM4 & PU4 & ~P4 );
ports_i[5] = ( PM5 & PU5 & ~P5 );
ports_i[6] = 0;
ports_i[7] = ( PM7 & PU7 & ~P7 );
ports_i[8] = ( PM12 & PU12 & ~P12 );
ports_i[9] = ( PM14 & PU14 & ~P14 );
ports_i[10] = 0;
ports_i[11] = ( PM20 & PU20 & ~P20 );
ports_o[0] = ( ~PM0 & P0 ); // H 出力しちゃってるかも
ports_o[1] = ( ~PM1 & P1 );
ports_o[2] = ( ~PM2 & P2 );
ports_o[3] = ( ~PM3 & P3 & ~POM3 );
ports_o[4] = ( ~PM4 & P4 ); // bit3はchg_enなので1でもよい
ports_o[5] = ( ~PM5 & P5 );
ports_o[6] = ( ~PM6 & P6 );
ports_o[7] = ( ~PM7 & P7 );
ports_o[8] = ( ~PM12 & P12 );
ports_o[9] = ( ~PM14 & P14 );
ports_o[10] = ( ~PM15 & P15 );
ports_o[11] = ( ~PM20 & P20 );
NOP(); // ←ブレーク置くため
}
#endif _DBG_CHK_OFF_LEAK_

View File

@ -275,7 +275,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
break; break;
case ( VREG_C_ACC_CONFIG ): case ( VREG_C_ACC_CONFIG ):
renge_task_immed_add( tski_acc_hosu_set ); renge_task_immed_add( tski_acc_setup );
vreg_ctr[ VREG_C_ACC_CONFIG ] = data; vreg_ctr[ VREG_C_ACC_CONFIG ] = data;
break; break;
@ -308,36 +308,6 @@ void vreg_ctr_write( u8 adrs, u8 data )
vreg_free_adrs = data; vreg_free_adrs = data;
break; break;
case ( VREG_C_COMMAND3 ):
switch ( data )
{
case ( 'r' ):
// 割り込みルーチンからFSLライブラリを呼ぶのは禁止
// マイコンを再起動。 レジスタ類も初期化される。
renge_task_immed_add( tski_mcu_reset );
break;
#ifdef _ENABLE_WDT_TEST_
case ( 'w' ):
// WDTで再起動テスト向け
while(1)
{
NOP();
}
// mcu_wdt_reset; // このコマンド使ったら意味ないでしょ!
break;
#endif
case( 'p' ):
reserve_pedo_increnent = 1;
// ここで増やすにはスタックが足りない。↑で予約のみ、task_misc内で処理
// hosu_increment_if_necessary(); // 今、一歩増えた
break;
}
// vreg_ctr[ VREG_C_COMMAND3 ] = data; // 書く必要なし
break;
case ( VREG_C_RBR_CONTROL ): case ( VREG_C_RBR_CONTROL ):
if(( data & REG_BIT_RESET_n ) != 0 ) if(( data & REG_BIT_RESET_n ) != 0 )
{ {
@ -358,6 +328,38 @@ void vreg_ctr_write( u8 adrs, u8 data )
vreg_ctr[ VREG_C_RBR_CONTROL ] = data; vreg_ctr[ VREG_C_RBR_CONTROL ] = data;
break; break;
case ( VREG_C_COMMAND3 ):
switch ( data )
{
#ifdef _ENABLE_COMMAND3_
case ( 'r' ):
// 割り込みルーチンからFSLライブラリを呼ぶのは禁止
// マイコンを再起動。 レジスタ類も初期化される。
renge_task_immed_add( tski_mcu_reset );
break;
case ( 'w' ):
// WDTで再起動テスト向け
// mcu_wdt_reset; // このコマンド使ったら意味ないでしょ!
while(1)
{
dbg_NOP();
}
break;
#endif //_ENABLE_COMMAND3_
#ifdef _ENABLE_HAL_
case( 'p' ):
reserve_pedo_increnent = 1;
// ここで増やすにはスタックが足りない。↑で予約のみ、task_misc内で処理
// hosu_increment_if_necessary(); // 今、一歩増えた
break;
#endif //_ENABLE_HAL_
}
// vreg_ctr[ VREG_C_COMMAND3 ] = data; // 書く必要なし
break;
// read only ////////////////////////////////////////// // read only //////////////////////////////////////////
case VREG_C_MCU_VER_MAJOR: case VREG_C_MCU_VER_MAJOR:
case VREG_C_MCU_VER_MINOR: case VREG_C_MCU_VER_MINOR:
@ -435,6 +437,7 @@ void vreg_ctr_write( u8 adrs, u8 data )
// ******************************************************** // ********************************************************
// I2C仮想レジスタから読みます。 // I2C仮想レジスタから読みます。
// 戻り: xx データ // 戻り: xx データ
@ -549,7 +552,7 @@ void vreg_ctr_after_read( u8 adrs, u8 data )
IRQを読むタスクが積んであるので IRQを読むタスクが積んであるので
   
DIかのチェック不要 DIかのチェック不要
 DI中に来るのはI2C_twlかRTC_アラームEIして問題ない  DI中に来るのはI2C_twlかRTC_アラームEIして実使用上問題ない
*****************************************************************************/ *****************************************************************************/
void set_irq( u8 irqreg, u8 irq_flg ) void set_irq( u8 irqreg, u8 irq_flg )
{ {

View File

@ -1,9 +1,182 @@
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 loader.c
loader.c(139) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(140) : CC78K0R warning W0401: Conversion may lose significant digits
loader.c(172) : 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\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 -sainter_asm -zpb -no pm.c
pm.c(492) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(785) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(789) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(819) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(840) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(906) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(915) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1118) : CC78K0R warning W0401: Conversion may lose significant digits
pm.c(1120) : CC78K0R warning W0401: Conversion may lose significant digits
Compilation complete, 0 error(s) and 9 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 -sainter_asm -zpb -no i2c_ctr.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_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 -rd2s2 -qvjl2w -sainter_asm -zpb -no main.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 -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\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 "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 WDT.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 -sainter_asm -zpb -no i2c_mcu.c
i2c_mcu.c(212) : 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 -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\i2c_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 -sainter_asm -zpb -no led.c
led.c(82) : CC78K0R warning W0745: Expected function prototype
led.c(331) : 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 -sainter_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 -sainter_asm -zpb -no vreg_ctr.c
vreg_ctr.c(167) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(168) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(170) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(172) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(173) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(221) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(221) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(226) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(230) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(234) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(234) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_ctr.c(238) : 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 -sainter_asm -zpb -no vreg_twl.c
vreg_twl.c(61) : CC78K0R warning W0401: Conversion may lose significant digits
vreg_twl.c(65) : 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 -sainter_asm -zpb -no adc.c
adc.c(102) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(183) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(229) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(288) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(409) : CC78K0R warning W0745: Expected function prototype
adc.c(438) : CC78K0R warning W0401: Conversion may lose significant digits
adc.c(443) : 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 -sainter_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 -sainter_asm -zpb -no accero.c
accero.c(113) : 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 -sainter_asm -zpb -no self_flash.c
self_flash.c(280) : CC78K0R warning W0401: Conversion may lose significant digits
self_flash.c(281) : 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 -sainter_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 -sainter_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 -sainter_asm -zpb -no task_misc.c
task_misc.c(341) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(343) : CC78K0R warning W0401: Conversion may lose significant digits
task_misc.c(355) : 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 -sainter_asm -zpb -no task_sys.c
task_sys.c(225) : CC78K0R warning W0401: Conversion may lose significant digits
task_sys.c(559) : 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\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 -sainter_asm -zpb -no pedo_alg_thre_det2.c
pedo_alg_thre_det2.c(103) : CC78K0R warning W0745: Expected function prototype
pedo_alg_thre_det2.c(119) : 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 -sainter_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 -sainter_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 -sainter_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 -sainter_asm -zpb -no led_pow.c
led_pow.c(99) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(104) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(155) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(215) : CC78K0R warning W0401: Conversion may lose significant digits
led_pow.c(244) : 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 -sainter_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 -sainter_asm -zpb -no batt_params.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\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
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 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 -sainter_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\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
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'
@ -23,6 +196,9 @@ Link complete, 0 error(s) and 13 warning(s) found.
"C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf "C:\Program Files (x86)\NEC Electronics Tools\RA78K0R\W1.33\bin\oc78k0r.exe" -y"c:\program files (x86)\nec electronics tools\dev" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf
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
133 4
!E debug enable!! intel-HEX to bsr bin converter
Build Total error(s) : 0 Total warning(s) : 13 file converted!
Build Total error(s) : 0 Total warning(s) : 66

View File

@ -1196,7 +1196,7 @@ G=1
E=0 E=0
E0=flash.elk E0=flash.elk
E1=a.elk E1=a.elk
GO=1 GO=0
GOValue=85 GOValue=85
GOStart=FC00 GOStart=FC00
GOSizeValue=1024 GOSizeValue=1024