Diff: main.cpp

Revision:

2:e3770fac7512

Parent:

1:96fe777bad5a

Child:

3:6b371e451f9e

--- a/main.cpp	Fri Feb 07 14:24:49 2014 +0000
+++ b/main.cpp	Sun Feb 09 12:29:43 2014 +0000
@@ -2,7 +2,6 @@
 #include "TSISensor.h"
 #include "MMA8451Q.h"
 #include "MAG3110.h"
-#include "vfnLCD.h"
 #include <cstdlib>
 #include <iostream>
 
@@ -11,31 +10,28 @@
 TSISensor tsi;
 MMA8451Q acc(PTE25, PTE24, 0x1D<<1);
 MAG3110 mag(PTE25, PTE24, 0x0E<<1);
-vfnLCD lcd;
 
 PwmOut rled(PTE29);
 PwmOut gled(PTD5);
 AnalogIn lightSensor(PTE22);
-DigitalIn s1(PTC3);
-DigitalIn s3(PTC12);
+InterruptIn s1(PTC3);
+InterruptIn s3(PTC12);
 
 
 int main()
 {
     using namespace std;
 
-  //  float onTime = 1.0;
+    float onTime = 1.0;
  //   float offTime = 0.0;
     float holdTime = 1.0;
-    int magX = 0, magY = 0, magZ = 0;
-   
+    int magX = 0, magY = 0, magZ = 0;   
 
     while(1) {
 
-        rled = abs(acc.getAccX());
-        //gled = abs(acc.getAccY());
+        rled = onTime - abs(acc.getAccX());
+        gled = onTime - abs(acc.getAccY());
         mag.getValues(&magX, &magY, &magZ);
-        lcd.vfnLCD_All_Segments_ON();
 
         cout << "MMA8451: " << acc.getAccX() << "\t" << acc.getAccY() << "\t" << acc.getAccZ() << "\n\r" << endl;
         cout << "MAG3110: " << magX << "\t" << magY << "\t" << magZ << "\n\r" << endl;
@@ -44,7 +40,6 @@
 
         rled = tsi.readPercentage();
         gled = tsi.readPercentage();
-        lcd.vfnLCD_All_Segments_OFF();
 
         cout << "Touch: " << tsi.readPercentage() << "\n\r" << endl;
         cout << "SW1: " << s1 << "\n\r" << endl;