Diff: main.cpp

Revision:

1:684222fa16bb

Parent:

0:6f4bcfe86ac2

Child:

2:383e257538ff

--- a/main.cpp	Fri Jul 26 21:41:55 2013 +0000
+++ b/main.cpp	Tue Aug 27 21:43:28 2013 +0000
@@ -1,40 +1,36 @@
 #include "mbed.h"
 #include "MPR121.h"
 
-// TODO: put IC in low power mode when disabled
-
+Serial pc(USBTX, USBRX);
 DigitalOut myled(LED1);
-DigitalOut off(LED4);
-Timer t;
+
+#if defined TARGET_LPC1768 || TARGET_LPC11U24
+  I2C i2c(p28, p27);
+  InterruptIn irq(p26);
+  MPR121 touch_pad(i2c, irq, MPR121::ADDR_VSS);
 
-LogUtil logger;
+#elif defined TARGET_KL25Z
+  I2C i2c(PTC9, PTC8);
+  InterruptIn irq(PTA5);
+  MPR121 touch_pad(i2c, irq, MPR121::ADDR_VSS);
 
-I2C i2c(p28, p27);
-InterruptIn irq(p26);
-MPR121 touch_pad(i2c, irq, MPR121::ADDR_VSS );
+#else
+  #error TARGET NOT TESTED
+#endif
 
 int main() 
 {       
     touch_pad.init();
     touch_pad.enable();
-    t.start();
+    touch_pad.registerDump(pc);
+    
     while(1)
     {
         if(touch_pad.isPressed())
         {
             uint16_t button_val = touch_pad.buttonPressed();
-            LOG("button = 0x%04x\n", button_val);
+            printf("button = 0x%04x\n", button_val);
             myled = (button_val>0) ? 1 : 0;
-        }
-//        if(t.read_ms() > 5000)
-//        {
-//            touch_pad.disable();
-//            off = 1;
-//            wait(5.0f);
-//            off = 0;
-//            touch_pad.enable();
-//            t.reset();
-//        }
-            
+        }            
     }
 }