diff --git a/trunk/config.h b/trunk/config.h index 5da9509..17296de 100644 --- a/trunk/config.h +++ b/trunk/config.h @@ -8,7 +8,7 @@ #define MCU_VER_MAJOR 0x00 #define MCU_VER_MINOR 0x0D -//#define _OVERCLOCK_ +#define _OVERCLOCK_ // 古い(C)電源ボード //#define _PM_BUG_ diff --git a/trunk/i2c_ctr.c b/trunk/i2c_ctr.c index c3085e2..0c0d981 100644 --- a/trunk/i2c_ctr.c +++ b/trunk/i2c_ctr.c @@ -208,7 +208,11 @@ void IIC_ctr_Init( void ) IICAPR0 = 1; /* set INTIICA high priority */ IICAPR1 = 0; /* set INTIICA high priority */ +#ifdef _MODEL_TEG2_ + P6 &= ~0x3; +#else P20 &= ~0x3; +#endif SVA = IIC_C_SLAVEADDRESS; IICF = 0x01; @@ -230,7 +234,11 @@ void IIC_ctr_Init( void ) IICE = 1; +#ifdef _MODEL_TEG2_ + PM6 &= ~0x3; /* set clock pin for IICA */ +#else PM20 &= ~0x3; /* set clock pin for IICA */ +#endif } diff --git a/trunk/i2c_twl.c b/trunk/i2c_twl.c index 2e99d4c..9c9377e 100644 --- a/trunk/i2c_twl.c +++ b/trunk/i2c_twl.c @@ -50,7 +50,6 @@ void IIC_twl_Stop( void ) void IIC_twl_Init( void ) { } - #else @@ -168,7 +167,7 @@ void IIC_twl_Init( void ) IICAPR0 = 0; /* set INTIICA high priority */ IICAPR1 = 0; /* set INTIICA high priority */ - P6 &= ~0x3; + P20 &= ~0x3; SVA = IIC_T_SLAVEADDRESS; IICF = 0x01; @@ -188,7 +187,8 @@ void IIC_twl_Init( void ) IICAMK = 0; // 割り込みを許可 IICE = 1; - PM6 &= ~0x3; /* set clock pin for IICA */ + + PM20 &= ~0x3; /* set clock pin for IICA */ LREL = 1; } diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index 5a99e35..28f8149 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -4,7 +4,7 @@ Target=IDK0R32G [Configuration] Chip=uPD79F0104 Internal Rom=32KB -Internal Ram=1536B +Internal Ram=1536KB Clock=Target Sub Clock=Target Peripheral Break=0x2 diff --git a/trunk/yav_mcu_bsr.prj b/trunk/yav_mcu_bsr.prj index 446ffef..95532a0 100644 --- a/trunk/yav_mcu_bsr.prj +++ b/trunk/yav_mcu_bsr.prj @@ -596,9 +596,9 @@ Floatingpoint=0 Muldivunit=1 Mulunit=1 Startup=s0rml.rel -Library1=cl0rm.lib -Library2=cl0rmf.lib -Library3= +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 @@ -668,9 +668,9 @@ Floatingpoint=0 Muldivunit=1 Mulunit=1 Startup=s0rll.rel -Library1=cl0rm.lib -Library2=cl0rmf.lib -Library3= +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib VF78K0Rchk=0 VF78K0Rvs= [Options.CC78K0R 2] @@ -747,9 +747,9 @@ Floatingpoint=0 Muldivunit=1 Mulunit=1 Startup=s0rm.rel -Library1=cl0rm.lib -Library2=cl0rmf.lib -Library3= +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 @@ -828,9 +828,9 @@ Floatingpoint=0 Muldivunit=1 Mulunit=1 Startup=s0rml.rel -Library1=cl0rm.lib -Library2=cl0rmf.lib -Library3= +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 @@ -905,9 +905,9 @@ Floatingpoint=0 Muldivunit=1 Mulunit=1 Startup=s0rml.rel -Library1=cl0rm.lib -Library2=cl0rmf.lib -Library3= +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 @@ -986,9 +986,9 @@ Floatingpoint=0 Muldivunit=1 Mulunit=1 Startup=s0rml.rel -Library1=cl0rm.lib -Library2=cl0rmf.lib -Library3= +Library1=cl0rdm.lib +Library2=cl0rm.lib +Library3=cl0rmf.lib VfiFileBoot0= VfiFileBoot1=boot.vfi VF78K0Rchk=0 diff --git a/trunk/yav_mcu_bsr.prk b/trunk/yav_mcu_bsr.prk index a42b268..8bdcbef 100644 --- a/trunk/yav_mcu_bsr.prk +++ b/trunk/yav_mcu_bsr.prk @@ -1,21 +1,16 @@ [ProjectManager] FrameMax=0 -FrameX=151 -FrameY=50 +FrameX=86 +FrameY=74 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,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=vreg_ctr.c,0,159,252,1138,888,30,201,38,0 -OpenFile6=renge\renge_task_immediate.h,0,308,308,1276,933,0,23,0,0 -OpenFile7=renge\renge_defs.h,0,22,22,990,647,0,50,0,0 -OpenFile8=ProjectWindow +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,8,17,20,0 +OpenFile5=ProjectWindow PrjPos=0,2,754,3,253 -OpenFile9=renge\renge.h,0,502,637,1746,1394,29,16,29,0 -OpenFile10=main.c,0,66,66,913,691,22,70,0,0 -OpenFile11=OutputWindow +OpenFile6=OutputWindow OutputPos=0,421,829,388,1497 ActivePRJ=yav_mcu_bsr.prj [ProjectWindow] diff --git a/trunk/yav_mcu_bsr.sdb b/trunk/yav_mcu_bsr.sdb index 917f7d4..4577d6e 100644 --- a/trunk/yav_mcu_bsr.sdb +++ b/trunk/yav_mcu_bsr.sdb @@ -11,14 +11,14 @@ T=4b445f00 7=rtc.h 8=reboot.h [pm.c] -T=4b5d7b67 +T=4b60d9da 1=incs.h 2=adc.h 3=led.h 4=pm.h 5=renge\renge.h [i2c_ctr.c] -T=4b5e46d7 +T=4b60e64a 1=incs.h 2=accero.h [main.c] @@ -31,7 +31,7 @@ T=4b57fe0b 6=led.h 7=adc.h [magic.c] -T=4b5e3f7f +T=4b60e7cc 1=config.h [WDT.c] T=4afd21ca @@ -41,7 +41,7 @@ T=4b0bae4b 1=incs.h 2=i2c_mcu.h [i2c_twl.c] -T=4b5e46a6 +T=4b60e5e8 1=incs.h 2=i2c_twl_defs.h [ini_VECT.c] @@ -55,7 +55,7 @@ T=4b4438bb T=4b4438a1 1=incs.h [vreg_ctr.c] -T=4b5e46c1 +T=4b60da5e 1=incs.h 2=vreg_ctr.h 3=rtc.h @@ -109,7 +109,7 @@ T=4b4d6c9b 6=pm.h 7=rtc.h [task_debug.c] -T=4b5d91b9 +T=4b60d9da 1=incs.h 2=renge\renge.h 3=pm.h @@ -147,7 +147,7 @@ T=4b023fdb [user_define.h] T=4b442a95 [config.h] -T=4b5e3100 +T=4b60e553 [bsr_system.h] T=4b3064de [renge\renge.h]