diff --git a/trunk/VCProj/bsr_trunk.sdf b/trunk/VCProj/bsr_trunk.sdf index 303fa95..fda7336 100644 Binary files a/trunk/VCProj/bsr_trunk.sdf and b/trunk/VCProj/bsr_trunk.sdf differ diff --git a/trunk/VCProj/bsr_trunk.suo b/trunk/VCProj/bsr_trunk.suo index 7ad5485..edae829 100644 Binary files a/trunk/VCProj/bsr_trunk.suo and b/trunk/VCProj/bsr_trunk.suo differ diff --git a/trunk/i2c_ctr.c b/trunk/i2c_ctr.c index 8f73a6a..d17daa0 100644 --- a/trunk/i2c_ctr.c +++ b/trunk/i2c_ctr.c @@ -19,34 +19,34 @@ // ワーキングモデルはI2Cが逆 // TEGは回路図でテレコ -#define ACKD ACKD1 -#define ACKE ACKE1 -#define COI COI1 -#define IICAEN IICA1EN -#define IICRSV IICRSV1 -#define IICA IICA1 -#define IICAIF IICAIF1 -#define IICAMK IICAMK1 -#define IICAPR0 IICAPR11 -#define IICAPR1 IICAPR01 -#define IICCTL0 IICCTL10 -#define IICE IICE1 -#define IICF IICF1 -#define IICS IICS1 -#define IICWH IICWH1 -#define IICWL IICWL1 -#define LREL LREL1 -#define SPD SPD1 -#define SPIE SPIE1 -#define STCEN STCEN1 -#define STD STD1 -#define SVA SVA1 -#define WREL WREL1 -#define WTIM WTIM1 -#define TRC TRC1 -#define SMC SMC1 -#define DFC DFC1 - +#define ACKD ACKD1 +#define ACKE ACKE1 +#define COI COI1 +#define IICAEN IICA1EN +#define IICRSV IICRSV1 +#define IICA IICA1 +#define IICAIF IICAIF1 +#define IICAMK IICAMK1 +#define IICAPR0 IICAPR11 +#define IICAPR1 IICAPR01 +#define IICCTL0 IICCTL10 +#define IICE IICE1 +#define IICF IICF1 +#define IICS IICS1 +#define IICWH IICWH1 +#define IICWL IICWL1 +#define LREL LREL1 +#define SPD SPD1 +#define SPIE SPIE1 +#define STCEN STCEN1 +#define STD STD1 +#define SVA SVA1 +#define WREL WREL1 +#define WTIM WTIM1 +#define TRC TRC1 +#define SMC SMC1 +#define DFC DFC1 +#define IICS IICS1 #endif @@ -89,7 +89,7 @@ __interrupt void int_iic_ctr( ) u8 rx_buf; static u8 adrs_access_from; // バーストアクセスの時に使う - u8 i2c_stat = IICS1; // volatileのため + u8 i2c_stat = IICS; // volatileのため // 読み出し終了 if( !bit_iics_ackd // 割り込み要因はNAK(データ送信の最後) @@ -290,7 +290,7 @@ void IIC_ctr_Init( void ) IICE = 1; - PM20 &= ~0x3; /* set clock pin for IICA */ + PM20 &= ~0x3; /* set clock pin for IICA */ // *twlと*ctrで違いますよ! state = IIC_IDLE; } diff --git a/trunk/i2c_twl.c b/trunk/i2c_twl.c index e4014d0..2bd82b5 100644 --- a/trunk/i2c_twl.c +++ b/trunk/i2c_twl.c @@ -224,7 +224,7 @@ void IIC_twl_Init( void ) IICE = 1; - PM20 &= ~0x3; /* set clock pin for IICA */ + PM3 &= ~0x3; /* set clock pin for IICA */ // *twlと*ctrで違いますよ! LREL = 1; } diff --git a/trunk/yav_mcu_bsr.pri b/trunk/yav_mcu_bsr.pri index e3b2140..1c108c1 100644 --- a/trunk/yav_mcu_bsr.pri +++ b/trunk/yav_mcu_bsr.pri @@ -33,7 +33,7 @@ Coverage=OFF Timer=OFF Tracer=OFF [Load File] -Dir=\\tsclient\C\78k_data\yav-mcu-basara\trunk\ +Dir=\\tsclient\C\78k_data\tahara_analogKey\ SaveFilter=0 Start=0 End=0 @@ -41,16 +41,16 @@ LoadFilter=5 Offset=0 Object=ON Symbol=ON -Erase=OFF +Erase=ON HighSpeed=OFF Symbol Reset=ON CPU Reset=ON -File1=\\tsclient\C\78k_data\yav-mcu-basara\trunk\bsr.lmf +File1=\\tsclient\C\78k_data\tahara_analogKey\bsr.lmf LoadFilter1=5 Offset1=0 Object1=ON Symbol1=ON -Erase1=OFF +Erase1=ON HighSpeed1=OFF CPU Reset1=ON Symbol Reset1=ON @@ -79,9 +79,9 @@ Language=C Kanji=SJIS [Source] Geometry=474, 10, 769, 857 -Window=Normal -DispStart=248 -CaretPos=277,0 +Window=Hide +DispStart=1 +CaretPos=0,0 Mode=Normal DispFile= Address1= @@ -139,27 +139,11 @@ SaveRange=Screen SaveStart= SaveEnd= Accumulative=ON -[Source1] -Geometry=282, 121, 769, 857 -Window=Normal -DispStart=251 -CaretPos=276,24 -Mode=Normal -DispFile=\\tsclient\C\78k_data\yav-mcu-basara\trunk\task_misc.c -Accumulative=ON -[Source2] -Geometry=244, 62, 769, 802 -Window=Normal -DispStart=499 -CaretPos=536,12 -Mode=Normal -DispFile=\\tsclient\C\78k_data\yav-mcu-basara\trunk\task_sys.c -Accumulative=ON [Assemble] Geometry=50, 50, 600, 400 Window=Normal -DispStart=15288 -CaretPos=15311,27 +DispStart=3110 +CaretPos=3110,27 Address1= Address2= Address3= @@ -195,8 +179,8 @@ Data16= Case=ON Scan=OFF Direction=Down -FindStart= -FindEnd= +FindStart=0 +FindEnd=0 SaveRange=Screen SaveStart= SaveEnd= @@ -293,7 +277,7 @@ Address16= Boundary=0, 0 Mode=Hex Attribute=Show -Sort=Address +Sort=Unsort Pickup=OFF SelectSort=Address Last Name= @@ -885,19 +869,19 @@ SaveEnd= Geometry=0, 0, 0, 0 Window=Hide Mode=Hex -Boundary=0 +Boundary=62 Pickup=OFF Name=Functional Register Bank=0 -RP0=3 -RP1=3 -RP2=3 -RP3=3 -PC=3 -SP=3 -PSW=3 -ES=3 -CS=3 +RP0=1 +RP1=1 +RP2=1 +RP3=1 +PC=1 +SP=1 +PSW=1 +ES=1 +CS=1 [Event Manager] Geometry=0, 0, 0, 0 Window=Hide @@ -1005,31 +989,7 @@ Line=7 Geometry=19, 162, 500, 200 Window=Normal Width=150 30 200 100 -Name0=Swb00006 -Address0=task_sys.c#_chk_emergencyExit+0x13 -Window0=ASM -Status0=ON -Name1=Swb00007 -Address1=task_sys.c#_force_off_check+0x4 -Window1=ASM -Status1=ON -Name2=Swb00003 -Address2=task_sys.c#_chk_emergencyExit+0x1a -Window2=ASM -Status2=ON -Name3=Swb00008 -Address3=task_misc.c#_tski_do_command0+0x5e -Window3=ASM -Status3=ON -Name4=Swb00002 -Address4=task_misc.c#_tski_do_command0+0x22 -Window4=ASM -Status4=ON -Name5=Swb00004 -Address5=task_misc.c#_tski_do_command0+0x44 -Window5=ASM -Status5=ON -Count=6 +Count=0 [Reset] Debugger=ON Symbol=OFF