Diff: main.cpp

Revision:

1:f4caacc4df1b

Parent:

0:b7b55b8a4d2b

--- a/main.cpp	Thu Nov 10 13:28:23 2016 +0000
+++ b/main.cpp	Fri Nov 11 11:57:40 2016 +0000
@@ -1,20 +1,13 @@
 #include "mbed.h"
 #include "I2C_QT1070.h"
 #include "QT1070.h"
-DigitalOut myled(LED1);
-
+DigitalOut led1(LED1);
 Serial pc(USBTX,USBRX);
-
-QT1070touchemulator::QT1070 chiptje;
-//I2cMemoryDevice::I2cMemory i2cMemory (p28,p27,0xAA);
-
+QT1070touchemulator::QT1070 qt1070Chip;
 
 int main()
 {
-
-
     pc.baud(9600);
-    
     QT1070touchemulator::I2cQT1070 i2cQT1070Chip(p28, p27, 0x36, 100000);
     int cycleCounter = 0;
 
@@ -24,53 +17,50 @@
         cycleCounter++;
         if(cycleCounter > 100000) 
         {
-            myled = !myled;
+            led1 = !led1;
             cycleCounter =0;
         }
-
-    };    
-
-
+    };
 
-    //char fw = chiptje.getFirmware();
-//    pc.printf("firmware=%d\r\n", fw);
+//    char fw = qt1070Chip.getFirmware();
+//    pc.printf("firmware=%02x\r\n", fw);
 //
-//    char ci = chiptje.getChipID();
-//    pc.printf("chip id=%d\r\n", ci);
+//    char ci = qt1070Chip.getChipID();
+//    pc.printf("chip id=%02x\r\n", ci);
 //
 //    while(1) {
-//        myled = 1;
+//        led1 = 1;
 //        wait(0.1);
-//        myled = 0;
+//        led1 = 0;
 //
 //
-//        int ks = chiptje.getKeystate();
-//        //pc.printf("keystate=%d\r\n", ks);
+//        int ks = qt1070Chip.getKeystate();
+//       // pc.printf("keystate=%02x\r\n", ks);
 //
-//            if(ks==28){
+//            if(ks & 0x02){
 //                    pc.printf("you pressed UP\r\n");
 //             }
 //
-//            if(ks==26){
+//            if(ks & 0x04){
 //                    pc.printf("you pressed RIGHT\r\n");
 //            }
 //
-//            if(ks==31){
+//            if(ks & 0x01){
 //                    pc.printf("you pressed DOWN\r\n");
 //            }
 //
-//            if(ks==22){
+//            if(ks & 0x08){
 //                    pc.printf("you pressed LEFT\r\n");
 //            }
 //
-//            if(ks==14){
+//            if(ks & 0x10){
 //                    pc.printf("you pressed CENTER\r\n");
-//                    chiptje.resetMbed();
+//                    //qt1070Chip.resetMbed();
 //            }
 //
-//
-//
-//
 //        wait(0.2);
 //    }
+
 }
+
+