diff --git a/trunk/accero.c b/trunk/accero.c index 424117f..e5badaf 100644 --- a/trunk/accero.c +++ b/trunk/accero.c @@ -199,7 +199,7 @@ static void hosu_increment() while( !RWST ){;} now_year = bcdtob( YEAR ); now_hour = get_long_hour(); - // RWAIT = 0; ↑で行っています + // RWAIT = 0; ↑で行っています // EI(); 〃 // 歩数計が止まったいた時間を考慮して必要なら進める // diff --git a/trunk/adc.c b/trunk/adc.c index 92e30ca..59c911f 100644 --- a/trunk/adc.c +++ b/trunk/adc.c @@ -78,7 +78,7 @@ void tsk_adc( ) vreg_twl[ REG_TWL_INT_ADRS_VOL ] = vol_old / ( 256 / 32 ); // 割り込みはHorizonを通してコマンドを発行されるのを待てばよい - class = vreg_ctr[VREG_C_SND_VOL] / ( 256 / 8 ); + class = vreg_ctr[VREG_C_SND_VOL] / ( 256 / 16 ); if( class != class_old ) { class_old = class; diff --git a/trunk/bsr_mcu.dr b/trunk/bsr_mcu.dr index 0f82c9d..12fcfd0 100644 --- a/trunk/bsr_mcu.dr +++ b/trunk/bsr_mcu.dr @@ -1,10 +1,8 @@ ;;; 領域の定義 ;32kB = 0x7FFF -MEMORY BCL0:(00000H, 01000H ) -;MEMORY BCL1:(01000H, 01000H ) ; バックアップ領域 -MEMORY ROM :(02000H, 02800H ) -;MEMORY ROM_DMY :(04800H, 00800H ) -;MEMORY ROM :(02000H, 04000H ) +MEMORY BCL0: (00000H, 01000H ) +;MEMORY BCL1: (01000H, 01000H ) ; バックアップ領域 +MEMORY ROM : (02000H, 03000H ) ;MEMORY ROM_BKUP:(05000H, 03000H ) ; バックアップ領域 ;MEMORY OCD :(0FC00H, 00400H ) ; OCDが使っているらしい diff --git a/trunk/config.h b/trunk/config.h index 4c8483b..fa7b80b 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -6,7 +6,7 @@ #define MCU_VER_MAJOR 0x00; -#define MCU_VER_MINOR 0x1C; +#define MCU_VER_MINOR 0x0D; #define _OVERCLOCK_ diff --git a/trunk/loader.c b/trunk/loader.c index d52df3b..012fc3c 100644 --- a/trunk/loader.c +++ b/trunk/loader.c @@ -49,7 +49,7 @@ static fsl_u08 fsl_MK2H_bak_u08; /* } // magic.c の記述と違わないように注意！ #define MGC_LOAD 0x0FF6 -#define MGC_FOOT 0x47F6 +#define MGC_FOOT 0x4FF6 diff --git a/trunk/magic.c b/trunk/magic.c index 009255b..0dc867d 100644 --- a/trunk/magic.c +++ b/trunk/magic.c @@ -18,7 +18,7 @@ __far static const unsigned char MGC_LOAD[] = SIG; #pragma section @@CNST MGC_MIMI AT 0x2100 static const unsigned char MGC_HEAD[] = SIG; -#pragma section @@CNST MGC_TAIL AT 0x47F6 +#pragma section @@CNST MGC_TAIL AT 0x4FF6 static const unsigned char MGC_TAIL[] = SIG; diff --git a/trunk/yav_mcu_bsr.plg b/trunk/yav_mcu_bsr.plg index df68f95..699fb23 100644 --- a/trunk/yav_mcu_bsr.plg +++ b/trunk/yav_mcu_bsr.plg @@ -1,79 +1,8 @@ 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(190) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(202) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(206) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(257) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(294) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(373) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(381) : CC78K0R warning W0401: Conversion may lose significant digits -pm.c(854) : 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 -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 magic.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\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 -Compilation complete, 0 error(s) and 9 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(73) : CC78K0R warning W0745: Expected function prototype adc.c(78) : CC78K0R warning W0401: Conversion may lose significant digits @@ -84,53 +13,14 @@ adc.c(235) : CC78K0R warning W0401: Conversion may lose significant digits Compilation complete, 0 error(s) and 6 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(114) : CC78K0R warning W0745: Expected function prototype -accero.c(123) : 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 -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\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(322) : 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 Object Conversion Complete, 0 error(s) and 0 warning(s) found. -C:\WINDOWS\system32\cmd.exe /c ruby nec_s_2_bsrbin.rb bsr.hex -nec_s_2_bsrbin.rb:2: warning: variable $KCODE is no longer effective; ignored +C:\WINDOWS\system32\cmd.exe /c ruby nec_s_2_bsrbin2.rb bsr.hex +nec_s_2_bsrbin2.rb:2: warning: variable $KCODE is no longer effective; ignored intel-HEX to bsr bin converter file converted! -Build Total error(s) : 0 Total warning(s) : 36 +Build Total error(s) : 0 Total warning(s) : 6 diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 6a79548..882d2da 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -78,10 +78,10 @@ Symbol Type=OFF Language=C Kanji=SJIS [Source] -Geometry=173, 84, 1025, 1014 +Geometry=202, 65, 1025, 1014 Window=Normal -DispStart=68 -CaretPos=69,0 +DispStart=32 +CaretPos=88,0 Mode=Normal DispFile= Address1= @@ -139,19 +139,11 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON -[Source1] -Geometry=0, 0, 1025, 1014 -Window=Normal -DispStart=159 -CaretPos=1,0 -Mode=Normal -DispFile=self_flash.c -Accumulative=ON [Assemble] Geometry=605, 2, 600, 400 Window=Normal -DispStart=1138 -CaretPos=1138,27 +DispStart=640 +CaretPos=640,27 Address1= Address2= Address3= @@ -247,32 +239,6 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON -[Memory1] -Geometry=0, 0, 550, 538 -Window=Normal -Boundary=163 -Format=Hex -Mode=Byte -Endian=Little -Ascii=OFF -Idtag=OFF -Address= -DispStart=00000ED0 -CaretPosData=0, 237 -CaretPosAscii=0, 237 -[Memory2] -Geometry=11, 504, 550, 576 -Window=Normal -Boundary=163 -Format=Hex -Mode=Byte -Endian=Little -Ascii=OFF -Idtag=OFF -Address= -DispStart=00004760 -CaretPosData=0, 1142 -CaretPosAscii=0, 1142 [Memory fill] Scope=0, 0 Code=0 @@ -285,7 +251,7 @@ Destination=0 [I/O Port] Line=0 [Stack] -Geometry=1169, 364, 400, 300 +Geometry=1072, 361, 400, 300 Window=Normal Boundary=13762687 Mode=Proper @@ -889,7 +855,7 @@ Detail=OFF Last Name= Count=0 [Variable] -Geometry=1225, 6, 354, 364 +Geometry=1225, 6, 354, 910 Window=Normal Boundary=13762700 0=.vreg_ctr,P,N,A,+,1 @@ -898,22 +864,22 @@ Boundary=13762700 3=.p5,B,S,A,+,1 Line=4 [Quick Watch] -0=rtccmk,P,A,1 -1=rtciimk,P,A,1 -2=wdte,P,A,1 -3=SEC,P,A,1 -4=rtcif,P,A,1 -5=vreg_twl,P,A,1 -6=pm0,P,A,1 -7=data,P,A,1 -8=P5.3,P,A,1 -9=p4.3,P,A,1 -10=pu0,P,A,1 -11=p5,B,A,1 -12=P7,B,A,1 -13=cmd_BL,P,A,1 -14=vreg_ctr,P,A,1 -15=MGC_FOOT,P,A,1 +0=renge_flg_interval,P,A,1 +1=rtccmk,P,A,1 +2=rtciimk,P,A,1 +3=wdte,P,A,1 +4=SEC,P,A,1 +5=rtcif,P,A,1 +6=vreg_twl,P,A,1 +7=pm0,P,A,1 +8=data,P,A,1 +9=P5.3,P,A,1 +10=p4.3,P,A,1 +11=pu0,P,A,1 +12=p5,B,A,1 +13=P7,B,A,1 +14=cmd_BL,P,A,1 +15=vreg_ctr,P,A,1 [Software Break] Geometry=1204, 674, 500, 428 Window=Normal @@ -930,19 +896,7 @@ Name2=Swb00002 Address2=task_sys.c#_chk_emergencyExit+0x4 Window2=ASM Status2=ON -Name3=Swb00005 -Address3=loader.c#_main+0x52 -Window3=ASM -Status3=ON -Name4=Swb00007 -Address4=loader.c#_main+0x55 -Window4=ASM -Status4=ON -Name5=Swb00001 -Address5=loader.c#_main+0x4e -Window5=ASM -Status5=ON -Count=6 +Count=3 [Reset] Debugger=ON Symbol=OFF diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index fa121e1..14344db 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -1,6 +1,6 @@ [ProjectManager] Version=6.00 -Path=C:\78k_data\yav-mcu_updater\ +Path=C:\78k_data\yav-mcu-bsr_0D\ Title=yav-mcu Series=78K0R.PM Device=uPD79F0104 @@ -38,7 +38,7 @@ BuildModeName=BSR_WM0 TargetFile=0 [BuildBefore-AfterCmd] Before1=touch magic.c -After1=ruby nec_s_2_bsrbin.rb bsr.hex +After1=ruby nec_s_2_bsrbin2.rb bsr.hex [Options.OC78K0R 0] Version=100 O0=.\bsr.hex @@ -285,7 +285,7 @@ ZB= Etcetera0= Etcetera1=boot.lmf CommandFile=0 -OFILE=C:\78k_data\yav-mcu_updater\bsr.lmf +OFILE=C:\78k_data\yav-mcu-bsr_0D\bsr.lmf [Options.LK78K0R 3] Version=100 O0=bsr_bsr.lmf diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index 1375d2b..d856b32 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,11 +1,11 @@ [ProjectManager] FrameMax=0 -FrameX=132 -FrameY=37 +FrameX=364 +FrameY=162 FrameCX=1299 FrameCY=1043 OpenFile1=task_sys.c,0,521,328,1765,1085,25,250,25,0 -OpenFile2=bsr_mcu.dr,0,198,198,1177,834,0,54,0,0 +OpenFile2=bsr_mcu.dr,0,198,198,1177,834,0,53,0,0 OpenFile3=loader.c,0,266,31,1510,788,23,43,23,0 OpenFile4=sw.c,0,132,132,1376,889,0,165,17,0 OpenFile5=config.h,0,282,262,1526,1019,0,19,0,0 @@ -19,11 +19,11 @@ OpenFile11=accero.c,0,272,165,1516,922,0,114,13,0 OpenFile12=main.c,0,66,66,1034,691,0,70,0,0 OpenFile13=renge\renge.c,0,285,287,1264,923,15,225,0,0 OpenFile14=task_misc.c,0,88,88,1056,713,5,159,5,0 -OpenFile15=i2c_twl.c,0,44,44,1288,801,34,67,0,0 -OpenFile16=pm.c,0,421,154,1400,790,0,694,0,0 -OpenFile17=adc.c,0,220,220,1199,856,0,111,0,0 +OpenFile15=pm.c,0,421,154,1400,790,0,694,0,0 +OpenFile16=adc.c,0,220,220,1199,856,0,111,0,0 +OpenFile17=i2c_twl.c,0,44,44,1288,801,34,67,0,0 OpenFile18=OutputWindow -OutputPos=0,101,509,107,1216 +OutputPos=0,421,829,388,1497 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0