diff --git a/homework4/.eide/eide.json b/homework4/.eide/eide.json index 8c6e288..27a88af 100644 --- a/homework4/.eide/eide.json +++ b/homework4/.eide/eide.json @@ -18,7 +18,9 @@ }, "targets": { "Debug": { - "excludeList": [], + "excludeList": [ + "src/test2.c" + ], "toolchain": "Keil_C51", "compileConfig": { "options": "null" diff --git a/homework4/homework4.pdsprj b/homework4/homework4.pdsprj index 1c94be2..ca058b3 100644 Binary files a/homework4/homework4.pdsprj and b/homework4/homework4.pdsprj differ diff --git a/homework4/src/homework4.h b/homework4/src/homework4.h index 8e701c5..caa7d2b 100644 --- a/homework4/src/homework4.h +++ b/homework4/src/homework4.h @@ -6,17 +6,17 @@ #include -sbit ADDR0 = P1 ^ 0; -sbit ADDR1 = P1 ^ 1; -sbit ADDR2 = P1 ^ 2; -sbit ADDR3 = P1 ^ 3; -sbit ENLED = P1 ^ 4; +sbit D_ADDR0 = P1 ^ 0; +sbit D_ADDR1 = P1 ^ 1; +sbit D_ADDR2 = P1 ^ 2; +sbit D_ADDR3 = P1 ^ 3; +sbit ENLED = P1 ^ 4; -sbit D1 = P2 ^ 7; -sbit D2 = P2 ^ 6; -sbit D3 = P2 ^ 5; -sbit D4 = P2 ^ 4; -sbit D5 = P2 ^ 3; -sbit D6 = P2 ^ 2; -sbit D7 = P2 ^ 1; -sbit D8 = P2 ^ 0; \ No newline at end of file +sbit D1 = P2 ^ 0; +sbit D2 = P2 ^ 1; +sbit D3 = P2 ^ 2; +sbit D4 = P2 ^ 3; +sbit D5 = P2 ^ 4; +sbit D6 = P2 ^ 5; +sbit D7 = P2 ^ 6; +sbit D8 = P2 ^ 7; \ No newline at end of file diff --git a/homework4/src/test1.c b/homework4/src/test1.c index 8eb9065..8e67f71 100644 --- a/homework4/src/test1.c +++ b/homework4/src/test1.c @@ -8,10 +8,10 @@ unsigned char cnt = 0; // log timer T0 overflow counts void main() { ENLED = 0; - ADDR3 = 1; - ADDR2 = 1; - ADDR1 = 1; - ADDR0 = 0; + D_ADDR3 = 1; + D_ADDR2 = 1; + D_ADDR1 = 1; + D_ADDR0 = 0; TMOD = 0x01; // timer T0 mode 1, 16-bit timer TH0 = 0XB8;