Rajkiran Anthapur / KL46Z_CS213A_HW1

reads the sensor data

Dependencies:   MAG3110 MMA8451Q SLCD TSI mbed-src

Fork of KL46Z by JP PANG

Files at this revision

API Documentation at this revision

Revision 2:cec387091316, committed 2014-02-10

Comitter:
rajkiran_anthapur
Date:
Mon Feb 10 22:56:20 2014 +0000
Parent:
1:e62070cc6725
Commit message:
final;

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
mbed-src.lib Show diff for this revision Revisions of this file 
--- a/main.cpp	Thu Feb 06 00:46:24 2014 +0000
+++ b/main.cpp	Mon Feb 10 22:56:20 2014 +0000
@@ -6,13 +6,14 @@
 #include <cstdlib>
 #include <iostream>
 
-Serial pc(USBTX, USBRX);
 
+Serial in(USBTX, USBRX);
 TSISensor tsi;
 MMA8451Q acc51(PTE25, PTE24, 0x1D<<1);
 MAG3110 mag(PTE25, PTE24, 0x0E<<1);
 
-PwmOut rled(PTE29);
+
+DigitalOut rled(PTE29);
 PwmOut gled(PTD5);
 AnalogIn lightSensor(PTE22);
 DigitalIn sw1(PTC3);
@@ -21,40 +22,26 @@
 //PwmOut lcd07(PTB7);
 
 
+
 int main()
 {
     using namespace std;
-    
-    float onTime = 1.0;
-    float offTime = 0.0;
     float holdTime = 1.0;
-    bool on = true;
-    bool off = false;
     int magX = 0, magY = 0, magZ = 0;
     //lcd03.write(0.33);
     //lcd07.write(0.25);
     //lcd07.period_ms(10);
-        
+    
     while(true) {
-                
-        rled = onTime - abs(acc51.getAccX());
-        gled = onTime - abs(acc51.getAccY());
-        mag.getValues(&magX, &magY, &magZ);
-        
-//        cout << "MMA8451: " << acc51.getAccX() << "\t" << acc51.getAccY() << "\t" << acc51.getAccZ() << "\n\r" << endl;
-//        cout << "MAG3110: " << magX << "\t" << magY << "\t" << magZ << "\n\r" << endl;
-//        cout << "MAG3110: " << mag.getHeading() << "\n\r" << endl;
-//        wait(holdTime);
-        
-        rled = tsi.readPercentage();
-        gled = tsi.readPercentage();
-        
-//        cout << "Touch: " << tsi.readPercentage() << "\n\r" << endl;
-//        cout << "SW1: " << sw1 << "\n\r" << endl;
-//        cout << "SW3: " << sw3 << "\n\r" << endl;
-//        cout << "Light Sensor: " << lightSensor << "\n\r" << endl;
-        cout << acc51.getAccX();
-        wait(holdTime);
+       mag.getValues(&magX, &magY, &magZ);
+ 
+       cout << "A" << "X" << acc51.getAccX() << "Y" << acc51.getAccY() << "Z"<< acc51.getAccZ() << "\n\r"  ;
+       cout << "M" << mag.getHeading() << "X" << magX << "Y" << magY << "Z" << magZ << "\n\r";
+       cout << "L" << lightSensor << "\n\r";
+       cout << "T" << tsi.readPercentage() << "\n\r" ;
+       
+     //  if(in.readable())
+            wait(holdTime);
     }
     return 0;
 }

--- a/mbed-src.lib	Thu Feb 06 00:46:24 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-http://mbed.org/users/mbed_official/code/mbed-src/#f54042cbc282