diff options
author | RossTheRoss <msattr@gmail.com> | 2020-02-26 08:26:09 -0600 |
---|---|---|
committer | RossTheRoss <msattr@gmail.com> | 2020-02-26 08:26:09 -0600 |
commit | a388a4cede7b718889756ea08c1dd56109217076 (patch) | |
tree | e49f69b4cc74c3ababdc3d77f7213e4bfe3655b6 /Lab3.X/numpad.c | |
parent | I hate this (Lab 3 partially working again) (diff) | |
download | ee2361-a388a4cede7b718889756ea08c1dd56109217076.tar ee2361-a388a4cede7b718889756ea08c1dd56109217076.tar.gz ee2361-a388a4cede7b718889756ea08c1dd56109217076.tar.bz2 ee2361-a388a4cede7b718889756ea08c1dd56109217076.tar.lz ee2361-a388a4cede7b718889756ea08c1dd56109217076.tar.xz ee2361-a388a4cede7b718889756ea08c1dd56109217076.tar.zst ee2361-a388a4cede7b718889756ea08c1dd56109217076.zip |
e
Diffstat (limited to '')
-rw-r--r-- | Lab3.X/numpad.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Lab3.X/numpad.c b/Lab3.X/numpad.c index 271b324..0768eba 100644 --- a/Lab3.X/numpad.c +++ b/Lab3.X/numpad.c @@ -17,7 +17,8 @@ void padDelay(long n) { char readKeyPadRAW(void) {
int i;
char num;
- num = (!_RB15 << 3) | (!_RB14 << 2) | (!_RB13 << 1) | !_RB12;
+//0
+ num = (_RA0 << 3) | (_RA1 << 2) | (_RA2 << 1) | _RA3;
LATB |= (0b1111 << 12);
for (i = 0; i < 4; i++) {
LATB ^= 0b1 << (15 - i);
@@ -34,7 +35,7 @@ char readKeyPadRAW(void) { case 0b1011:
return '2';
break;
- case 0b111:
+ case 0b0111:
return '1';
break;
} break;
@@ -49,7 +50,7 @@ char readKeyPadRAW(void) { case 0b1011:
return '5';
break;
- case 0b111:
+ case 0b0111:
return '4';
break;
} break;
@@ -64,7 +65,7 @@ char readKeyPadRAW(void) { case 0b1011:
return '8';
break;
- case 0b111:
+ case 0b0111:
return '7';
break;
} break;
@@ -79,7 +80,7 @@ char readKeyPadRAW(void) { case 0b1011:
return '0';
break;
- case 0b111:
+ case 0b0111:
return 'F';
break;
} break;
|