From 69ef310cc958c3ec113eb4d9fbc4a63fce201303 Mon Sep 17 00:00:00 2001 From: fujita_ryohei Date: Tue, 2 Feb 2010 04:42:28 +0000 Subject: [PATCH] =?UTF-8?q?=E6=AD=A9=E6=95=B0=E8=A8=88=E3=80=80=E5=B1=A5?= =?UTF-8?q?=E6=AD=B4=E3=83=87=E3=83=BC=E3=82=BF=E3=81=AB=E2=80=9D=E3=83=87?= =?UTF-8?q?=E3=83=BC=E3=82=BF=E7=84=A1=E3=81=97=E2=80=9D=E5=B0=8E=E5=85=A5?= =?UTF-8?q?=E3=80=81=E3=81=9D=E3=82=8C=E3=81=AB=E3=81=82=E3=82=8F=E3=81=9B?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8D=E3=81=84=E3=82=8D?= 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@92 013db118-44a6-b54f-8bf7-843cb86687b1 --- trunk/accero.c | 30 +++++++++-- trunk/accero.h | 2 +- trunk/main.c | 7 ++- trunk/vreg_ctr.c | 2 +- trunk/yav_mcu_bsr.plg | 117 +----------------------------------------- trunk/yav_mcu_bsr.pri | 8 +-- trunk/yav_mcu_bsr.prk | 10 ++-- trunk/yav_mcu_bsr.sdb | 16 +++--- 8 files changed, 51 insertions(+), 141 deletions(-) diff --git a/trunk/accero.c b/trunk/accero.c index 65b6c52..f12b905 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -161,10 +161,10 @@ task_status_immed tsk_cbk_accero( ) 　履歴を更新 ========================================================*/ u8 p_record; -u8 last_hour; // 履歴の最新は何時？ -u8 last_day; -u8 last_month; -u8 last_year; +u8 last_hour = 0x23; // 履歴の最新は何時？ +u8 last_day = 0x30; +u8 last_month = 0x12; +u8 last_year = 0x99; static void hosu_increment() { @@ -230,7 +230,7 @@ static void hosu_increment() last_hour_fny = now_hour; // 実際にインクリメント - if( pool[ p_record ] != 0xFFFF ) + if( pool[ p_record ] != 0xFFFE ) { pool[ p_record ] += 1; } @@ -238,6 +238,7 @@ static void hosu_increment() } + /* ======================================================== 空白の時間を適切に0にして、 今を含む１時間のデータを書く位置にポインタ？を進める @@ -260,6 +261,25 @@ void fill_hosu_hist_hours( u16 hours ) } + +/* ======================================================== +空白の時間を適切に0にして、 +今を含む１時間のデータを書く位置にポインタ？を進める +======================================================== */ +void clear_hosu_hist() +{ + u8 hours = 0; + // 空白の数時間の設定 + do + { + pool[ hours ] = 0xFFFF; + hours -= 1; + } + while( hours != 0 ); +} + + + u8 hosu_read_state; bit record_read_msb_lsb; diff --git a/trunk/accero.h b/trunk/accero.h index fe755cd..132a537 100644 --- a/trunk/accero.h +++ b/trunk/accero.h @@ -13,6 +13,6 @@ task_status_immed acc_hosu_set( ); void hosu_read_end( ); u8 hosu_read( ); void fill_hosu_hist_hours( u16 ); - +void clear_hosu_hist(); #endif diff --git a/trunk/main.c b/trunk/main.c index 5bb2c57..ee44cd8 100644 --- a/trunk/main.c +++ b/trunk/main.c @@ -56,6 +56,11 @@ void main_loop( void ) system_status.pwr_state = ON_TRIG; } } + else + { + // リブート時は実行されない + } + #ifdef _PARRADIUM_ system_status.pwr_state = OFF; #endif @@ -64,7 +69,7 @@ void main_loop( void ) read_dipsw( ); // 特定スイッチで何かするか？ - fill_hosu_hist_hours( 0 ); // 履歴クリア + clear_hosu_hist(); // 履歴クリア vreg_ctr[ VREG_C_ACC_HOSU_L ] = 0; vreg_ctr[ VREG_C_ACC_HOSU_M ] = 0; vreg_ctr[ VREG_C_ACC_HOSU_H ] = 0; diff --git a/trunk/vreg_ctr.c b/trunk/vreg_ctr.c index 4b5a21a..00be00b 100644 --- a/trunk/vreg_ctr.c +++ b/trunk/vreg_ctr.c @@ -240,7 +240,7 @@ void vreg_ctr_write( u8 adrs, u8 data ) case ( VREG_C_ACC_HOSU_SETTING ): if( ( data & 0x01 ) != 0 ) { - fill_hosu_hist_hours( 0 ); // 履歴クリア + clear_hosu_hist(); // 履歴クリア vreg_ctr[ VREG_C_ACC_HOSU_L ] = 0; vreg_ctr[ VREG_C_ACC_HOSU_M ] = 0; vreg_ctr[ VREG_C_ACC_HOSU_H ] = 0; diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index f35220f..0ec17ff 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,25 +1,4 @@ C:\WINDOWS\system32\cmd.exe /c touch magic.c -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no loader.c -loader.c(106) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\loader.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no pm.c -pm.c(167) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(178) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(182) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(233) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(270) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(349) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(357) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(829) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 8 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\pm.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no i2c_ctr.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no main.c Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\main.asm @@ -28,100 +7,6 @@ Assembly complete, 0 error(s) and 0 warning(s) found. Compilation complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\magic.asm Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no WDT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\WDT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no i2c_mcu.c -i2c_mcu.c(119) : CC78K0R warning W0401: Conversion may lose significant digits -i2c_mcu.c(196) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_mcu.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no i2c_twl.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\i2c_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no ini_VECT.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\ini_VECT.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no led.c -led.c(457) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\led.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no rtc.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\rtc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no vreg_ctr.c -vreg_ctr.c(72) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(128) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(138) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(139) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(141) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(143) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(144) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(146) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(166) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_ctr.c(261) : CC78K0R warning W0510: Pointer mismatch in function 'FSL_Init' -Compilation complete, 0 error(s) and 10 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_ctr.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no vreg_twl.c -vreg_twl.c(46) : CC78K0R warning W0401: Conversion may lose significant digits -vreg_twl.c(50) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\vreg_twl.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no adc.c -adc.c(225) : CC78K0R warning W0401: Conversion may lose significant digits -adc.c(254) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\adc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no renge\renge.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\renge.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no accero.c -accero.c(110) : CC78K0R warning W0745: Expected function prototype -accero.c(119) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\accero.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no self_flash.c -self_flash.c(189) : CC78K0R warning W0401: Conversion may lose significant digits -self_flash.c(325) : CC78K0R warning W0411: Illegal pointer combination -self_flash.c(367) : CC78K0R warning W0510: Pointer mismatch in function 'FSL_Init' -Compilation complete, 0 error(s) and 3 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\self_flash.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no reboot.c -reboot.c(14) : CC78K0R warning W0915: Asm statement found. skip to jump optimize this function 'my_reboot' -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\reboot.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no sw.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\sw.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no task_debug.c -Compilation complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_debug.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no task_misc.c -task_misc.c(48) : CC78K0R warning W0401: Conversion may lose significant digits -task_misc.c(34) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 2 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_misc.asm -Assembly complete, 0 error(s) and 0 warning(s) found. -"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\bin\cc78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -irenge -i"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\inc78k0r" -ms -quvjl3wt -sainter_asm -zp -no task_sys.c -task_sys.c(324) : CC78K0R warning W0401: Conversion may lose significant digits -Compilation complete, 0 error(s) and 1 warning(s) found. -"C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\ra78k0r.exe" -c9F0104 -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff inter_asm\task_sys.asm -Assembly complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\lk78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -obsr.lmf "..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r\s0rm.rel" -go85h,0FC00h,1024 -gi0FFFFFFFFFFFFFFFFFFFFh -pbsr_k0r.map -nkd -kp -gb6EFBFFh -b"C:\Program Files\NEC Electronics Tools\FSL78K0R_Type02ES\V1.20\lib78k0r\fsl.lib" -bcl0rdm.lib -bcl0rm.lib -bcl0rmf.lib -i"C:\Program Files\NEC Electronics Tools\CC78K0R\W2.10\lib78k0r" -dbsr_mcu.dr -s -w0 loader.rel pm.rel i2c_ctr.rel main.rel magic.rel WDT.rel i2c_mcu.rel i2c_twl.rel ini_VECT.rel led.rel rtc.rel vreg_ctr.rel vreg_twl.rel adc.rel renge.rel accero.rel self_flash.rel reboot.rel sw.rel task_debug.rel task_misc.rel task_sys.rel Link complete, 0 error(s) and 0 warning(s) found. "C:\Program Files\NEC Electronics Tools\RA78K0R\W1.31\bin\oc78k0r.exe" -y"C:\Program Files\NEC Electronics Tools\DEV" -_msgoff -o.\bsr.hex -nu -ki bsr.lmf @@ -132,4 +17,4 @@ intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 35 +Build Total error(s) : 0 Total warning(s) : 0 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 0595054..1a08a6a 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -80,8 +80,8 @@ Kanji=SJIS [Source] Geometry=155, 80, 1012, 920 Window=Normal -DispStart=276 -CaretPos=277,0 +DispStart=46 +CaretPos=96,0 Mode=Normal DispFile= Address1= @@ -142,8 +142,8 @@ Accumulative=ON [Assemble] Geometry=605, 2, 600, 400 Window=Normal -DispStart=16965 -CaretPos=16965,27 +DispStart=655 +CaretPos=655,27 Address1= Address2= Address3= diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 939a5e3..8197ffc 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,13 +1,13 @@ [ProjectManager] FrameMax=0 -FrameX=86 -FrameY=74 +FrameX=138 +FrameY=118 FrameCX=1299 -FrameCY=1043 +FrameCY=1044 OpenFile1=task_sys.c,0,521,328,1765,1085,25,250,25,0 OpenFile2=renge\renge.h,0,502,637,1746,1394,29,16,29,0 -OpenFile3=i2c_twl.c,0,31,261,1010,897,25,31,25,0 -OpenFile4=config.h,0,255,3,1234,639,0,21,19,0 +OpenFile3=i2c_twl.c,0,31,261,1010,897,0,1,0,0 +OpenFile4=config.h,0,255,3,1234,639,0,21,20,0 OpenFile5=OutputWindow OutputPos=0,421,829,388,1497 OpenFile6=ProjectWindow diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 0735cd2..69d7eda 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -23,7 +23,7 @@ T=4b60e64a 1=incs.h 2=accero.h [main.c] -T=4b57fe0b +T=4b66ac04 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -32,7 +32,7 @@ T=4b57fe0b 6=led.h 7=adc.h [magic.c] -T=4b6686ff +T=4b66b228 1=config.h [WDT.c] T=4afd21ca @@ -56,7 +56,7 @@ T=4b4438bb T=4b4438a1 1=incs.h [vreg_ctr.c] -T=4b60da5e +T=4b66ac04 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -73,7 +73,7 @@ T=4b667aab 4=vreg_ctr.h 5=renge\renge_task_intval.h [adc.c] -T=4b667a0d +T=4b66954e 1=incs.h 2=adc.h 3=pm.h @@ -88,7 +88,7 @@ T=4b5d73b9 6=user_define.h 7=bsr_system.h [accero.c] -T=4b5d7f5b +T=4b66b29e 1=incs.h 2=..\..\Program Files\NEC Electronics Tools\CC78K0R\W2.10\inc78k0r\math.h [self_flash.c] @@ -146,9 +146,9 @@ T=4b25f1a9 T=4b023fdb 1=config.h [user_define.h] -T=4b663267 +T=4b66880a [config.h] -T=4b6686db +T=4b66a4e1 [bsr_system.h] T=4b3064de [renge\renge.h] @@ -199,7 +199,7 @@ T=4b25e780 [vreg_twl.h] T=4afd21cb [accero.h] -T=4b57f3ee +T=4b66ac04 1=jhl_defs.h [i2c_twl_defs.h] T=4afd21ca