diff --git a/snake_trunk/VCProj/bsr_trunk.sdf b/snake_trunk/VCProj/bsr_trunk.sdf index 2c016dc..ec708df 100644 Binary files a/snake_trunk/VCProj/bsr_trunk.sdf and b/snake_trunk/VCProj/bsr_trunk.sdf differ diff --git a/snake_trunk/VCProj/bsr_trunk.suo b/snake_trunk/VCProj/bsr_trunk.suo index f47695a..eeccb19 100644 Binary files a/snake_trunk/VCProj/bsr_trunk.suo and b/snake_trunk/VCProj/bsr_trunk.suo differ diff --git a/snake_trunk/loader.c b/snake_trunk/loader.c index 78c6468..2b0393f 100644 --- a/snake_trunk/loader.c +++ b/snake_trunk/loader.c @@ -36,9 +36,9 @@ -#define REG_BIT_RESF_WDT 0x10 -#define REG_BIT_RESF_TRAP 0x80 -#define REG_BIT_RESF_LVI 0x01 +#define REG_BIT_RESF_WDT (1<<4) +#define REG_BIT_RESF_TRAP (1<<7) +#define REG_BIT_RESF_LVI (1<<0) @@ -293,6 +293,10 @@ void hdwinit( void ) 追加のレジスタ初期化を行います。 出来るだけ hdwinit には書かない方針です。 + + 【備考】 +  ファームアップデートでここに来た場合、(system_status.reboot == 1) + レジスタの値は直前の値を維持しています。 ***********************************************/ static void hdwinit2( ) { diff --git a/snake_trunk/yav_mcu_bsr.prk b/snake_trunk/yav_mcu_bsr.prk index f13db37..e9067b3 100644 --- a/snake_trunk/yav_mcu_bsr.prk +++ b/snake_trunk/yav_mcu_bsr.prk @@ -4,11 +4,12 @@ FrameX=23 FrameY=42 FrameCX=1320 FrameCY=987 -OpenFile1=config.h,0,206,11,1242,491,17,5,17,0 -OpenFile2=OutputWindow -OutputPos=0,296,827,375,1267 -OpenFile3=ProjectWindow +OpenFile1=ProjectWindow PrjPos=0,0,706,0,291 +OpenFile2=config.h,0,206,11,1242,491,0,6,0,0 +OpenFile3=OutputWindow +OutputPos=0,296,827,375,1267 +OpenFile4=config.h,0,100,100,1125,668,17,5,0,0 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] ProjectWindowDispType=0 diff --git a/snake_trunk/yav_mcu_bsr.sdb b/snake_trunk/yav_mcu_bsr.sdb index b7f2720..6bbe4f8 100644 --- a/snake_trunk/yav_mcu_bsr.sdb +++ b/snake_trunk/yav_mcu_bsr.sdb @@ -40,7 +40,7 @@ T=51c8f7f4 7=i2c_mcu.h 8=pool.h [magic.c] -T=52b3e6e7 +T=52b3e79d 1=magic.h 2=config.h [WDT.c]