diff --git a/branches/1.34_standaloneTrial_1.94/bsr.hex b/branches/1.34_standaloneTrial_1.94/bsr.hex index b2b1a8f..70484c6 100644 --- a/branches/1.34_standaloneTrial_1.94/bsr.hex +++ b/branches/1.34_standaloneTrial_1.94/bsr.hex @@ -250,8 +250,8 @@ :100F91009DDAADDC5BD9085BD808BDD8D7C3C7F3F0 :100FA100728EFDC162314C410036164E1161A07244 :070FB100C09EFD62C6C2D71D -:0A0FF60031373A32343A3538000042 -:0A20000031373A32343A3538000027 +:0A0FF60031333A32343A353400004A +:0A20000031333A32343A353400002F :10200A00AEF0B430B740BA30BB50BBB0BC50BD1014 :10201A00BD60BDB0BFE0C2B0C420C7B0CAE0CE1038 :10202A0001F0141014200630639049006E00777096 @@ -552,7 +552,7 @@ :10329000710B9E31342213713322717B9E8F10FC8F :1032A0009E9A8F11FC9E9B717A9EC6D7CFDBFB5CEA :1032B000CFDCFB5FCFFCFB5DCF30FC36CF31FCC9F0 -:1032C000D7C7CFD8FB11CFD9FB94CF00FCFFF501B6 +:1032C000D7C7CFD8FB11CFD9FB95CF00FCFFF501B5 :1032D000FCF502FCF503FCF504FCCFFDFB20F5FE3C :1032E000FB5600664C64DE08723848FB0086EFF33C :1032F000C6D7C788061617F1E73403002361E3ED4C @@ -735,7 +735,7 @@ :103E0000FD61E8ED403FCF5CFD048F22F9318FE783 :103E100023DD0B24020024030061C8ED403F301B6A :103E200000427AFCDF16F64282FCDF30E0C150101F -:103E3000FDE836C030E803BF82FCEF203077014256 +:103E3000FDE836C0305307BF82FCEF2030770142E7 :103E40007AFCDF185002C15010FDE836C0F64280FF :103E5000FCDF098FFCFB5010D6BF80FCF64280FCD3 :103E6000DD0DB280FCE64280FC61F8712024F9F699 @@ -996,6 +996,6 @@ :104E4000A32FE530423F9709C24001000000983A85 :064E5000F82AFF0000003B :084E5600317503F7332312D775 -:0A4FF60031373A32343A3538000002 +:0A4FF60031333A32343A353400000A :00000001FF  \ No newline at end of file diff --git a/branches/1.34_standaloneTrial_1.94/bsr.lmf b/branches/1.34_standaloneTrial_1.94/bsr.lmf index 422b48f..1661939 100644 Binary files a/branches/1.34_standaloneTrial_1.94/bsr.lmf and b/branches/1.34_standaloneTrial_1.94/bsr.lmf differ diff --git a/branches/1.34_standaloneTrial_1.94/bsr_k0r.map b/branches/1.34_standaloneTrial_1.94/bsr_k0r.map index b4a3f37..e2aff9f 100644 --- a/branches/1.34_standaloneTrial_1.94/bsr_k0r.map +++ b/branches/1.34_standaloneTrial_1.94/bsr_k0r.map @@ -1,7 +1,7 @@ -78K0R Linker W1.33 Date:28 Jun 2011 Page: 1 +78K0R Linker W1.33 Date:30 Jun 2011 Page: 1 Command: -yc:\program files (x86)\nec electronics tools\dev -_msgoff - obsr.lmf ..\..\..\..\Program Files (x86)\NEC Electronics Tool diff --git a/branches/1.34_standaloneTrial_1.94/config.h b/branches/1.34_standaloneTrial_1.94/config.h index 61a0335..4d47f89 100644 --- a/branches/1.34_standaloneTrial_1.94/config.h +++ b/branches/1.34_standaloneTrial_1.94/config.h @@ -29,7 +29,7 @@ #ifdef _TAIKENDAI_ -#define MCU_VER_MINOR 0x94 +#define MCU_VER_MINOR 0x95 // 0x90 1.31 相当 HOMEに入れてしまうのをスイッチのマスクで対策 // ROM不足のため、電池パラメータ削除 // 0x93 1.34(1.05) 相当 に↑の改造 diff --git a/branches/1.34_standaloneTrial_1.94/sw.c b/branches/1.34_standaloneTrial_1.94/sw.c index a9cfb72..ad70750 100644 --- a/branches/1.34_standaloneTrial_1.94/sw.c +++ b/branches/1.34_standaloneTrial_1.94/sw.c @@ -23,7 +23,7 @@ #define FORCEOFF_THREASHOLD (u8)( 4000 / INTERVAL_TSK_SW ) */ #define TIME_MUKAN (u8)( 300 / INTERVAL_TSK_SW ) -#define TIME_MUKAN_PWSW (u16)( 8000 / INTERVAL_TSK_SW ) +#define TIME_MUKAN_PWSW (u16)( 15000 / INTERVAL_TSK_SW ) //========================================================= u16 SW_pow_count; diff --git a/branches/1.34_standaloneTrial_1.94/yav_mcu_bsr.prk b/branches/1.34_standaloneTrial_1.94/yav_mcu_bsr.prk index 6259bda..c60379e 100644 --- a/branches/1.34_standaloneTrial_1.94/yav_mcu_bsr.prk +++ b/branches/1.34_standaloneTrial_1.94/yav_mcu_bsr.prk @@ -1,13 +1,14 @@ [ProjectManager] -FrameMax=0 -FrameX=0 -FrameY=69 -FrameCX=1550 -FrameCY=921 +FrameMax=1 +FrameX=25 +FrameY=14 +FrameCX=1614 +FrameCY=1005 OpenFile1=ProjectWindow PrjPos=0,0,706,0,291 -OpenFile2=config.h,0,367,92,1482,693,0,17,0,0 -OpenFile3=OutputWindow +OpenFile2=config.h,0,328,68,1443,669,29,35,29,0 +OpenFile3=sw.c,0,150,150,1469,736,34,26,18,0 +OpenFile4=OutputWindow OutputPos=0,32,734,735,1861 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] diff --git a/branches/1.34_standaloneTrial_1.94/yav_mcu_bsr.sdb b/branches/1.34_standaloneTrial_1.94/yav_mcu_bsr.sdb index 14910ce..2c4f89f 100644 --- a/branches/1.34_standaloneTrial_1.94/yav_mcu_bsr.sdb +++ b/branches/1.34_standaloneTrial_1.94/yav_mcu_bsr.sdb @@ -1,7 +1,7 @@ [SdbInfo] Ver=5 [loader.c] -T=4e09835b +T=4e099806 1=incs_loader.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h @@ -22,11 +22,11 @@ T=4e09838b 7=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 8=fsl_user.h [i2c_ctr.c] -T=4e09835c +T=4e09980a 1=config.h 2=incs.h [main.c] -T=4e09835c +T=4e09980a 1=incs_loader.h 2=WDT.h 3=rtc.h @@ -36,31 +36,31 @@ T=4e09835c 7=adc.h 8=pool.h [magic.c] -T=4e098e2a +T=4e09980a 1=config.h 2=magic.h [WDT.c] -T=4e09835c +T=4e09980a 1=incs_loader.h [i2c_mcu.c] -T=4e09835b +T=4e099807 1=incs_loader.h 2=i2c_mcu.h [i2c_twl.c] -T=4e09835b +T=4e099806 1=config.h 2=incs.h 3=i2c_twl_defs.h 4=i2c_twl.h [led.c] -T=4e09835c +T=4e09980a 1=incs.h 2=led.h [rtc.c] -T=4e09835c +T=4e09980a 1=incs.h [vreg_ctr.c] -T=4e09835c +T=4e09980a 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -71,14 +71,14 @@ T=4e09835c 8=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 9=fsl_user.h [vreg_twl.c] -T=4e09835b +T=4e099807 1=incs.h 2=jhl_defs.h 3=led.h 4=vreg_twl.h 5=vreg_ctr.h [adc.c] -T=4e09835c +T=4e09980a 1=incs.h 2=adc.h 3=pm.h @@ -86,7 +86,7 @@ T=4e09835c 5=vreg_twl.h 6=voltable.h [renge\renge.c] -T=4e098359 +T=4e099804 1=renge\renge.h 2=renge\renge_task_intval.h 3=renge\renge_task_immediate.h @@ -95,12 +95,12 @@ T=4e098359 6=user_define.h 7=bsr_system.h [accero.c] -T=4e09835c +T=4e09980a 1=config.h 2=incs.h 3=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h [self_flash.c] -T=4e09835b +T=4e099806 1=incs_loader.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h 3=fsl_user.h @@ -109,7 +109,7 @@ T=4e09835b 6=magic.h 7=pm.h [sw.c] -T=4e098978 +T=4e0bfa92 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -118,13 +118,13 @@ T=4e098978 6=rtc.h 7=sw.h [task_debug.c] -T=4e09835c +T=4e09980a 1=incs_loader.h 2=renge\renge.h 3=pm.h 4=accero.h [task_misc.c] -T=4e09835b +T=4e099806 1=incs.h 2=renge\renge.h 3=pm.h @@ -134,7 +134,7 @@ T=4e09835b 7=led.h 8=vreg_twl.h [task_sys.c] -T=4e09835b +T=4e099807 1=incs.h 2=i2c_twl.h 3=i2c_ctr.h @@ -146,7 +146,7 @@ T=4e09835b 9=adc.h 10=self_flash.h [pedo_alg_thre_det2.c] -T=4e09835c +T=4e09980a 1=incs.h 2=..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h 3=accero.h @@ -154,10 +154,10 @@ T=4e09835c 5=pedo_lpf_coeff.h 6=pool.h [ini_VECT.c] -T=4e09835c +T=4e09980a 1=config.h [task_status.c] -T=4e09835c +T=4e09980a 1=incs_loader.h 2=renge\renge.h 3=pm.h @@ -165,7 +165,7 @@ T=4e09835c 5=adc.h 6=i2c_mcu.h [incs_loader.h] -T=4e09835c +T=4e09980a 1=jhl_defs.h 2=user_define.h 3=bsr_system.h @@ -176,48 +176,48 @@ T=4e09835c 8=i2c_mcu.h 9=WDT.h [jhl_defs.h] -T=4e09835b +T=4e099806 1=config.h [config.h] -T=4e098fd7 +T=4e0bfa92 [user_define.h] -T=4e09835c +T=4e09980a [bsr_system.h] -T=4e09835c +T=4e09980a [renge\renge.h] -T=4e098359 +T=4e099804 1=renge\renge_defs.h 2=renge\renge_task_immediate.h [renge\renge_defs.h] -T=4e098359 +T=4e099804 [renge\renge_task_immediate.h] -T=4e098359 +T=4e099804 1=renge\renge_defs.h [vreg_ctr.h] -T=4e09835c +T=4e09980a 1=config.h [vreg_twl.h] -T=4e09835b +T=4e099807 [loader.h] -T=4e09835b +T=4e099806 [i2c_mcu.h] -T=4e09835b +T=4e09980a [WDT.h] -T=4e09835c +T=4e09980a [fsl_user.h] -T=4e09835b +T=4e09980a [i2c_ctr.h] -T=4e09835c +T=4e09980a [pm.h] -T=4e09835c +T=4e09980a [rtc.h] -T=4e09835c +T=4e09980a [reboot.h] -T=4e09835c +T=4e09980a [magic.h] -T=4e09835c +T=4e09980a [incs.h] -T=4e09835b +T=4e099806 1=jhl_defs.h 2=user_define.h 3=bsr_system.h @@ -234,37 +234,37 @@ T=4e09835b 14=adc.h 15=WDT.h [i2c_twl.h] -T=4e09835b +T=4e099806 [accero.h] -T=4e09835c +T=4e09980a 1=jhl_defs.h 2=pedometer.h [pedometer.h] -T=4e09835b +T=4e099806 [sw.h] -T=4e09835b +T=4e099807 1=config.h [adc.h] -T=4e09835c +T=4e09980a 1=jhl_defs.h [led.h] -T=4e09835c +T=4e09980a [batt_params.h] -T=4e09835c +T=4e09980a [pool.h] -T=4e09835b +T=4e099807 1=pedometer.h [i2c_twl_defs.h] -T=4e09835c +T=4e09980a [voltable.h] -T=4e09835c +T=4e09980a [renge\renge_task_intval.h] -T=4e098359 +T=4e099804 1=renge\renge_defs.h [self_flash.h] -T=4e09835b +T=4e099806 [pedo_lpf_coeff.h] -T=4e09835c +T=4e09980a [..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\fsl.h] T=49a3bd4e [..\..\..\..\Program Files (x86)\NEC Electronics Tools\CC78K0R\W2.13\inc78k0r\math.h]