From 595ca1cd8a9a543884c1569daa83139e61e63601 Mon Sep 17 00:00:00 2001
From: Matt Strapp <msattr@gmail.com>
Date: Fri, 28 Feb 2020 11:22:40 -0600
Subject: Should fix #1

---
 Lab3.X/lab3_main_MAYA_C.c | 149 ----------------------------------------------
 Lab3.X/numpad.c           |  10 ++--
 2 files changed, 5 insertions(+), 154 deletions(-)

(limited to 'Lab3.X')

diff --git a/Lab3.X/lab3_main_MAYA_C.c b/Lab3.X/lab3_main_MAYA_C.c
index bd12cf7..a943ae2 100644
--- a/Lab3.X/lab3_main_MAYA_C.c
+++ b/Lab3.X/lab3_main_MAYA_C.c
@@ -61,155 +61,6 @@ int main(void) {
     }
 }
 
-//============================================================================//
-
-
-//void test7seg(void) {
-//    long int wait = 500000;
-//    showChar7seg('1', 0);
-//    delay(wait);
-//    showChar7seg('1', 1);
-//    delay(wait);
-//    showChar7seg('2', 0);
-//    delay(wait);
-//    showChar7seg('2', 1);
-//    delay(wait);
-//    showChar7seg('3', 0);
-//    delay(wait);
-//    showChar7seg('3', 1);
-//    delay(wait);
-//    showChar7seg('4', 0);
-//    delay(wait);
-//    showChar7seg('4', 1);
-//    delay(wait);
-//    showChar7seg('5', 0);
-//    delay(wait);
-//    showChar7seg('5', 1);
-//    delay(wait);
-//    showChar7seg('6', 0);
-//    delay(wait);
-//    showChar7seg('6', 1);
-//    delay(wait);
-//    showChar7seg('7', 0);
-//    delay(wait);
-//    showChar7seg('7', 1);
-//    delay(wait);
-//    showChar7seg('8', 0);
-//    delay(wait);
-//    showChar7seg('8', 1);
-//    delay(wait);
-//    showChar7seg('9', 0);
-//    delay(wait);
-//    showChar7seg('9', 1);
-//    delay(wait);
-//    showChar7seg('0', 0);
-//    delay(wait);
-//    showChar7seg('0', 1);
-//    delay(wait);
-//    showChar7seg('A', 0);
-//    delay(wait);
-//    showChar7seg('A', 1);
-//    delay(wait);
-//    showChar7seg('b', 0);
-//    delay(wait);
-//    showChar7seg('b', 1);
-//    delay(wait);
-//    showChar7seg('C', 0);
-//    delay(wait);
-//    showChar7seg('C', 1);
-//    delay(wait);
-//    showChar7seg('d', 0);
-//    delay(wait);
-//    showChar7seg('d', 1);
-//    delay(wait);
-//    showChar7seg('E', 0);
-//    delay(wait);
-//    showChar7seg('E', 1);
-//    delay(wait);
-//    showChar7seg('F', 0);
-//    delay(wait);
-//    showChar7seg('F', 1);
-//    delay(wait);
-//    return;
-//}
-
-//void showChar7seg(char myChar, int myDigit) {
-//    //1,2,3,4,5,6,7,8,9,0,A,b,C,d,E, and F
-//    LATB &= 0xF000;
-//    if (myDigit == 1) {
-//        if (myChar == '1') {
-//            LATB |= 0x067F;
-//        } else if (myChar == '2') {
-//            LATB |= 0x0497;
-//        } else if (myChar == '3') {
-//            LATB |= 0x0437;
-//        } else if (myChar == '4') {
-//            LATB |= 0x0667;
-//        } else if (myChar == '5') {
-//            LATB |= 0x0527;
-//        } else if (myChar == '6') {
-//            LATB |= 0x0507;
-//        } else if (myChar == '7') {
-//            LATB |= 0x047F;
-//        } else if (myChar == '8') {
-//            LATB |= 0x0407;
-//        } else if (myChar == '9') {
-//            LATB |= 0x0427;
-//        } else if (myChar == '0') {
-//            LATB |= 0x040F;
-//        } else if (myChar == 'A') {
-//            LATB |= 0x0447;
-//        } else if (myChar == 'b') {
-//            LATB |= 0x0707;
-//        } else if (myChar == 'C') {
-//            LATB |= 0x058F;
-//        } else if (myChar == 'd') {
-//            LATB |= 0x0617;
-//        } else if (myChar == 'E') {
-//            LATB |= 0x0587;
-//        } else if (myChar == 'F') {
-//            LATB |= 0x05C7;
-//        }
-//    } else if (myDigit == 0) {
-//        if (myChar == '1') {
-//            LATB |= 0x0A7F;
-//        } else if (myChar == '2') {
-//            LATB |= 0x0897;
-//        } else if (myChar == '3') {
-//            LATB |= 0x0837;
-//        } else if (myChar == '4') {
-//            LATB |= 0x0A67;
-//        } else if (myChar == '5') {
-//            LATB |= 0x0927;
-//        } else if (myChar == '6') {
-//            LATB |= 0x0907;
-//        } else if (myChar == '7') {
-//            LATB |= 0x087F;
-//        } else if (myChar == '8') {
-//            LATB |= 0x0807;
-//        } else if (myChar == '9') {
-//            LATB |= 0x0827;
-//        } else if (myChar == '0') {
-//            LATB |= 0x080F;
-//        } else if (myChar == 'A') {
-//            LATB |= 0x0847;
-//        } else if (myChar == 'b') {
-//            LATB |= 0x0B07;
-//        } else if (myChar == 'C') {
-//            LATB |= 0x098F;
-//        } else if (myChar == 'd') {
-//            LATB |= 0x0A17;
-//        } else if (myChar == 'E') {
-//            LATB |= 0x0987;
-//        } else if (myChar == 'F') {
-//            LATB |= 0x09C7;
-//        }
-//    }
-//    return;
-//}
-
-
-
 char cycle() {
     int i = 0;
     char key = 'N';
diff --git a/Lab3.X/numpad.c b/Lab3.X/numpad.c
index 5c2c924..5d9f0ce 100644
--- a/Lab3.X/numpad.c
+++ b/Lab3.X/numpad.c
@@ -10,11 +10,11 @@ void initKeyPad(void) {
     CNPU1bits.CN3PUE = 1; //RA1
     CNPU2bits.CN30PUE = 1; //RA2
     CNPU2bits.CN29PUE = 1; //RA3
-    T1CON = 0;
-    PR1 = 15999;
-    TMR1 = 0;
-    IFS0bits.T1IF = 0;
-    T1CONbits.TON = 1;
+//    T1CON = 0;
+//    PR1 = 15999;
+//    TMR1 = 0;
+//    IFS0bits.T1IF = 0;
+//    T1CONbits.TON = 1;
 }
 
 void padDelay(long n) {
-- 
cgit v1.2.3