Diff: main.cpp

Revision:

4:ef7abafa9884

Parent:

3:1ed9495c9158

Child:

5:1fca2683ae6f

diff -r 1ed9495c9158 -r ef7abafa9884 main.cpp
--- a/main.cpp	Thu Nov 02 10:43:07 2017 +0000
+++ b/main.cpp	Thu Nov 02 10:55:17 2017 +0000
@@ -1,27 +1,20 @@
 #include "mbed.h"
 #include "C12832.h"
-#include "TSL2561.h"
+#include "MMA7660.h"
 
 /* Sets up LCD and prints sensor data value of Indoor Air Quality sensor to LCD */
 
 C12832 lcd(PE_14, PE_12, PD_12, PD_11, PE_9); //LCD: MOSI, SCK, RESET, A0, nCS
-TSL2561 tsl2561(PF_0, PF_1, TSL2561_ADDR_HIGH); //LIGHT SENSOR: I2C_SDA, I2C_SCL 
+MMA7660 MMA(PF_0, PF_1); //ACCELEROMETER: I2C_SDA, I2C_SCL 
 
 int main()
 {
-    tsl2561.begin();
-    tsl2561.setGain(TSL2561_GAIN_0X);
-    tsl2561.setTiming(TSL2561_INTEGRATIONTIME_402MS);
-
     while(1) {
-        int x = tsl2561.getLuminosity(TSL2561_VISIBLE);
-        int z = tsl2561.getLuminosity(TSL2561_INFRARED);
-           
         lcd.cls();
         lcd.locate(0,3);
-        lcd.printf("[LIGHT]");
+        lcd.printf("[ACCEL]");
         lcd.locate(0,14);
-        lcd.printf("VIS: %d, INFR: %d ",x, z);
-        wait(1); // Print to LCD values
+        lcd.printf("x=%.2f y=%.2f z=%.2f",MMA.x(), MMA.y(), MMA.z()); // Print to LCD values
+        wait(1);
     }
 }
\ No newline at end of file